Package: wmcalclock
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 b7c7bd2419062669ef486fc600f473446eee4171 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Tue, 24 Apr 2012 00:11: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>
---
Src/Makefile | 5 ++-
Src/wmCalClock.c | 2 +-
debian/README.source | 6 ----
debian/changelog | 13 +++++++
debian/compat | 2 +-
debian/control | 4 +--
debian/copyright | 2 +-
debian/patches/00-debian-local-changes.patch | 37 ++++++++++++++++++++
debian/patches/00list | 4 ---
...manpage_patch.dpatch => 01-manpage-patch.patch} | 7 ++--
.../{02_30hr_patch.dpatch => 02-30hr-patch.patch} | 13 +++----
...hr_patch.dpatch => 03-manapge-30hr-patch.patch} | 7 ++--
...ions.dpatch => 04-makefile-modifications.patch} | 7 ++--
debian/patches/series | 5 +++
debian/rules | 11 +++---
debian/source/format | 1 +
16 files changed, 81 insertions(+), 45 deletions(-)
delete mode 100644 debian/README.source
create mode 100644 debian/patches/00-debian-local-changes.patch
delete mode 100644 debian/patches/00list
rename debian/patches/{01_manpage_patch.dpatch => 01-manpage-patch.patch} (73%)
rename debian/patches/{02_30hr_patch.dpatch => 02-30hr-patch.patch} (86%)
rename debian/patches/{03_manapge_30hr_patch.dpatch => 03-manapge-30hr-patch.patch} (77%)
rename debian/patches/{04_makefile_modifications.dpatch => 04-makefile-modifications.patch} (83%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/Src/Makefile b/Src/Makefile
index 8f40445..fecc1f9 100644
--- a/Src/Makefile
+++ b/Src/Makefile
@@ -3,7 +3,6 @@ CFLAGS = -O2 -Wall
INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include
DESTDIR= /usr/X11R6
LIBDIR = -L/usr/X11R6/lib
-INSTALL_PROGRAM = install -c -s -m 0755
# for Linux
LIBS = -lXpm -lX11 -lXext
@@ -32,6 +31,6 @@ clean:
rm -f wmCalClock
install:: wmCalClock
- $(INSTALL_PROGRAM) wmCalClock $(DESTDIR)/bin/wmcalclock
- install -c -m 0644 wmCalClock.1 $(DESTDIR)/man/man1/wmcalclock.1
+ install -c -s -m 0755 wmCalClock $(DESTDIR)/bin
+ install -c -m 0644 wmCalClock.1 $(DESTDIR)/man/man1
diff --git a/Src/wmCalClock.c b/Src/wmCalClock.c
index a6dcf59..fa9a2f7 100644
--- a/Src/wmCalClock.c
+++ b/Src/wmCalClock.c
@@ -890,7 +890,7 @@ void print_usage(){
printf("\t-l\t\tUse a low-color pixmap to conserve colors. On 8-bit displays the\n");
printf("\t \t\tlow color pixmap will always be used.\n");
printf("\t-h\t\tDisplay help screen.\n");
- printf("\nExample: wmCalClock -b 100 -tc '#001100' -bc '#7e9e69' \n\n");
+ printf("\nExample: wmCalClock -b 100 -tc #001100 -bc #7e9e69 \n\n");
}
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index d421cc5..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,6 +0,0 @@
-This package is using the dpatch patch system.
-
-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`
-
-See /usr/share/doc/dpatch/README.source.gz for more information.
diff --git a/debian/changelog b/debian/changelog
index 15482ac..748a5a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+wmcalclock (1.25-15.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.
+ * Patch 00 is new; in-line changes to original sources.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix description-synopsis-starts-with-article (Lintian).
+ * Fix description-synopsis-starts-with-article (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Tue, 24 Apr 2012 00:11:07 +0300
+
wmcalclock (1.25-15) unstable; urgency=low
* debian/control:
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 0e908c8..8dbba3a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: wmcalclock
Section: x11
Priority: optional
Maintainer: Kevin Coyner <kcoy...@debian.org>
-Build-Depends: debhelper (>= 7.4~), libx11-dev, libxext-dev, libxpm-dev, x11proto-core-dev, dpatch
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 9), libx11-dev, libxext-dev, libxpm-dev, x11proto-core-dev
+Standards-Version: 3.9.3
Package: wmcalclock
Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 5899013..348dcdf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -22,4 +22,4 @@ License:
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'.
+found in `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/patches/00-debian-local-changes.patch b/debian/patches/00-debian-local-changes.patch
new file mode 100644
index 0000000..a426613
--- /dev/null
+++ b/debian/patches/00-debian-local-changes.patch
@@ -0,0 +1,37 @@
+From: Unknown
+Subject: Local Debian changes
+
+diff --git a/Src/Makefile b/Src/Makefile
+index fecc1f9..8f40445 100644
+--- a/Src/Makefile
++++ b/Src/Makefile
+@@ -3,6 +3,7 @@ CFLAGS = -O2 -Wall
+ INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include
+ DESTDIR= /usr/X11R6
+ LIBDIR = -L/usr/X11R6/lib
++INSTALL_PROGRAM = install -c -s -m 0755
+
+ # for Linux
+ LIBS = -lXpm -lX11 -lXext
+@@ -31,6 +32,6 @@ clean:
+ rm -f wmCalClock
+
+ install:: wmCalClock
+- install -c -s -m 0755 wmCalClock $(DESTDIR)/bin
+- install -c -m 0644 wmCalClock.1 $(DESTDIR)/man/man1
++ $(INSTALL_PROGRAM) wmCalClock $(DESTDIR)/bin/wmcalclock
++ install -c -m 0644 wmCalClock.1 $(DESTDIR)/man/man1/wmcalclock.1
+
+diff --git a/Src/wmCalClock.c b/Src/wmCalClock.c
+index fa9a2f7..a6dcf59 100644
+--- a/Src/wmCalClock.c
++++ b/Src/wmCalClock.c
+@@ -890,7 +890,7 @@ void print_usage(){
+ printf("\t-l\t\tUse a low-color pixmap to conserve colors. On 8-bit displays the\n");
+ printf("\t \t\tlow color pixmap will always be used.\n");
+ printf("\t-h\t\tDisplay help screen.\n");
+- printf("\nExample: wmCalClock -b 100 -tc #001100 -bc #7e9e69 \n\n");
++ printf("\nExample: wmCalClock -b 100 -tc '#001100' -bc '#7e9e69' \n\n");
+
+ }
+
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 1cb4761..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-01_manpage_patch
-02_30hr_patch
-03_manapge_30hr_patch
-04_makefile_modifications
diff --git a/debian/patches/01_manpage_patch.dpatch b/debian/patches/01-manpage-patch.patch
similarity index 73%
rename from debian/patches/01_manpage_patch.dpatch
rename to debian/patches/01-manpage-patch.patch
index 8dbdeb9..46a479d 100644
--- a/debian/patches/01_manpage_patch.dpatch
+++ b/debian/patches/01-manpage-patch.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_manpage- patch.dpatch by Kevin Coyner <kcoy...@debian.org>
-##
-## DP: manpage-patch
+From: Kevin Coyner <kcoy...@debian.org>
+Subject: manpage-patch
-@DPATCH@
--- wmcalclock-1.25/Src/wmCalClock.1 1999-03-28 22:16:23.000000000 +0000
+++ wmcalclock-1.25-rwbarton/Src/wmCalClock.1 2005-01-29 10:02:30.000000000 +0000
diff --git a/debian/patches/02_30hr_patch.dpatch b/debian/patches/02-30hr-patch.patch
similarity index 86%
rename from debian/patches/02_30hr_patch.dpatch
rename to debian/patches/02-30hr-patch.patch
index 28beb8e..1f7c256 100644
--- a/debian/patches/02_30hr_patch.dpatch
+++ b/debian/patches/02-30hr-patch.patch
@@ -1,12 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_30hr_patch.dpatch by Kevin Coyner <kcoy...@debian.org>
-##
-## DP: 30hr-patch See Debian bug #292736
-## DP: Original patch from Reid W. Barton
-## DP: Show local time in 30-hour format. Times between midnight and 6 AM
-## DP: are displayed as belonging to the previous day,
+From: Kevin Coyner <kcoy...@debian.org>
+Subject: 30hr-patch See Debian bug #292736
+Original patch from Reid W. Barton
+ Show local time in 30-hour format. Times between midnight and 6 AM
+ are displayed as belonging to the previous day,
-@DPATCH@
--- wmcalclock-1.25/Src/wmCalClock.c~ 2007-06-04 11:16:43.000000000 -0400
+++ wmcalclock-1.25/Src/wmCalClock.c 2007-06-04 11:14:31.000000000 -0400
diff --git a/debian/patches/03_manapge_30hr_patch.dpatch b/debian/patches/03-manapge-30hr-patch.patch
similarity index 77%
rename from debian/patches/03_manapge_30hr_patch.dpatch
rename to debian/patches/03-manapge-30hr-patch.patch
index 2745e33..8d47c26 100644
--- a/debian/patches/03_manapge_30hr_patch.dpatch
+++ b/debian/patches/03-manapge-30hr-patch.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_manpage-30hr.dpatch by Kevin Coyner <kcoy...@debian.org>
-##
-## DP: mapage 30hr
+From: Kevin Coyner <kcoy...@debian.org>
+Subject: mapage 30hr
-@DPATCH@
--- wmcalclock-1.25/Src/wmCalClock.1~ 2007-06-04 11:37:04.000000000 -0400
+++ wmcalclock-1.25/Src/wmCalClock.1 2007-06-04 11:37:46.000000000 -0400
diff --git a/debian/patches/04_makefile_modifications.dpatch b/debian/patches/04-makefile-modifications.patch
similarity index 83%
rename from debian/patches/04_makefile_modifications.dpatch
rename to debian/patches/04-makefile-modifications.patch
index 9a924a8..33cb295 100644
--- a/debian/patches/04_makefile_modifications.dpatch
+++ b/debian/patches/04-makefile-modifications.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_makefile_modifications.dpatch by Kevin Coyner <kcoy...@debian.org>
-##
-## DP: Modifications to Src/Makefile
+From: Kevin Coyner <kcoy...@debian.org>
+Subject: Modifications to Src/Makefile
-@DPATCH@
diff -urNad wmcalclock-1.25~/Src/Makefile wmcalclock-1.25/Src/Makefile
--- wmcalclock-1.25~/Src/Makefile 2009-10-18 22:35:56.000000000 -0400
+++ wmcalclock-1.25/Src/Makefile 2009-10-21 12:31:49.000000000 -0400
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7f8ba94
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,5 @@
+00-debian-local-changes.patch
+01-manpage-patch.patch
+02-30hr-patch.patch
+03-manapge-30hr-patch.patch
+04-makefile-modifications.patch
diff --git a/debian/rules b/debian/rules
index 4d91255..86858b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
MAKE=make -C Src
CFLAGS=-W -Wall
@@ -25,14 +24,18 @@ else
CFLAGS += -O2
endif
+
+build-arch: build
+build-indep: build
+
build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
dh_testdir
$(MAKE) CFLAGS="$(CFLAGS)"
touch build-stamp
-clean: clean1 unpatch
+clean: clean1
clean1:
dh_testdir
dh_testroot
@@ -78,4 +81,4 @@ source diff:
@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch
+.PHONY: build clean 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
