diff options
Diffstat (limited to 'debian')
4 files changed, 6 insertions, 46 deletions
diff --git a/debian/lenny/applications/ksquirrel/debian/control b/debian/lenny/applications/ksquirrel/debian/control index d2c01e591..2c9b9b633 100644 --- a/debian/lenny/applications/ksquirrel/debian/control +++ b/debian/lenny/applications/ksquirrel/debian/control @@ -4,7 +4,7 @@ Priority: extra Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Paul Gevers <paul@climbing.nl> Build-Depends: debhelper (>= 5), - dpatch, + quilt, libksquirrel-trinity-dev, libkonq4-trinity-dev, kipi-plugins-trinity, diff --git a/debian/lenny/applications/ksquirrel/debian/rules b/debian/lenny/applications/ksquirrel/debian/rules index 8f8161523..797fc4a08 100755 --- a/debian/lenny/applications/ksquirrel/debian/rules +++ b/debian/lenny/applications/ksquirrel/debian/rules @@ -22,7 +22,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -config.status: patch configure +config.status: configure dh_testdir # Add here commands to configure the package. ifneq "$(wildcard /usr/share/misc/config.sub)" "" @@ -54,37 +54,17 @@ build-stamp: config.status touch $@ -clean: clean-patched unpatch - -clean-patched: +clean: dh_testdir dh_testroot rm -f build-stamp - ! [ -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 clean up after the build process. [ ! -f Makefile ] || $(MAKE) distclean rm -f config.sub config.guess dh_clean -patch: patch-stamp - -patch-stamp: - dpatch apply-all - dpatch cat-all >patch-stamp - -unpatch: - dpatch deapply-all - rm -rf patch-stamp debian/patched - install: build dh_testdir dh_testroot diff --git a/debian/squeeze/applications/ksquirrel/debian/control b/debian/squeeze/applications/ksquirrel/debian/control index d2c01e591..2c9b9b633 100644 --- a/debian/squeeze/applications/ksquirrel/debian/control +++ b/debian/squeeze/applications/ksquirrel/debian/control @@ -4,7 +4,7 @@ Priority: extra Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Paul Gevers <paul@climbing.nl> Build-Depends: debhelper (>= 5), - dpatch, + quilt, libksquirrel-trinity-dev, libkonq4-trinity-dev, kipi-plugins-trinity, diff --git a/debian/squeeze/applications/ksquirrel/debian/rules b/debian/squeeze/applications/ksquirrel/debian/rules index 8f8161523..797fc4a08 100755 --- a/debian/squeeze/applications/ksquirrel/debian/rules +++ b/debian/squeeze/applications/ksquirrel/debian/rules @@ -22,7 +22,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -config.status: patch configure +config.status: configure dh_testdir # Add here commands to configure the package. ifneq "$(wildcard /usr/share/misc/config.sub)" "" @@ -54,37 +54,17 @@ build-stamp: config.status touch $@ -clean: clean-patched unpatch - -clean-patched: +clean: dh_testdir dh_testroot rm -f build-stamp - ! [ -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 clean up after the build process. [ ! -f Makefile ] || $(MAKE) distclean rm -f config.sub config.guess dh_clean -patch: patch-stamp - -patch-stamp: - dpatch apply-all - dpatch cat-all >patch-stamp - -unpatch: - dpatch deapply-all - rm -rf patch-stamp debian/patched - install: build dh_testdir dh_testroot |