Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

debian/lenny/dependencies/libr/debian/control

@@ -1,7 +1,7 @@
 Source: libr
 Priority: extra
 Maintainer: Erich E. Hoover <ehoover@mines.edu>
-Build-Depends: debhelper (>= 7), quilt, autotools-dev, autopoint, pkg-config, libglade2-dev, binutils-dev, doxygen, cvs, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 7), quilt, autotools-dev, gettext (< 0.18) | autopoint, pkg-config, libglade2-dev, binutils-dev, doxygen, cvs, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Section: libs
 Homepage: http://www.compholio.com/elficon/

debian/squeeze/dependencies/libr/debian/control

@@ -1,7 +1,7 @@
 Source: libr
 Priority: extra
 Maintainer: Erich E. Hoover <ehoover@mines.edu>
-Build-Depends: debhelper (>= 7), quilt, autotools-dev, autopoint, pkg-config, libglade2-dev, binutils-dev, doxygen, cvs, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 7), quilt, autotools-dev, gettext (< 0.18) | autopoint, pkg-config, libglade2-dev, binutils-dev, doxygen, cvs, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Section: libs
 Homepage: http://www.compholio.com/elficon/

ubuntu/maverick/dependencies/libr/debian/control

@@ -1,7 +1,7 @@
 Source: libr
 Priority: extra
 Maintainer: Erich E. Hoover <ehoover@mines.edu>
-Build-Depends: debhelper (>= 7), quilt, autotools-dev, autopoint, pkg-config, libglade2-dev, binutils-dev, doxygen, cvs, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 7), quilt, autotools-dev, gettext (< 0.18) | autopoint, pkg-config, libglade2-dev, binutils-dev, doxygen, cvs, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Section: libs
 Homepage: http://www.compholio.com/elficon/