Package: kover
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.
Thanks,
Jari
>From 78351573be48d5497220c921831a2a7359aad62a Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Fri, 13 Apr 2012 22:27:43 +0300
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/changelog | 12 ++++++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/copyright | 11 ++++++++---
debian/menu | 2 +-
debian/patches/00list | 1 -
...ing_headers.dpatch => 10-missing-headers.patch} | 8 ++------
debian/patches/series | 1 +
debian/rules | 16 ++++++++++++----
debian/source/format | 1 +
10 files changed, 40 insertions(+), 18 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{10-missing_headers.dpatch => 10-missing-headers.patch} (74%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 7a6bee6..2bf0c15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+kover (1:4-7.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.1 and debhelper to 9.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Fix copyright-without-copyright-notice (Lintian).
+ * Fix desktop-entry-contains-encoding-key (Lintian).
+ * Fix menu-item-contains-unknown-tag kderemove (Lintian).
+
+ -- Jari Aalto <[email protected]> Fri, 13 Apr 2012 21:53:18 +0300
+
kover (1:4-7) unstable; urgency=medium
* add explicit build-dep on cmake now that kdelibs5-dev dropped its
diff --git a/debian/compat b/debian/compat
index b8626c4..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+9
diff --git a/debian/control b/debian/control
index bc0db14..7348fa6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: kover
Section: graphics
Priority: optional
Maintainer: Rene Engelhard <[email protected]>
-Build-Depends: kdelibs5-dev (>= 4:4.2.2), debhelper (>= 5.0.51~), imagemagick, libcdio-cdda-dev, libcddb2-dev, chrpath, pkg-config, dpatch, cmake
-Standards-Version: 3.6.2
+Build-Depends: kdelibs5-dev (>= 4:4.2.2), debhelper (>= 9), imagemagick, libcdio-cdda-dev, libcddb2-dev, chrpath, pkg-config, cmake
+Standards-Version: 3.9.3
Package: kover
Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 9a414f1..0a1142c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,12 +3,17 @@ Tue, 16 Apr 2002 01:20:03 +0200.
It was downloaded from http://lisas.de/kover
-Upstream Authors: Denis Oliver Kropp <[email protected]>
- Adrian Reber <[email protected]>
+Upstream Authors:
+
+ Denis Oliver Kropp <[email protected]>
+ Adrian Reber <[email protected]>
Copyright:
-GPL v2
+ Copyright (C) 2001-2007 Adrian Reber <[email protected]>
+ Copyright (C) 1998-2000 Denis Oliver Kropp <[email protected]>
+
+ GPL-2+
On Debian Systems, you can find the full text of the GPL under
/usr/share/common-licenses/GPL-2
diff --git a/debian/menu b/debian/menu
index 9b3cfd9..dd00ac4 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,3 +1,3 @@
?package(kover):needs="X11" section="Applications/Graphics"\
- title="kover" command="/usr/bin/kover" kderemove="y"\
+ title="kover" command="/usr/bin/kover" \
icon="/usr/share/icons/locolor/32x32/apps/kover.xpm"
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 0784b2e..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-10-missing_headers
diff --git a/debian/patches/10-missing_headers.dpatch b/debian/patches/10-missing-headers.patch
similarity index 74%
rename from debian/patches/10-missing_headers.dpatch
rename to debian/patches/10-missing-headers.patch
index 1447dd8..4c2e778 100644
--- a/debian/patches/10-missing_headers.dpatch
+++ b/debian/patches/10-missing-headers.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10-missing_headers.dpatch by Alessio Treglia <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add missing headers to fix FTBFS on Ubuntu Karmic.
+From: Alessio Treglia <[email protected]>
+Subject: Add missing headers to fix FTBFS on Ubuntu Karmic.
-@DPATCH@
diff -urNad kover-4~/src/directory.cc kover-4/src/directory.cc
--- kover-4~/src/directory.cc 2008-11-15 22:59:26.000000000 +0100
+++ kover-4/src/directory.cc 2009-04-28 18:08:44.298118164 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f490d45
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+10-missing-headers.patch
diff --git a/debian/rules b/debian/rules
index f703571..f21d099 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
builddir/CMakeCache.txt: $(patched)
dh_testdir
@@ -12,15 +11,19 @@ builddir/CMakeCache.txt: $(patched)
touch configure-stamp
+
+build-arch: build
+build-indep: build
+
build: builddir/CMakeCache.txt build-stamp
-build-stamp: patch-stamp
+build-stamp:
dh_testdir
cd builddir && $(MAKE)
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
@@ -35,15 +38,20 @@ clean: unpatch
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
cd builddir && $(MAKE) install DESTDIR=$(CURDIR)/debian/kover
+
# hack.
cd $(CURDIR)/debian/kover/usr && \
mv local/* . && rmdir local
cd $(CURDIR)/debian/kover/usr/share && mkdir kde4 && mv apps kde4
+ # UTF-8 is default
+ sed -i '/Encoding=/d' \
+ $(CURDIR)/debian/kover/usr/share/applications/kde4/kover.desktop
+
chrpath -d $(CURDIR)/debian/kover/usr/bin/kover
convert $(CURDIR)/debian/kover/usr/share/icons/locolor/32x32/apps/kover.png \
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.5
