diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2012-07-31 03:35:02 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-07-31 03:35:02 +0200 |
| commit | 1d0df6a684ba5c3a8c2e8b413179af7cdc88273d (patch) | |
| tree | d9d92bacc5de6f1b69fb993ca61c07889efd0630 | |
| parent | 44b2c563f55a35704928a9481e18d91223502d7d (diff) | |
| download | tde-packaging-1d0df6a684ba5c3a8c2e8b413179af7cdc88273d.tar.gz tde-packaging-1d0df6a684ba5c3a8c2e8b413179af7cdc88273d.zip | |
Superseded former way of managing patches for ksplash-engine-moodin on Debian and Ubuntu
4 files changed, 4 insertions, 50 deletions
diff --git a/debian/squeeze/applications/ksplash-engine-moodin/debian/control b/debian/squeeze/applications/ksplash-engine-moodin/debian/control index 589ccedb3..752324dca 100644 --- a/debian/squeeze/applications/ksplash-engine-moodin/debian/control +++ b/debian/squeeze/applications/ksplash-engine-moodin/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: debhelper (>= 5.0.24), autotools-dev, kdebase-trinity-dev, ksplash-trinity, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5.0.24), quilt, autotools-dev, kdebase-trinity-dev, ksplash-trinity, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: ksplash-engine-moodin-trinity diff --git a/debian/squeeze/applications/ksplash-engine-moodin/debian/rules b/debian/squeeze/applications/ksplash-engine-moodin/debian/rules index 2b5a4f326..5b4a03a4d 100755 --- a/debian/squeeze/applications/ksplash-engine-moodin/debian/rules +++ b/debian/squeeze/applications/ksplash-engine-moodin/debian/rules @@ -33,20 +33,7 @@ endif debian/debiandirs: admin/debianrules perl -w admin/debianrules echodirs > debian/debiandirs -patch-stamp: - # Apply Debian specific patches - if test ! -f patch-stamp; then \ - for patch in $(CURDIR)/debian/patches/*.diff ;\ - do \ - echo APPLYING PATCH\: $${patch##*/};\ - patch -p1 < $$patch ;\ - done ;\ - touch patch-stamp ;\ - fi - -patch: patch-stamp - -config.status: configure patch +config.status: configure dh_testdir CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde @@ -92,16 +79,6 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif - # Remove Debian specific patches - if test -f patch-stamp; then \ - for patch in $(CURDIR)/debian/patches/*.diff ;\ - do \ - echo REMOVING PATCH\: $${patch##*/};\ - patch -p1 -R < $$patch ;\ - done ;\ - rm -f patch-stamp ;\ - fi - dh_clean install: build diff --git a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/control b/ubuntu/maverick/applications/ksplash-engine-moodin/debian/control index b8afd7a01..040c8e53d 100644 --- a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/control +++ b/ubuntu/maverick/applications/ksplash-engine-moodin/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: debhelper (>= 5.0.24), autotools-dev, kdebase-trinity-dev, ksplash-trinity, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5.0.24), quilt, autotools-dev, kdebase-trinity-dev, ksplash-trinity, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: ksplash-engine-moodin-trinity diff --git a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/rules b/ubuntu/maverick/applications/ksplash-engine-moodin/debian/rules index 2b5a4f326..5b4a03a4d 100755 --- a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/rules +++ b/ubuntu/maverick/applications/ksplash-engine-moodin/debian/rules @@ -33,20 +33,7 @@ endif debian/debiandirs: admin/debianrules perl -w admin/debianrules echodirs > debian/debiandirs -patch-stamp: - # Apply Debian specific patches - if test ! -f patch-stamp; then \ - for patch in $(CURDIR)/debian/patches/*.diff ;\ - do \ - echo APPLYING PATCH\: $${patch##*/};\ - patch -p1 < $$patch ;\ - done ;\ - touch patch-stamp ;\ - fi - -patch: patch-stamp - -config.status: configure patch +config.status: configure dh_testdir CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde @@ -92,16 +79,6 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif - # Remove Debian specific patches - if test -f patch-stamp; then \ - for patch in $(CURDIR)/debian/patches/*.diff ;\ - do \ - echo REMOVING PATCH\: $${patch##*/};\ - patch -p1 -R < $$patch ;\ - done ;\ - rm -f patch-stamp ;\ - fi - dh_clean install: build |