Package: cobalt-panel-utils
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 it is ok to upload the upgraded version in a NMU in case you
are working on other issues needing attention.
Thanks,
Jari
>From 4113585d8d98f8ad1d7f02eb2f5a6ea7ff4ef6c8 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sun, 4 Mar 2012 05:46:07 -0500
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/changelog | 10 +++++
debian/compat | 2 +-
debian/control | 4 +-
...nhancements => 000-Makefile_enhancements.patch} | 36 ++++++++++----------
debian/patches/001-lib_Makefile_enhancements | 24 -------------
debian/patches/001-lib_Makefile_enhancements.patch | 26 ++++++++++++++
...warnings => 002-fix_several_gcc_warnings.patch} | 13 ++-----
...ign => 003-fix_hyphen_used_as_minus_sign.patch} | 10 +----
debian/patches/00list | 4 --
debian/patches/series | 4 ++
debian/rules | 7 +---
debian/source/format | 1 +
12 files changed, 70 insertions(+), 71 deletions(-)
rename debian/patches/{000-Makefile_enhancements => 000-Makefile_enhancements.patch} (72%)
delete mode 100644 debian/patches/001-lib_Makefile_enhancements
create mode 100644 debian/patches/001-lib_Makefile_enhancements.patch
rename debian/patches/{002-fix_several_gcc_warnings => 002-fix_several_gcc_warnings.patch} (85%)
rename debian/patches/{003-fix_hyphen_used_as_minus_sign => 003-fix_hyphen_used_as_minus_sign.patch} (87%)
delete mode 100644 debian/patches/00list
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 36ff3eb..c9dd876 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+cobalt-panel-utils (1.0.2-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ Note: patches 000 and 001 were updated with "quilt refresh" to make
+ them apply cleanly.
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+
+ -- Jari Aalto <jari.aa...@cante.net> Sun, 04 Mar 2012 05:45:56 -0500
+
cobalt-panel-utils (1.0.2-3) unstable; urgency=low
* Fix bad architectures list.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 36769f9..8638c00 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: cobalt-panel-utils
Section: admin
Priority: optional
Maintainer: Adam Cécile (Le_Vert) <gand...@le-vert.net>
-Build-Depends: debhelper (>= 5), dpatch
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
Package: cobalt-panel-utils
Architecture: i386 mipsel
diff --git a/debian/patches/000-Makefile_enhancements b/debian/patches/000-Makefile_enhancements.patch
similarity index 72%
rename from debian/patches/000-Makefile_enhancements
rename to debian/patches/000-Makefile_enhancements.patch
index d64156f..5632dfe 100644
--- a/debian/patches/000-Makefile_enhancements
+++ b/debian/patches/000-Makefile_enhancements.patch
@@ -1,19 +1,17 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 000-Makefile_enhancements by
-## Adam Cécile (Le_Vert) <gand...@le-vert.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix several upstream Makefile issues.
-## DP: * DESTDIR support
-## DP: * Install target
-## DP: * Remove useless stuff
-## DP: * Add GPL header
+From: Unknown
+Subject: Fix several upstream Makefile issues.
+ * DESTDIR support
+ * Install target
+ * Remove useless stuff
+ * Add GPL header
-@DPATCH@
-diff -u cobalt-panel-utils-1.0.2/Makefile.orig cobalt-panel-utils-1.0.2/Makefile
---- cobalt-panel-utils-1.0.2/Makefile.orig 2006-08-18 00:36:09.000000000 +0200
-+++ cobalt-panel-utils-1.0.2/Makefile 2006-08-18 00:37:27.000000000 +0200
+---
+ Makefile | 44 +++++++++++++++++++++++++++++++++-----------
+ 1 file changed, 33 insertions(+), 11 deletions(-)
+
+--- a/Makefile
++++ b/Makefile
@@ -1,15 +1,28 @@
+# Copyright (C) 2006, Adam Cécile (Le_Vert)
+# Copyright (C) 2005, Jeff Walter
@@ -29,12 +27,12 @@ diff -u cobalt-panel-utils-1.0.2/Makefile.orig cobalt-panel-utils-1.0.2/Makefile
-BINDIR = $(PREFIX)/sbin
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DESTDIR =
+PREFIX = /usr/local
@@ -50,13 +48,15 @@ diff -u cobalt-panel-utils-1.0.2/Makefile.orig cobalt-panel-utils-1.0.2/Makefile
LIB = lib/liblcd.a
SRCS = lcd-write.c lcd-swrite.c lcd-yesno.c lcd-setcursor.c \
-@@ -17,16 +30,14 @@
+@@ -17,16 +30,16 @@
OBJS := $(SRCS:.c=.o)
PROG := $(OBJS:.o=)
-DEBUG = -g -Wall
-COPTS = -O2
-CFLAGS = $(COPTS) $(COPTFLAGS) #$(DEBUG)
++#DEBUG = -g -Wall
++#COPTS = -O2
+CFLAGS = $(COPTFLAGS)
LIBS = -llcd
LDFLAGS = $(STATIC) -L./lib
@@ -69,7 +69,7 @@ diff -u cobalt-panel-utils-1.0.2/Makefile.orig cobalt-panel-utils-1.0.2/Makefile
$(OBJS): lcdutils.h
-@@ -63,3 +74,12 @@
+@@ -63,3 +76,12 @@
$(MAKE) -C lib clean
-rm -f $(OBJS) $(PROG) *~ TAGS
diff --git a/debian/patches/001-lib_Makefile_enhancements b/debian/patches/001-lib_Makefile_enhancements
deleted file mode 100644
index fc4d2e7..0000000
--- a/debian/patches/001-lib_Makefile_enhancements
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 001-lib_Makefile_enhancements by
-## Adam Cécile (Le_Vert) <gand...@le-vert.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix several upstream Makefile issues.
-## DP: * Better CFLAGS support
-
-@DPATCH@
-
-diff -u cobalt-panel-utils-1.0.2/lib/Makefile.orig cobalt-panel-utils-1.0.2/lib/Makefile
---- cobalt-panel-utils-1.0.2/lib/Makefile 2005-04-14 16:04:06.000000000 +0200
-+++ cobalt-panel-utils-1.0.2/lib/Makefile.orig 2006-08-18 00:40:03.000000000 +0200
-@@ -8,9 +8,7 @@
-
- RANLIB = ranlib
-
--DEBUG = -g -Wall
--COPTS = -O2
--CFLAGS = $(COPTS) -I../ $(COPTFLAGS)
-+CFLAGS = -I../ $(COPTFLAGS)
-
- all: $(LIB)
-
diff --git a/debian/patches/001-lib_Makefile_enhancements.patch b/debian/patches/001-lib_Makefile_enhancements.patch
new file mode 100644
index 0000000..35474dd
--- /dev/null
+++ b/debian/patches/001-lib_Makefile_enhancements.patch
@@ -0,0 +1,26 @@
+From: Unknown
+Subject: Fix several upstream Makefile issues. Better CFLAGS support
+
+
+---
+ lib/Makefile | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -8,11 +8,11 @@
+
+ RANLIB = ranlib
+
+-DEBUG = -g -Wall
+-COPTS = -O2
+-CFLAGS = $(COPTS) -I../ $(COPTFLAGS)
++#DEBUG = -g -Wall
++#COPTS = -O2
++CFLAGS = -I../ $(COPTFLAGS)
+
+-all: $(LIB)
++all: $(LIB)
+
+ $(OBJS): ../lcdutils.h
+
diff --git a/debian/patches/002-fix_several_gcc_warnings b/debian/patches/002-fix_several_gcc_warnings.patch
similarity index 85%
rename from debian/patches/002-fix_several_gcc_warnings
rename to debian/patches/002-fix_several_gcc_warnings.patch
index 5807be6..49a0dd3 100644
--- a/debian/patches/002-fix_several_gcc_warnings
+++ b/debian/patches/002-fix_several_gcc_warnings.patch
@@ -1,13 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 002-fix_several_gcc_warnings by
-## Adam Cécile (Le_Vert) <gand...@le-vert.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix several GCC warnings :
-## DP: * Implicit functions declaration (missing includes)
-## DP: * Unused variable
+From: Unknown
+Subject: Fix several GCC warnings
+ * Implicit functions declaration (missing includes)
+ * Unused variable
-@DPATCH@
diff -u cobalt-panel-utils-1.0.2.orig/iflink.c cobalt-panel-utils-1.0.2.new/iflink.c
--- cobalt-panel-utils-1.0.2.orig/iflink.c 2006-08-24 20:41:11.000000000 +0200
diff --git a/debian/patches/003-fix_hyphen_used_as_minus_sign b/debian/patches/003-fix_hyphen_used_as_minus_sign.patch
similarity index 87%
rename from debian/patches/003-fix_hyphen_used_as_minus_sign
rename to debian/patches/003-fix_hyphen_used_as_minus_sign.patch
index 52abb67..ba17b04 100644
--- a/debian/patches/003-fix_hyphen_used_as_minus_sign
+++ b/debian/patches/003-fix_hyphen_used_as_minus_sign.patch
@@ -1,12 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 003-fix_hyphen_used_as_minus_sign
-## Adam Cécile (Le_Vert) <gand...@le-vert.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix several GCC warnings :
-## DP: * Fix hyphen used as minus sign in manpages
+From: Unknown
+Subject: Fix hyphen used as minus sign in manpages
-@DPATCH@
diff -u cobalt-panel-utils-1.0.2/doc/man/lcd-flash.1 cobalt-panel-utils-1.0.2/doc/man.new/lcd-flash.1
--- cobalt-panel-utils-1.0.2/doc/man/lcd-flash.1 2005-07-30 20:19:01.000000000 +0200
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 0747813..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-000-Makefile_enhancements
-001-lib_Makefile_enhancements
-002-fix_several_gcc_warnings
-003-fix_hyphen_used_as_minus_sign
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1994b60
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+000-Makefile_enhancements.patch
+001-lib_Makefile_enhancements.patch
+002-fix_several_gcc_warnings.patch
+003-fix_hyphen_used_as_minus_sign.patch
diff --git a/debian/rules b/debian/rules
index ab6b4e2..af731ce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,9 +4,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# Include dpatch targets
-include /usr/share/dpatch/dpatch.make
-
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -20,12 +17,12 @@ MANDIR = $(CURDIR)/debian/cobalt-panel-utils/usr/share/man/man8
build: build-stamp
-build-stamp: patch
+build-stamp:
dh_testdir
$(MAKE) COPTFLAGS="$(CFLAGS)"
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
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
