diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-09-15 20:29:47 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2017-07-18 00:23:09 +0200 |
| commit | f025c10ab2c705f3b86669b3dae1817c0cdd6d1d (patch) | |
| tree | e9ca489d65a931d999e375719a0ddd5d670b77f6 /ubuntu/maverick/applications/piklab | |
| parent | 17ce56f2601667a7515bbe21b4754cdb51f0d650 (diff) | |
| download | tde-packaging-f025c10ab2c705f3b86669b3dae1817c0cdd6d1d.tar.gz tde-packaging-f025c10ab2c705f3b86669b3dae1817c0cdd6d1d.zip | |
Switch patch system from simple to quilt on Debian and Ubuntu
(cherry picked from commit f24915471ea396c53670df51b2affc4af74373bf)
Diffstat (limited to 'ubuntu/maverick/applications/piklab')
| -rw-r--r-- | ubuntu/maverick/applications/piklab/debian/control | 2 | ||||
| -rw-r--r-- | ubuntu/maverick/applications/piklab/debian/patches/series (renamed from ubuntu/maverick/applications/piklab/debian/patches/.gitignore) | 0 | ||||
| -rwxr-xr-x | ubuntu/maverick/applications/piklab/debian/rules | 9 |
3 files changed, 5 insertions, 6 deletions
diff --git a/ubuntu/maverick/applications/piklab/debian/control b/ubuntu/maverick/applications/piklab/debian/control index e2a7e9628..5b3665b73 100644 --- a/ubuntu/maverick/applications/piklab/debian/control +++ b/ubuntu/maverick/applications/piklab/debian/control @@ -2,7 +2,7 @@ Source: piklab-trinity Section: electronics Priority: extra Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends: debhelper (>= 5), autotools-dev, quilt, chrpath, +Build-Depends: cdbs, debhelper (>= 5), autotools-dev, quilt, chrpath, libusb-dev, kdelibs4-trinity-dev, libreadline5-dev | libreadline6-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://piklab.sourceforge.net/ diff --git a/ubuntu/maverick/applications/piklab/debian/patches/.gitignore b/ubuntu/maverick/applications/piklab/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/ubuntu/maverick/applications/piklab/debian/patches/.gitignore +++ b/ubuntu/maverick/applications/piklab/debian/patches/series diff --git a/ubuntu/maverick/applications/piklab/debian/rules b/ubuntu/maverick/applications/piklab/debian/rules index 5edcb99ef..416588f8a 100755 --- a/ubuntu/maverick/applications/piklab/debian/rules +++ b/ubuntu/maverick/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 |