summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2012-07-15 15:39:01 +0200
committerSlávek Banko <slavek.banko@axis.cz>2012-07-15 15:39:01 +0200
commit417959177d2cbc4c120ac837b375b507acad5b65 (patch)
tree3d452b3e880598614b172ce26d37dcedaf45ab64
parentd42fbb6b3ae8ad17abe9964130a94a34e0601b4b (diff)
downloadtde-packaging-417959177d2cbc4c120ac837b375b507acad5b65.tar.gz
tde-packaging-417959177d2cbc4c120ac837b375b507acad5b65.zip
Removed former way of managing patches for libksquirrel on Debian and Ubuntu
-rw-r--r--debian/lenny/libraries/libksquirrel/debian/control2
-rwxr-xr-xdebian/lenny/libraries/libksquirrel/debian/rules34
-rw-r--r--debian/squeeze/libraries/libksquirrel/debian/control2
-rwxr-xr-xdebian/squeeze/libraries/libksquirrel/debian/rules34
-rw-r--r--ubuntu/maverick/libraries/libksquirrel/debian/control2
-rwxr-xr-xubuntu/maverick/libraries/libksquirrel/debian/rules34
6 files changed, 6 insertions, 102 deletions
diff --git a/debian/lenny/libraries/libksquirrel/debian/control b/debian/lenny/libraries/libksquirrel/debian/control
index 1d03926a0..51d6401d5 100644
--- a/debian/lenny/libraries/libksquirrel/debian/control
+++ b/debian/lenny/libraries/libksquirrel/debian/control
@@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Harald Sitter <apachelogger@ubuntu.com>
Build-Depends: debhelper (>= 5), cdbs, pkg-config, libmng-dev,librsvg2-bin,
medcon, libjasper-dev, libungif4-dev, libwmf-dev, libopenexr-dev,
djvulibre-bin, transfig, x11proto-core-dev, netpbm, libtiff4-dev,
- libkonq4-trinity-dev, kipi-plugins-trinity, libkipi0-trinity-dev, dpatch, build-essential,
+ libkonq4-trinity-dev, kipi-plugins-trinity, libkipi0-trinity-dev, build-essential,
automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Homagepage: http://ksquirrel.sourceforge.net
diff --git a/debian/lenny/libraries/libksquirrel/debian/rules b/debian/lenny/libraries/libksquirrel/debian/rules
index fa07f7f8c..37e6b3f83 100755
--- a/debian/lenny/libraries/libksquirrel/debian/rules
+++ b/debian/lenny/libraries/libksquirrel/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
! [ -f /usr/share/libtool/ltmain.sh ] || \
@@ -56,38 +56,6 @@ build-stamp: config.status
touch $@
-clean: clean-patched unpatch
-
-clean-patched:
- 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
- touch debian/stamp-bootstrap
-
- # 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/libraries/libksquirrel/debian/control b/debian/squeeze/libraries/libksquirrel/debian/control
index 1d03926a0..08c37d8ed 100644
--- a/debian/squeeze/libraries/libksquirrel/debian/control
+++ b/debian/squeeze/libraries/libksquirrel/debian/control
@@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Harald Sitter <apachelogger@ubuntu.com>
Build-Depends: debhelper (>= 5), cdbs, pkg-config, libmng-dev,librsvg2-bin,
medcon, libjasper-dev, libungif4-dev, libwmf-dev, libopenexr-dev,
djvulibre-bin, transfig, x11proto-core-dev, netpbm, libtiff4-dev,
- libkonq4-trinity-dev, kipi-plugins-trinity, libkipi0-trinity-dev, dpatch, build-essential,
+ libkonq4-trinity-dev, kipi-plugins-trinity, libkipi0-trinity-dev, quilt, build-essential,
automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Homagepage: http://ksquirrel.sourceforge.net
diff --git a/debian/squeeze/libraries/libksquirrel/debian/rules b/debian/squeeze/libraries/libksquirrel/debian/rules
index fa07f7f8c..37e6b3f83 100755
--- a/debian/squeeze/libraries/libksquirrel/debian/rules
+++ b/debian/squeeze/libraries/libksquirrel/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
! [ -f /usr/share/libtool/ltmain.sh ] || \
@@ -56,38 +56,6 @@ build-stamp: config.status
touch $@
-clean: clean-patched unpatch
-
-clean-patched:
- 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
- touch debian/stamp-bootstrap
-
- # 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/ubuntu/maverick/libraries/libksquirrel/debian/control b/ubuntu/maverick/libraries/libksquirrel/debian/control
index 1d03926a0..08c37d8ed 100644
--- a/ubuntu/maverick/libraries/libksquirrel/debian/control
+++ b/ubuntu/maverick/libraries/libksquirrel/debian/control
@@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Harald Sitter <apachelogger@ubuntu.com>
Build-Depends: debhelper (>= 5), cdbs, pkg-config, libmng-dev,librsvg2-bin,
medcon, libjasper-dev, libungif4-dev, libwmf-dev, libopenexr-dev,
djvulibre-bin, transfig, x11proto-core-dev, netpbm, libtiff4-dev,
- libkonq4-trinity-dev, kipi-plugins-trinity, libkipi0-trinity-dev, dpatch, build-essential,
+ libkonq4-trinity-dev, kipi-plugins-trinity, libkipi0-trinity-dev, quilt, build-essential,
automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Homagepage: http://ksquirrel.sourceforge.net
diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/rules b/ubuntu/maverick/libraries/libksquirrel/debian/rules
index fa07f7f8c..37e6b3f83 100755
--- a/ubuntu/maverick/libraries/libksquirrel/debian/rules
+++ b/ubuntu/maverick/libraries/libksquirrel/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
! [ -f /usr/share/libtool/ltmain.sh ] || \
@@ -56,38 +56,6 @@ build-stamp: config.status
touch $@
-clean: clean-patched unpatch
-
-clean-patched:
- 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
- touch debian/stamp-bootstrap
-
- # 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