Package: wbar Followup-For: Bug #661034 See attached patch to migrate to new package format. Note that all files in debian/patches/* are canocalized to *.patch.
-- System Information: Debian Release: wheezy/sid APT prefers unstable APT policy: (990, 'unstable'), (1, 'experimental') Architecture: i386 (i686) Kernel: Linux 3.2.0-1-686-pae (SMP w/2 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
>From 4558140dd65a46dde2f4e0b08be9c7ce082e0bed Mon Sep 17 00:00:00 2001 From: Jari Aalto <[email protected]> Date: Fri, 24 Feb 2012 16:54:39 -0500 Subject: [PATCH] format-3.0 Organization: Private Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Signed-off-by: Jari Aalto <[email protected]> --- debian/README.source | 26 -------------------- debian/changelog | 8 ++++++ debian/compat | 2 +- debian/control | 4 +- debian/patches/00list | 4 --- ...g-includes.dpatch => 01-missing-includes.patch} | 7 +---- ...dpatch => 02-Makefile-install-to-DESTDIR.patch} | 7 +---- ...e-PenguinAttack-instead-of-non-free-font.dpatch | 18 ------------- ...se-PenguinAttack-instead-of-non-free-font.patch | 18 +++++++++++++ ...h => 04-Makefile-do-not-install-dot.wbar.patch} | 7 +---- debian/patches/series | 4 +++ debian/rules | 5 +-- debian/source/format | 1 + 13 files changed, 42 insertions(+), 69 deletions(-) delete mode 100644 debian/README.source delete mode 100644 debian/patches/00list rename debian/patches/{01-missing-includes.dpatch => 01-missing-includes.patch} (76%) rename debian/patches/{02-Makefile-install-to-DESTDIR.dpatch => 02-Makefile-install-to-DESTDIR.patch} (83%) delete mode 100644 debian/patches/03-Makefile-use-PenguinAttack-instead-of-non-free-font.dpatch create mode 100644 debian/patches/03-Makefile-use-PenguinAttack-instead-of-non-free-font.patch rename debian/patches/{04-Makefile-do-not-install-dot.wbar.dpatch => 04-Makefile-do-not-install-dot.wbar.patch} (73%) create mode 100644 debian/patches/series create mode 100644 debian/source/format diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index b59f078..0000000 --- a/debian/README.source +++ /dev/null @@ -1,26 +0,0 @@ -This package uses dpatch to manage all modifications to the upstream -source. Changes are stored in the source package as diffs in -debian/patches and applied during the build. - -To get the fully patched source after unpacking the source package, cd -to the root level of the source package and run: - - debian/rules patch - -Removing a patch is as simple as removing its entry from the -debian/patches/00list file, and please also remove the patch file -itself. - -Creating a new patch is done with "dpatch-edit-patch patch XX_patchname" -where you should replace XX with a new number and patchname with a -descriptive shortname of the patch. You can then simply edit all the -files your patch wants to edit, and then simply "exit 0" from the shell -to actually create the patch file. - -To tweak an already existing patch, call "dpatch-edit-patch XX_patchname" -and replace XX_patchname with the actual filename from debian/patches -you want to use. - -To clean up afterwards again, "debian/rules unpatch" will do the -work for you - or you can of course choose to call -"fakeroot debian/rules clean" all together. diff --git a/debian/changelog b/debian/changelog index 7527d1c..95a49be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +wbar (1.3.3+dfsg2-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Remove dpatch and upgrade to packaging format "3.0 quilt". + * Update to Standards-Version to 3.9.3 and debhelper to 9. + + -- Jari Aalto <[email protected]> Fri, 24 Feb 2012 16:42:12 -0500 + wbar (1.3.3+dfsg2-1) unstable; urgency=low * Repacked again to get rid of non-free icons (Closes: #540612) diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index e60ab3f..a18b602 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: wbar Section: x11 Priority: optional Maintainer: Krzysztof Burghardt <[email protected]> -Build-Depends: dpatch, debhelper (>= 7), libimlib2-dev -Standards-Version: 3.8.3 +Build-Depends: debhelper (>= 9), libimlib2-dev +Standards-Version: 3.9.3 Homepage: http://code.google.com/p/wbar/ Package: wbar diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index fc6197a..0000000 --- a/debian/patches/00list +++ /dev/null @@ -1,4 +0,0 @@ -01-missing-includes.dpatch -02-Makefile-install-to-DESTDIR.dpatch -03-Makefile-use-PenguinAttack-instead-of-non-free-font.dpatch -04-Makefile-do-not-install-dot.wbar.dpatch diff --git a/debian/patches/01-missing-includes.dpatch b/debian/patches/01-missing-includes.patch similarity index 76% rename from debian/patches/01-missing-includes.dpatch rename to debian/patches/01-missing-includes.patch index 1702241..7bb5fb5 100644 --- a/debian/patches/01-missing-includes.dpatch +++ b/debian/patches/01-missing-includes.patch @@ -1,9 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01-missing-includes.dpatch by Krzysztof Burghardt <[email protected]> -## -## DP: Add missing includes to IconLoader.cc and SuperBar.cc. +From: Krzysztof Burghardt <[email protected]> +Subject: Add missing includes to IconLoader.cc and SuperBar.cc. -@DPATCH@ diff -urNad wbar-1.3.3~/IconLoader.cc wbar-1.3.3/IconLoader.cc --- wbar-1.3.3~/IconLoader.cc 2006-12-29 02:54:29.000000000 +0100 +++ wbar-1.3.3/IconLoader.cc 2009-03-16 19:48:11.262472725 +0100 diff --git a/debian/patches/02-Makefile-install-to-DESTDIR.dpatch b/debian/patches/02-Makefile-install-to-DESTDIR.patch similarity index 83% rename from debian/patches/02-Makefile-install-to-DESTDIR.dpatch rename to debian/patches/02-Makefile-install-to-DESTDIR.patch index 2808d6c..03c9c31 100644 --- a/debian/patches/02-Makefile-install-to-DESTDIR.dpatch +++ b/debian/patches/02-Makefile-install-to-DESTDIR.patch @@ -1,9 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02-Makefile-install-to-DESTDIR.dpatch by Krzysztof Burghardt <[email protected]> -## -## DP: Install to $DESTDIR not to /. +From: Krzysztof Burghardt <[email protected]> +Subject: Install to $DESTDIR not to /. -@DPATCH@ diff -urNad wbar-1.3.3+dfsg1~/Makefile wbar-1.3.3+dfsg1/Makefile --- wbar-1.3.3+dfsg1~/Makefile 2007-09-26 18:24:10.000000000 +0200 +++ wbar-1.3.3+dfsg1/Makefile 2009-03-16 21:49:09.109406343 +0100 diff --git a/debian/patches/03-Makefile-use-PenguinAttack-instead-of-non-free-font.dpatch b/debian/patches/03-Makefile-use-PenguinAttack-instead-of-non-free-font.dpatch deleted file mode 100644 index a4a85ba..0000000 --- a/debian/patches/03-Makefile-use-PenguinAttack-instead-of-non-free-font.dpatch +++ /dev/null @@ -1,18 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 03-Makefile-use-PenguinAttack-instead-of-non-free-font.dpatch by Krzysztof Burghardt <[email protected]> -## -## DP: Replace non-free font included in package with link to free on. - -@DPATCH@ -diff -urNad wbar-1.3.3+dfsg1~/Makefile wbar-1.3.3+dfsg1/Makefile ---- wbar-1.3.3+dfsg1~/Makefile 2007-09-26 18:24:10.000000000 +0200 -+++ wbar-1.3.3+dfsg1/Makefile 2009-03-16 21:59:43.891752703 +0100 -@@ -30,7 +30,7 @@ - - #ln -fs $(PREFIX)/iconpack/comic.ttf $(PREFIX)/iconpack/wbar.nuvoux/font.ttf - #ln -fs $(PREFIX)/iconpack/comic.ttf $(PREFIX)/iconpack/wbar.ice/font.ttf -- ln -fs $(PREFIX)/iconpack/comic.ttf $(PREFIX)/iconpack/wbar.osx/font.ttf -+ ln -fs /usr/share/fonts/truetype/dustin/PenguinAttack.ttf $(PREFIX)/iconpack/wbar.osx/font.ttf - - install ./wbar /usr/bin - diff --git a/debian/patches/03-Makefile-use-PenguinAttack-instead-of-non-free-font.patch b/debian/patches/03-Makefile-use-PenguinAttack-instead-of-non-free-font.patch new file mode 100644 index 0000000..15edf24 --- /dev/null +++ b/debian/patches/03-Makefile-use-PenguinAttack-instead-of-non-free-font.patch @@ -0,0 +1,18 @@ +From: Krzysztof Burghardt <[email protected]> +Subject: Replace non-free font included in package with link to free on. + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/Makefile ++++ b/Makefile +@@ -30,7 +30,7 @@ + + #ln -fs $(PREFIX)/iconpack/comic.ttf $(PREFIX)/iconpack/wbar.nuvoux/font.ttf + #ln -fs $(PREFIX)/iconpack/comic.ttf $(PREFIX)/iconpack/wbar.ice/font.ttf +- ln -fs $(PREFIX)/iconpack/comic.ttf $(PREFIX)/iconpack/wbar.osx/font.ttf ++ ln -fs /usr/share/fonts/truetype/dustin/PenguinAttack.ttf $(PREFIX)/iconpack/wbar.osx/font.ttf + + install -D ./wbar $(DESTDIR)/usr/bin/wbar + diff --git a/debian/patches/04-Makefile-do-not-install-dot.wbar.dpatch b/debian/patches/04-Makefile-do-not-install-dot.wbar.patch similarity index 73% rename from debian/patches/04-Makefile-do-not-install-dot.wbar.dpatch rename to debian/patches/04-Makefile-do-not-install-dot.wbar.patch index 507ad73..dffff0c 100644 --- a/debian/patches/04-Makefile-do-not-install-dot.wbar.dpatch +++ b/debian/patches/04-Makefile-do-not-install-dot.wbar.patch @@ -1,9 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 04-Makefile-do-not-install-dot.wbar.dpatch by Krzysztof Burghardt <[email protected]> -## -## DP: dot.wbar is installed by debian/rules into usr/share/doc/wbar/examples. +From: Krzysztof Burghardt <[email protected]> +Subject: dot.wbar is installed by debian/rules into usr/share/doc/wbar/examples. -@DPATCH@ diff -urNad wbar-1.3.3+dfsg1~/Makefile wbar-1.3.3+dfsg1/Makefile --- wbar-1.3.3+dfsg1~/Makefile 2009-03-16 22:46:02.021410872 +0100 +++ wbar-1.3.3+dfsg1/Makefile 2009-03-16 22:46:19.089413579 +0100 diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..8ba18ae --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,4 @@ +01-missing-includes.patch +02-Makefile-install-to-DESTDIR.patch +03-Makefile-use-PenguinAttack-instead-of-non-free-font.patch +04-Makefile-do-not-install-dot.wbar.patch diff --git a/debian/rules b/debian/rules index e6fc3e1..3c3ee39 100755 --- a/debian/rules +++ b/debian/rules @@ -4,15 +4,14 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -include /usr/share/dpatch/dpatch.make build: build-stamp -build-stamp: patch-stamp +build-stamp: dh_testdir $(MAKE) touch $@ -clean: unpatch +clean: dh_testdir dh_testroot $(MAKE) clean diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- 1.7.9
