From f4dab42294337cce137e1cb8fd63eb36de11e082 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 23 Aug 2012 02:52:33 +0200 Subject: [PATCH] Superseded former way of managing patches for kaffeine-mozilla on Debian and Ubuntu --- .../kaffeine-mozilla/debian/control | 2 +- .../kaffeine-mozilla/debian/rules | 38 ------------------- .../kaffeine-mozilla/debian/control | 2 +- .../kaffeine-mozilla/debian/rules | 38 ------------------- 4 files changed, 2 insertions(+), 78 deletions(-) diff --git a/debian/squeeze/applications/kaffeine-mozilla/debian/control b/debian/squeeze/applications/kaffeine-mozilla/debian/control index 9a7389392..62cf2fd5e 100644 --- a/debian/squeeze/applications/kaffeine-mozilla/debian/control +++ b/debian/squeeze/applications/kaffeine-mozilla/debian/control @@ -3,7 +3,7 @@ Section: web Priority: optional Maintainer: Timothy Pearson Uploaders: Riku Voipio -Build-Depends: debhelper (>= 4.0.0), libxaw7-dev, libnspr4-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 4.0.0), quilt, libxaw7-dev, libnspr4-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kaffeine-mozilla-trinity diff --git a/debian/squeeze/applications/kaffeine-mozilla/debian/rules b/debian/squeeze/applications/kaffeine-mozilla/debian/rules index 86b977b3f..0fe0eb38e 100755 --- a/debian/squeeze/applications/kaffeine-mozilla/debian/rules +++ b/debian/squeeze/applications/kaffeine-mozilla/debian/rules @@ -44,26 +44,6 @@ config.status: autoconf automake - # Apply Debian specific patches - if test -d $(CURDIR)/debian/patches ;\ - then \ - for i in $(CURDIR)/debian/patches/*.diff.uu ;\ - do \ - cd $(CURDIR)/debian/patches ;\ - uudecode "$$i" ;\ - cd $(CURDIR) ;\ - done ;\ - patches=$$(find $(CURDIR)/debian/patches -name *.diff | sort);\ - fi ;\ - if test ! -f patch-stamp; then \ - for patch in $$patches ;\ - do \ - echo APPLYING PATCH\: "$${patch##*/}" ;\ - patch -p1 < "$$patch" ;\ - done ;\ - touch patch-stamp ;\ - fi - # Add here commands to configure the package. CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/opt/trinity --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info @@ -96,24 +76,6 @@ clean: # Add here commands to clean up after the build process. - # Remove Debian specific patches - if test -d $(CURDIR)/debian/patches ;\ - then \ - patches=$$(find $(CURDIR)/debian/patches -name *.diff | sort -r);\ - fi ;\ - if test -f patch-stamp; then \ - for patch in $$patches ;\ - do \ - echo REMOVING PATCH\: "$${patch##*/}" ;\ - patch -p1 -R < "$$patch" ;\ - done ;\ - for i in $(CURDIR)/debian/patches/*.diff.uu ;\ - do \ - rm -f "$${i%%.uu}" ;\ - done ;\ - rm -f patch-stamp ;\ - fi - -$(MAKE) distclean ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub diff --git a/ubuntu/maverick/applications/kaffeine-mozilla/debian/control b/ubuntu/maverick/applications/kaffeine-mozilla/debian/control index afc97f80f..a735ae4d3 100644 --- a/ubuntu/maverick/applications/kaffeine-mozilla/debian/control +++ b/ubuntu/maverick/applications/kaffeine-mozilla/debian/control @@ -3,7 +3,7 @@ Section: web Priority: optional Maintainer: Timothy Pearson Uploaders: Riku Voipio -Build-Depends: debhelper (>= 4.0.0), libxaw7-dev, libnspr4-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 4.0.0), quilt, libxaw7-dev, libnspr4-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kaffeine-mozilla-trinity diff --git a/ubuntu/maverick/applications/kaffeine-mozilla/debian/rules b/ubuntu/maverick/applications/kaffeine-mozilla/debian/rules index 86b977b3f..0fe0eb38e 100755 --- a/ubuntu/maverick/applications/kaffeine-mozilla/debian/rules +++ b/ubuntu/maverick/applications/kaffeine-mozilla/debian/rules @@ -44,26 +44,6 @@ config.status: autoconf automake - # Apply Debian specific patches - if test -d $(CURDIR)/debian/patches ;\ - then \ - for i in $(CURDIR)/debian/patches/*.diff.uu ;\ - do \ - cd $(CURDIR)/debian/patches ;\ - uudecode "$$i" ;\ - cd $(CURDIR) ;\ - done ;\ - patches=$$(find $(CURDIR)/debian/patches -name *.diff | sort);\ - fi ;\ - if test ! -f patch-stamp; then \ - for patch in $$patches ;\ - do \ - echo APPLYING PATCH\: "$${patch##*/}" ;\ - patch -p1 < "$$patch" ;\ - done ;\ - touch patch-stamp ;\ - fi - # Add here commands to configure the package. CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/opt/trinity --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info @@ -96,24 +76,6 @@ clean: # Add here commands to clean up after the build process. - # Remove Debian specific patches - if test -d $(CURDIR)/debian/patches ;\ - then \ - patches=$$(find $(CURDIR)/debian/patches -name *.diff | sort -r);\ - fi ;\ - if test -f patch-stamp; then \ - for patch in $$patches ;\ - do \ - echo REMOVING PATCH\: "$${patch##*/}" ;\ - patch -p1 -R < "$$patch" ;\ - done ;\ - for i in $(CURDIR)/debian/patches/*.diff.uu ;\ - do \ - rm -f "$${i%%.uu}" ;\ - done ;\ - rm -f patch-stamp ;\ - fi - -$(MAKE) distclean ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub