Package: bbrun
Severity: wishlist
Tags: patch
Hi,
The dpatch patch management system has been deprecated for some time. The
Lintian currently flags use of dpatch packages as an error. The new 3.0
packaging format is an improved version which, among other things, contains
patch management built-in. For more information, see:
http://wiki.debian.org/Projects/DebSrc3.0
I had some free time; see attached patch to migrate to new package
format. Note that all files in debian/patches/* are canocalized to
*.patch.
Let me know if there is anything that needs adjusting or if it is ok
to upload this version in a NMU in case you are working on other
issues needing attention.
Thanks,
Jari
>From eb8cba35421116f56768c7f5c17e9f9ab84c2a9b Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sun, 22 Apr 2012 21:59:42 +0300
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <jari.aa...@cante.net>
---
debian/README.source | 7 -------
debian/changelog | 11 +++++++++++
debian/compat | 2 +-
debian/control | 6 +++---
debian/copyright | 10 +++++-----
debian/patches/00list | 4 ----
...kfreebsd.dpatch => 01-ftbfs-gnu-kfreebsd.patch} | 7 ++-----
...ain_window.dpatch => 02-kill-main-window.patch} | 9 +++------
...binutils-gold.dpatch => 03-binutils-gold.patch} | 7 ++-----
...eral.dpatch => 04-compare-string-literal.patch} | 7 ++-----
debian/patches/series | 4 ++++
debian/rules | 20 +++++++-------------
debian/source/format | 1 +
13 files changed, 41 insertions(+), 54 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{01_ftbfs-gnu-kfreebsd.dpatch => 01-ftbfs-gnu-kfreebsd.patch} (76%)
rename debian/patches/{02_kill_main_window.dpatch => 02-kill-main-window.patch} (78%)
rename debian/patches/{03_binutils-gold.dpatch => 03-binutils-gold.patch} (73%)
rename debian/patches/{04_compare_string_literal.dpatch => 04-compare-string-literal.patch} (68%)
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 f9dffab..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,7 +0,0 @@
-This package uses dpatch to manage modifications. See
-
- /usr/share/doc/dpatch/README.source.gz
-
-to get more information on how to use it.
-
- -- Kevin Coyner <kcoy...@debian.org> Wed, 16 Mar 2011 00:40:37 +0000
diff --git a/debian/changelog b/debian/changelog
index f5652b3..d8cdfa0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+bbrun (1.6-6.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix description-synopsis-starts-with-article (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Sun, 22 Apr 2012 21:59:19 +0300
+
bbrun (1.6-6) unstable; urgency=low
* debian/control:
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index e0acc37..3364487 100644
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,15 @@ Source: bbrun
Section: x11
Priority: optional
Maintainer: Kevin Coyner <kcoy...@debian.org>
-Build-Depends: debhelper (>= 8), libxpm-dev, libgtk2.0-dev, dpatch
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 9), libxpm-dev, libgtk2.0-dev
+Standards-Version: 3.9.3
Homepage: http://www.darkops.net/bbrun/
Package: bbrun
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: blackbox (>= 0.60.1) | fluxbox
-Description: A tool for the blackbox/fluxbox window managers that runs commands
+Description: tool for the blackbox/fluxbox window managers that runs commands
bbrun is a small but very useful application. It makes it convenient to quickly
execute commands from the blackbox window manager. bbrun is very similar to
KDE's Alt+F2 Run Command dialog box. When launched, it occupies a small portion
diff --git a/debian/copyright b/debian/copyright
index 8ff906f..5283cbe 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -27,7 +27,7 @@ License (bbrun):
Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
On Debian systems, the complete text of the GNU General Public License
-can be found in /usr/share/common-licenses/GPL file.
+can be found in /usr/share/common-licenses/GPL-2 file.
License (wmgeneral/list.c):
@@ -48,7 +48,7 @@ License (wmgeneral/list.c):
Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
On Debian systems, the complete text of the GNU General Public License
-can be found in /usr/share/common-licenses/GPL file.
+can be found in /usr/share/common-licenses/GPL-2 file.
License (wmgeneral/list.h):
@@ -69,7 +69,7 @@ License (wmgeneral/list.h):
Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
On Debian systems, the complete text of the GNU General Public License
-can be found in /usr/share/common-licenses/GPL file.
+can be found in /usr/share/common-licenses/GPL-2 file.
License (wmgeneral/misc.c and misc.h):
@@ -90,7 +90,7 @@ License (wmgeneral/misc.c and misc.h):
Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
On Debian systems, the complete text of the GNU General Public License
-can be found in /usr/share/common-licenses/GPL file.
+can be found in /usr/share/common-licenses/GPL-2 file.
License (wmgeneral/wmgeneral.c and wmgeneral.h):
@@ -111,4 +111,4 @@ License (wmgeneral/wmgeneral.c and wmgeneral.h):
Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
On Debian systems, the complete text of the GNU General Public License
-can be found in /usr/share/common-licenses/GPL file.
+can be found in /usr/share/common-licenses/GPL-2 file.
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 138c125..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-01_ftbfs-gnu-kfreebsd
-02_kill_main_window
-03_binutils-gold
-04_compare_string_literal
diff --git a/debian/patches/01_ftbfs-gnu-kfreebsd.dpatch b/debian/patches/01-ftbfs-gnu-kfreebsd.patch
similarity index 76%
rename from debian/patches/01_ftbfs-gnu-kfreebsd.dpatch
rename to debian/patches/01-ftbfs-gnu-kfreebsd.patch
index 7c81b0d..08a743c 100644
--- a/debian/patches/01_ftbfs-gnu-kfreebsd.dpatch
+++ b/debian/patches/01-ftbfs-gnu-kfreebsd.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_ftbfs-gnu-kfreebsd.dpatch by Petr Salinger <petr.salin...@t-systems.cz>
-##
-## DP: Fixes FTBFS on GNU/kFreeBSD
+From: Petr Salinger <petr.salin...@t-systems.cz>
+Subject: Fixes FTBFS on GNU/kFreeBSD
-@DPATCH@
diff -ur bbrun/bbrun.c bbrun/bbrun.c
--- bbrun-1.6/bbrun/bbrun.c 2004-02-13 01:24:59.000000000 +0100
diff --git a/debian/patches/02_kill_main_window.dpatch b/debian/patches/02-kill-main-window.patch
similarity index 78%
rename from debian/patches/02_kill_main_window.dpatch
rename to debian/patches/02-kill-main-window.patch
index 7263833..995b8fa 100644
--- a/debian/patches/02_kill_main_window.dpatch
+++ b/debian/patches/02-kill-main-window.patch
@@ -1,10 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_kill_main_window.dpatch by Stan Vasilyev <stan.vasil...@csun.edu>
-##
-## DP: Fixes main window mot being destroyed when pressing Enter.
-## DP: Thanks to Milan Zazrivec <xzaz...@fi.muni.cz>
+From: Stan Vasilyev <stan.vasil...@csun.edu>
+Subject: Fixes main window mot being destroyed when pressing Enter.
+Thanks to Milan Zazrivec <xzaz...@fi.muni.cz>
-@DPATCH@
diff -urNad bbrun-1.6~/bbrun/bbrun.c bbrun-1.6/bbrun/bbrun.c
--- bbrun-1.6~/bbrun/bbrun.c 2004-02-12 16:24:59.000000000 -0800
diff --git a/debian/patches/03_binutils-gold.dpatch b/debian/patches/03-binutils-gold.patch
similarity index 73%
rename from debian/patches/03_binutils-gold.dpatch
rename to debian/patches/03-binutils-gold.patch
index 1760428..a293a8d 100644
--- a/debian/patches/03_binutils-gold.dpatch
+++ b/debian/patches/03-binutils-gold.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_binutils-gold.dpatch by Kevin Coyner <kcoy...@debian.org>
-##
-## DP: Fix FTBFS with binutils-gold. Patch from Mahyuddin Susanto <udi...@gmail.com>.
+From: Kevin Coyner <kcoy...@debian.org>
+Subject: Fix FTBFS with binutils-gold. Patch from Mahyuddin Susanto <udi...@gmail.com>.
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' bbrun-1.6~/bbrun/Makefile bbrun-1.6/bbrun/Makefile
--- bbrun-1.6~/bbrun/Makefile 2010-01-31 03:17:09.000000000 +0000
+++ bbrun-1.6/bbrun/Makefile 2011-03-16 01:14:30.000000000 +0000
diff --git a/debian/patches/04_compare_string_literal.dpatch b/debian/patches/04-compare-string-literal.patch
similarity index 68%
rename from debian/patches/04_compare_string_literal.dpatch
rename to debian/patches/04-compare-string-literal.patch
index 7004d32..5f20918 100644
--- a/debian/patches/04_compare_string_literal.dpatch
+++ b/debian/patches/04-compare-string-literal.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_compare_string_literal.dpatch by Kevin Coyner <kcoy...@debian.org>
-##
-## DP: Fix "warning: comparison with string literal results in unspecified behavior". Patch from Tilmann Hentze <tilm...@d983.ath.cx>.
+From: Kevin Coyner <kcoy...@debian.org>
+Subject: Fix "warning: comparison with string literal results in unspecified behavior". Patch from Tilmann Hentze <tilm...@d983.ath.cx>.
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' bbrun-1.6~/bbrun/bbrun.c bbrun-1.6/bbrun/bbrun.c
--- bbrun-1.6~/bbrun/bbrun.c 2011-03-16 01:49:56.000000000 +0000
+++ bbrun-1.6/bbrun/bbrun.c 2011-03-16 01:50:50.000000000 +0000
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f0488fa
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+01-ftbfs-gnu-kfreebsd.patch
+02-kill-main-window.patch
+03-binutils-gold.patch
+04-compare-string-literal.patch
diff --git a/debian/rules b/debian/rules
index b623d8d..2d87143 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,30 +11,24 @@ else
CFLAGS += -O2
endif
+
+build-arch: build
+build-indep: build
+
build: build-stamp
-build-stamp: patch
+build-stamp:
dh_testdir
$(MAKE) -C bbrun
touch build-stamp
-clean: clean-patched unpatch
-clean-patched:
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
$(MAKE) -C bbrun clean
dh_clean
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
- dpatch cat-all >patch-stamp
-
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
install: build
dh_testdir
dh_testroot
@@ -66,4 +60,4 @@ binary-arch: build install
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean clean-patched binary-indep binary-arch binary install unpatch patch
+.PHONY: build clean clean-patched binary-indep binary-arch binary install
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.10
