X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=debian%2Fcontrol;h=0eecc351d118ef17470aafe84b86dd48ce7e8406;hb=a6ae1bb228f3bcfac76095600d05969d214ed65f;hp=3dd173aa54f6da602702a49444a1e7e55da363f1;hpb=cba438acdae37afb7ad6d4e4f4e76c11e5156791;p=gnulib.git

diff --git a/debian/control b/debian/control
index 3dd173aa5..0eecc351d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,9 @@ Source: gnulib
 Section: devel
 Priority: optional
 Maintainer: Ian Beckwith <ianb@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), texinfo
-Standards-Version: 3.9.0
+Build-Depends: dpkg-dev (>= 1.16.2), debhelper (>= 9), autoconf, automake
+Build-Depends-Indep: texinfo
+Standards-Version: 3.9.5
 Homepage: http://www.gnu.org/software/gnulib/
 Vcs-Browser: http://erislabs.net/gitweb?p=gnulib.git
 Vcs-Git: git://erislabs.net/gnulib.git
@@ -16,3 +17,14 @@ Description: GNU Portability Library
  The GNU portability library is a macro system and C declarations and
  definitions for commonly-used API elements and abstracted system behaviors. It
  can be used to improve portability and other functionality in your programs.
+
+Package: git-merge-changelog
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: git merge driver for GNU ChangeLog files
+ ChangeLog files *always* foul up most version control systems in
+ their default configuration.
+ .
+ git-merge-changelog is a tool from gnulib designed to help with this
+ for the case of GNU-style ChangeLogs; it can be used with at least
+ git, bzr, and hg.