Package: osdclock
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 56fdb3632e9813cb7e3cfa22e9530da200fb971f Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Wed, 29 Feb 2012 07:13:26 -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 | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 1 -
...nglomeration.dpatch => 01-conglomeration.patch} | 7 ++-----
debian/patches/series | 1 +
debian/rules | 5 ++---
debian/source/format | 1 +
8 files changed, 17 insertions(+), 12 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01-conglomeration.dpatch => 01-conglomeration.patch} (98%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 1555037..2c7a0bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+osdclock (0.5-23.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.
+
+ -- Jari Aalto <jari.aa...@cante.net> Wed, 29 Feb 2012 07:12:24 -0500
+
osdclock (0.5-23) unstable; urgency=low
* New package maintainer (closes: #483810).
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 11a651f..f61fcf1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: osdclock
Section: utils
Priority: optional
Maintainer: Alexandre De Dommelin <adedomme...@tuxz.net>
-Build-Depends: debhelper (>= 7), dpatch, libx11-dev, libxinerama-dev, libxosd-dev, libxt-dev
-Standards-Version: 3.8.1
+Build-Depends: debhelper (>= 9), libx11-dev, libxinerama-dev, libxosd-dev, libxt-dev
+Standards-Version: 3.9.3
Package: osdclock
Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 4926043..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01-conglomeration.dpatch
diff --git a/debian/patches/01-conglomeration.dpatch b/debian/patches/01-conglomeration.patch
similarity index 98%
rename from debian/patches/01-conglomeration.dpatch
rename to debian/patches/01-conglomeration.patch
index 9245a47..25c577d 100644
--- a/debian/patches/01-conglomeration.dpatch
+++ b/debian/patches/01-conglomeration.patch
@@ -1,9 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 01-conglomeration.dpatch
-##
-## DP: Needs to be broken out (FIXME).
+From: Julien Lemoine <speedb...@debian.org>
+Subject: All-in-one fixes. Needs to be broken out (FIXME).
-@DPATCH@
diff -Naur osd_clock-0.5.orig/Makefile osd_clock-0.5/Makefile
--- osd_clock-0.5.orig/Makefile 2001-03-27 16:38:52.000000000 +0000
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a710074
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-conglomeration.patch
diff --git a/debian/rules b/debian/rules
index 29efae3..d591187 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,5 @@
#!/usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
CFLAGS = -Wall -g
@@ -14,7 +13,7 @@ ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), arm))
CFLAGS += -fsigned-char
endif
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
@@ -24,7 +23,7 @@ clean: unpatch
dh_clean
build: build-stamp
-build-stamp: patch
+build-stamp:
dh_testdir
$(MAKE) DCFLAGS="$(CFLAGS)"
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
