summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-12-30 10:24:42 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2014-12-30 10:24:42 +0100
commitc52dc050ad2671f7f99f5e73364503f3b8328c21 (patch)
tree70232b2d728276a7df425095bba60828351b5449
parent6aafdb22f0d63bf1375f3f2b43a145cda7ac3a46 (diff)
parent1d6b32d4e33d6f9242817fe97b8a6c547c3b1331 (diff)
downloadtde-packaging-c52dc050ad2671f7f99f5e73364503f3b8328c21.tar.gz
tde-packaging-c52dc050ad2671f7f99f5e73364503f3b8328c21.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
-rw-r--r--debian/lenny/dependencies/libr/debian/control2
-rw-r--r--debian/squeeze/dependencies/libr/debian/control2
-rw-r--r--ubuntu/maverick/dependencies/libr/debian/control2
3 files changed, 3 insertions, 3 deletions
diff --git a/debian/lenny/dependencies/libr/debian/control b/debian/lenny/dependencies/libr/debian/control
index 64166704e..b5451ebd0 100644
--- a/debian/lenny/dependencies/libr/debian/control
+++ b/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/
diff --git a/debian/squeeze/dependencies/libr/debian/control b/debian/squeeze/dependencies/libr/debian/control
index 64166704e..b5451ebd0 100644
--- a/debian/squeeze/dependencies/libr/debian/control
+++ b/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/
diff --git a/ubuntu/maverick/dependencies/libr/debian/control b/ubuntu/maverick/dependencies/libr/debian/control
index 64166704e..b5451ebd0 100644
--- a/ubuntu/maverick/dependencies/libr/debian/control
+++ b/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/