diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-08-08 19:00:06 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-05-23 13:33:41 +0200 |
| commit | 5188e0e91c00161845b3fbf78bb3d76275d73810 (patch) | |
| tree | a3bb19d4fab30c9273ee43bf307e0c2f533bc8ed | |
| parent | 9d2cd216e96e97fccf749efcde246fe57eb7ae56 (diff) | |
| download | tde-packaging-5188e0e91c00161845b3fbf78bb3d76275d73810.tar.gz tde-packaging-5188e0e91c00161845b3fbf78bb3d76275d73810.zip | |
Fix ksquirrel FTBFS on Debian and Ubuntu
(cherry picked from commit e106281002d7843b30c18994a2e0224601a5d7aa)
| -rwxr-xr-x | debian/lenny/applications/ksquirrel/debian/rules | 19 | ||||
| -rwxr-xr-x | debian/squeeze/applications/ksquirrel/debian/rules | 19 | ||||
| -rwxr-xr-x | ubuntu/maverick/applications/ksquirrel/debian/rules | 19 |
3 files changed, 33 insertions, 24 deletions
diff --git a/debian/lenny/applications/ksquirrel/debian/rules b/debian/lenny/applications/ksquirrel/debian/rules index 60b270a47..8dff2ed57 100755 --- a/debian/lenny/applications/ksquirrel/debian/rules +++ b/debian/lenny/applications/ksquirrel/debian/rules @@ -27,6 +27,17 @@ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) 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. ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub @@ -43,14 +54,6 @@ build: build-stamp build-stamp: config.status dh_testdir - ! [ -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 - # Add here commands to compile the package. $(MAKE) #docbook-to-man debian/ksquirrel.sgml > ksquirrel.1 diff --git a/debian/squeeze/applications/ksquirrel/debian/rules b/debian/squeeze/applications/ksquirrel/debian/rules index 60b270a47..8dff2ed57 100755 --- a/debian/squeeze/applications/ksquirrel/debian/rules +++ b/debian/squeeze/applications/ksquirrel/debian/rules @@ -27,6 +27,17 @@ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) 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. ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub @@ -43,14 +54,6 @@ build: build-stamp build-stamp: config.status dh_testdir - ! [ -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 - # Add here commands to compile the package. $(MAKE) #docbook-to-man debian/ksquirrel.sgml > ksquirrel.1 diff --git a/ubuntu/maverick/applications/ksquirrel/debian/rules b/ubuntu/maverick/applications/ksquirrel/debian/rules index 60b270a47..8dff2ed57 100755 --- a/ubuntu/maverick/applications/ksquirrel/debian/rules +++ b/ubuntu/maverick/applications/ksquirrel/debian/rules @@ -27,6 +27,17 @@ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) 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. ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub @@ -43,14 +54,6 @@ build: build-stamp build-stamp: config.status dh_testdir - ! [ -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 - # Add here commands to compile the package. $(MAKE) #docbook-to-man debian/ksquirrel.sgml > ksquirrel.1 |