X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=debian%2Fcontrol;h=ea337af01e6fbf521a5c9a727e8271cc8d9b68ce;hb=5c082dc2ec8dfe6922b327f134785f24783def7b;hp=9cc1521acc5ddc05a711535a7d150babdba23890;hpb=9ada6e7b5cf3aa507b6b54e47775c29ffd1378d3;p=gnulib.git

diff --git a/debian/control b/debian/control
index 9cc1521ac..ea337af01 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.1
+Build-Depends: dpkg-dev (>= 1.16.2), debhelper (>= 9), autoconf, automake, perl
+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.