summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-08-08 13:31:40 -0500
committerSlávek Banko <slavek.banko@axis.cz>2012-09-08 18:48:41 +0200
commit8ec99fddb5210eca90b55db4a56cee9ea915d6a4 (patch)
tree029ccf4ce23547a92cb2e16b9abe2141b9cfd1a7
parent7f3ddb6d22344a07954b21bbb2c48af8f2291a65 (diff)
downloadtde-packaging-8ec99fddb5210eca90b55db4a56cee9ea915d6a4.tar.gz
tde-packaging-8ec99fddb5210eca90b55db4a56cee9ea915d6a4.zip
Fix k3b-i18n FTBFS on Debian and Ubuntu
(cherry picked from commit ae0bb0b862e6ff2daf69023c48ad0300ea4ac829)
-rwxr-xr-xdebian/lenny/applications/k3b-i18n/debian/rules11
-rwxr-xr-xdebian/squeeze/applications/k3b-i18n/debian/rules11
-rwxr-xr-xubuntu/maverick/applications/k3b-i18n/debian/rules11
3 files changed, 33 insertions, 0 deletions
diff --git a/debian/lenny/applications/k3b-i18n/debian/rules b/debian/lenny/applications/k3b-i18n/debian/rules
index 0f81660e9..da5d81ed3 100755
--- a/debian/lenny/applications/k3b-i18n/debian/rules
+++ b/debian/lenny/applications/k3b-i18n/debian/rules
@@ -28,6 +28,17 @@ endif
config.status: configure
dh_testdir
+
+ # Regenerate build system
+ ! [ -f /usr/share/libtool/ltmain.sh ] || \
+ cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+ ! [ -f /usr/share/libtool/config/ltmain.sh ] || \
+ cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+ cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+
+ make -f admin/Makefile.common cvs
+ touch debian/stamp-bootstrap
+
# Add here commands to configure the package.
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=$(DEB_CONFIGURE_PREFIX) \
diff --git a/debian/squeeze/applications/k3b-i18n/debian/rules b/debian/squeeze/applications/k3b-i18n/debian/rules
index 0f81660e9..da5d81ed3 100755
--- a/debian/squeeze/applications/k3b-i18n/debian/rules
+++ b/debian/squeeze/applications/k3b-i18n/debian/rules
@@ -28,6 +28,17 @@ endif
config.status: configure
dh_testdir
+
+ # Regenerate build system
+ ! [ -f /usr/share/libtool/ltmain.sh ] || \
+ cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+ ! [ -f /usr/share/libtool/config/ltmain.sh ] || \
+ cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+ cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+
+ make -f admin/Makefile.common cvs
+ touch debian/stamp-bootstrap
+
# Add here commands to configure the package.
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=$(DEB_CONFIGURE_PREFIX) \
diff --git a/ubuntu/maverick/applications/k3b-i18n/debian/rules b/ubuntu/maverick/applications/k3b-i18n/debian/rules
index 0f81660e9..da5d81ed3 100755
--- a/ubuntu/maverick/applications/k3b-i18n/debian/rules
+++ b/ubuntu/maverick/applications/k3b-i18n/debian/rules
@@ -28,6 +28,17 @@ endif
config.status: configure
dh_testdir
+
+ # Regenerate build system
+ ! [ -f /usr/share/libtool/ltmain.sh ] || \
+ cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+ ! [ -f /usr/share/libtool/config/ltmain.sh ] || \
+ cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+ cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+
+ make -f admin/Makefile.common cvs
+ touch debian/stamp-bootstrap
+
# Add here commands to configure the package.
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=$(DEB_CONFIGURE_PREFIX) \