diff options
| author | Slávek Banko <[email protected]> | 2013-09-15 20:29:47 +0200 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2013-09-15 20:29:47 +0200 |
| commit | f24915471ea396c53670df51b2affc4af74373bf (patch) | |
| tree | 04e25e027d641ad6b82ba5828ae9a9c72924b1f1 /debian/squeeze/applications/piklab | |
| parent | 1c7a831407fea1378682db5c21b06e792343be06 (diff) | |
| download | tde-packaging-f24915471ea396c53670df51b2affc4af74373bf.tar.gz tde-packaging-f24915471ea396c53670df51b2affc4af74373bf.zip | |
Switch patch system from simple to quilt on Debian and Ubuntu
Diffstat (limited to 'debian/squeeze/applications/piklab')
| -rw-r--r-- | debian/squeeze/applications/piklab/debian/control | 2 | ||||
| -rw-r--r-- | debian/squeeze/applications/piklab/debian/patches/series (renamed from debian/squeeze/applications/piklab/debian/patches/.gitignore) | 0 | ||||
| -rwxr-xr-x | debian/squeeze/applications/piklab/debian/rules | 9 |
3 files changed, 5 insertions, 6 deletions
diff --git a/debian/squeeze/applications/piklab/debian/control b/debian/squeeze/applications/piklab/debian/control index 984b4b234..6314b47e9 100644 --- a/debian/squeeze/applications/piklab/debian/control +++ b/debian/squeeze/applications/piklab/debian/control @@ -2,7 +2,7 @@ Source: piklab-trinity Section: electronics Priority: extra Maintainer: Timothy Pearson <[email protected]> -Build-Depends: debhelper (>= 5), autotools-dev, quilt, chrpath, +Build-Depends: cdbs, debhelper (>= 5), autotools-dev, quilt, chrpath, libusb-dev, tdelibs14-trinity-dev, libreadline5-dev | libreadline6-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://piklab.sourceforge.net/ diff --git a/debian/squeeze/applications/piklab/debian/patches/.gitignore b/debian/squeeze/applications/piklab/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/squeeze/applications/piklab/debian/patches/.gitignore +++ b/debian/squeeze/applications/piklab/debian/patches/series diff --git a/debian/squeeze/applications/piklab/debian/rules b/debian/squeeze/applications/piklab/debian/rules index 6d0a1d510..d15b8b977 100755 --- a/debian/squeeze/applications/piklab/debian/rules +++ b/debian/squeeze/applications/piklab/debian/rules @@ -26,7 +26,9 @@ else CFLAGS += -O2 endif -config: config-stamp +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +config: post-patches config-stamp config-stamp: configure dh_testdir @@ -39,8 +41,6 @@ config-stamp: configure make -f admin/Makefile.common cvs touch debian/stamp-bootstrap - $(MAKE) -f /usr/share/quilt/quilt.make patch - ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub endif @@ -62,7 +62,7 @@ build-stamp: config-stamp #docbook-to-man debian/piklab.sgml > piklab.1 touch $@ -clean: +clean:: dh_testdir dh_testroot @@ -80,7 +80,6 @@ clean: rm -f po/*.gmo rm -f src/common/global/svn_revision/svn_revision.h rm -f config.sub config.guess config.status config.log - $(MAKE) -f /usr/share/quilt/quilt.make unpatch dh_clean install: build-stamp |