Package: icewm-themes
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 e2b3a1f778522a52b81235fe1a65987d0f3f7cc6 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Mon, 30 Apr 2012 23:26:32 +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>
---
README.svn | 23 ----------------
debian/changelog | 18 ++++++++++++
debian/compat | 2 +-
debian/control | 6 ++--
debian/copyright | 2 +-
debian/icewm-themes.postinst | 5 +++-
debian/patches/00list | 4 ---
debian/patches/05-local-changes.patch | 29 ++++++++++++++++++++
.../{font_charset.dpatch => 10-font-charset.patch} | 0
...ch => 20-silverxp-better-switch-contrast.patch} | 0
...ers.dpatch => 30-bluecrux-dialog-borders.patch} | 9 ++++--
...ors.dpatch => 40-icebluecurve-apm-colors.patch} | 11 ++++++--
debian/patches/series | 4 +++
debian/rules | 19 ++++++-------
debian/source/format | 1 +
15 files changed, 85 insertions(+), 48 deletions(-)
delete mode 100644 README.svn
mode change 100644 => 100755 debian/icewm-themes.postinst
delete mode 100644 debian/patches/00list
create mode 100644 debian/patches/05-local-changes.patch
rename debian/patches/{font_charset.dpatch => 10-font-charset.patch} (100%)
rename debian/patches/{silverxp_better_switch_contrast.dpatch => 20-silverxp-better-switch-contrast.patch} (100%)
rename debian/patches/{bluecrux_dialog_borders.dpatch => 30-bluecrux-dialog-borders.patch} (50%)
rename debian/patches/{icebluecurve_apm_colors.dpatch => 40-icebluecurve-apm-colors.patch} (76%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/README.svn b/README.svn
deleted file mode 100644
index d8dce56..0000000
--- a/README.svn
+++ /dev/null
@@ -1,23 +0,0 @@
-The contents of this package is assembled from the Theme packages
-available on themes.freshmeat.net. To save the space and keep track of
-the changes, we do not keep the theme files in svn repository and
-modifications are applied through the dpatch mechanism. The currently
-available themes (and those that are processed by Makefile) are listed
-in THEME.list.
-They are either downloadable from the mentioned location or are included
-in the Debian source of the package which you can get with
-"apt-get source icewm-themes" and extract manually. To make changes on
-some theme, use the dpatch-edit-patch utility and submit the resulting
-patch to bl...@debian.org or jer...@debian.org.
-
-Misc:
-
-"make getfromdeb" gets them only from the source package.
-
-"make shownew" shows new dirs, looking like theme dirs and
-"make checkin" adds all new dirs to the THEME.list.
-
-debian/prepare-themes.pl make some sanity checks and creates symlinks
-between identical files.
-
-
diff --git a/debian/changelog b/debian/changelog
index c2385bd..6aca4a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+icewm-themes (1.2.26-1.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.
+ * Number all patches to make apply order apparent.
+ * Patches:
+ - 05: new, in-line changes to original files.
+ - 30, 40: update with "quilt refresh" to make them apply cleanly.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix debian-rules-ignores-make-clean-error (Lintian).
+ * Fix maintainer-script-without-set-e (Lintian).
+ * Fix package-needs-versioned-debhelper-build-depends (Lintian).
+ * Fix debian-rules-ignores-make-clean-error (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Mon, 30 Apr 2012 23:22:38 +0300
+
icewm-themes (1.2.26-1) unstable; urgency=low
* Cooked a new collection tarball
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 a8a4c9e..e1e4f0c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: icewm-themes
Section: x11
Priority: optional
Maintainer: Eduard Bloch <bl...@debian.org>
-Build-Depends: debhelper, dpatch
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
Package: icewm-themes
Architecture: all
-Depends: icewm-common (>= 1.2.6)
+Depends: ${misc:Depends}, icewm-common (>= 1.2.6)
Description: Theme files for the Ice Window Manager
This package contains the contributed theme files for icewm. It
contains nice looking themes, emulating the look of Windows'95,
diff --git a/debian/copyright b/debian/copyright
index ce6fbd8..f34653f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -34,4 +34,4 @@ Other themes copyrighted by respective authors, see default.theme file in each
theme directory.
This software is under the GNU General Public Licence, contained
-in the file /usr/share/common-licenses/GPL on Debian systems.
+in the file /usr/share/common-licenses/GPL-2 on Debian systems.
diff --git a/debian/icewm-themes.postinst b/debian/icewm-themes.postinst
old mode 100644
new mode 100755
index cdfa3e0..501e523
--- a/debian/icewm-themes.postinst
+++ b/debian/icewm-themes.postinst
@@ -1,4 +1,7 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
+
#cd /usr/X11R6/lib/X11/fonts/misc/
#mkfontdir || true
#cd /usr/X11R6/lib/X11/fonts/misc/
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index ca14526..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-font_charset
-silverxp_better_switch_contrast
-bluecrux_dialog_borders
-icebluecurve_apm_colors
diff --git a/debian/patches/05-local-changes.patch b/debian/patches/05-local-changes.patch
new file mode 100644
index 0000000..3b7ea6c
--- /dev/null
+++ b/debian/patches/05-local-changes.patch
@@ -0,0 +1,29 @@
+diff --git a/README.svn b/README.svn
+new file mode 100644
+index 0000000..d8dce56
+--- /dev/null
++++ b/README.svn
+@@ -0,0 +1,23 @@
++The contents of this package is assembled from the Theme packages
++available on themes.freshmeat.net. To save the space and keep track of
++the changes, we do not keep the theme files in svn repository and
++modifications are applied through the dpatch mechanism. The currently
++available themes (and those that are processed by Makefile) are listed
++in THEME.list.
++They are either downloadable from the mentioned location or are included
++in the Debian source of the package which you can get with
++"apt-get source icewm-themes" and extract manually. To make changes on
++some theme, use the dpatch-edit-patch utility and submit the resulting
++patch to bl...@debian.org or jer...@debian.org.
++
++Misc:
++
++"make getfromdeb" gets them only from the source package.
++
++"make shownew" shows new dirs, looking like theme dirs and
++"make checkin" adds all new dirs to the THEME.list.
++
++debian/prepare-themes.pl make some sanity checks and creates symlinks
++between identical files.
++
++
diff --git a/debian/patches/font_charset.dpatch b/debian/patches/10-font-charset.patch
similarity index 100%
rename from debian/patches/font_charset.dpatch
rename to debian/patches/10-font-charset.patch
diff --git a/debian/patches/silverxp_better_switch_contrast.dpatch b/debian/patches/20-silverxp-better-switch-contrast.patch
similarity index 100%
rename from debian/patches/silverxp_better_switch_contrast.dpatch
rename to debian/patches/20-silverxp-better-switch-contrast.patch
diff --git a/debian/patches/bluecrux_dialog_borders.dpatch b/debian/patches/30-bluecrux-dialog-borders.patch
similarity index 50%
rename from debian/patches/bluecrux_dialog_borders.dpatch
rename to debian/patches/30-bluecrux-dialog-borders.patch
index 1ff88cb..0ef0840 100644
--- a/debian/patches/bluecrux_dialog_borders.dpatch
+++ b/debian/patches/30-bluecrux-dialog-borders.patch
@@ -5,9 +5,12 @@
## DP: No description.
@DPATCH@
-diff -urNad ./blueCrux/default.theme /tmp/dpep-work.OnVl8g/icewm-themes-1.2.20.obsolete.0.496558609957905/blueCrux/default.theme
---- ./blueCrux/default.theme 2002-07-25 11:09:29.000000000 +0200
-+++ /tmp/dpep-work.OnVl8g/icewm-themes-1.2.20.obsolete.0.496558609957905/blueCrux/default.theme 2005-02-25 18:47:55.447028328 +0100
+---
+ blueCrux/default.theme | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/blueCrux/default.theme
++++ b/blueCrux/default.theme
@@ -74,3 +74,8 @@
ColorInputSelectionText="#FFFFFF"
diff --git a/debian/patches/icebluecurve_apm_colors.dpatch b/debian/patches/40-icebluecurve-apm-colors.patch
similarity index 76%
rename from debian/patches/icebluecurve_apm_colors.dpatch
rename to debian/patches/40-icebluecurve-apm-colors.patch
index 5e54e7c..74d6339 100644
--- a/debian/patches/icebluecurve_apm_colors.dpatch
+++ b/debian/patches/40-icebluecurve-apm-colors.patch
@@ -23,8 +23,12 @@ esac
exit 0
@DPATCH@
---- a/IceBlueCurve/default.theme 2002-11-01 04:19:22.000000000 -0600
-+++ b/IceBlueCurve/default.theme 2004-08-10 08:30:55.000000000 -0500
+---
+ IceBlueCurve/default.theme | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/IceBlueCurve/default.theme
++++ b/IceBlueCurve/default.theme
@@ -62,6 +62,9 @@
ColorNetIdle="rgb:E7/E7/E7"
ColorActiveWorkspaceButton="rgb:80/80/80"
@@ -32,3 +36,6 @@ exit 0
+ColorApm="rgb:E7/E7/E7"
+ColorApmText="rgb:00/00/00"
+
+
+ TitleFontName="-monotype-Arial-bold-r-normal-*-*-90-*-*-p-*-*"
+ MenuFontName="-monotype-Arial-medium-r-normal-*-*-90-*-*-p-*-*"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5171ff4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+10-font-charset.patch
+20-silverxp-better-switch-contrast.patch
+30-bluecrux-dialog-borders.patch
+40-icebluecurve-apm-colors.patch
diff --git a/debian/rules b/debian/rules
index 032af13..04a5bad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,11 +6,12 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
-
SHELL=/bin/bash
-build: patch build-stamp
+build-arch: build
+build-indep: build
+
+build: build-stamp
build-stamp:
dh_testdir
@@ -20,21 +21,19 @@ build-stamp:
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp install-stamp
-
- # Add here commands to clean up after the build process.
- -$(MAKE) clean
-
+ # There is no target clean, distclean ...
+ # $(MAKE) clean
dh_clean
install: install-stamp
install-stamp: build-stamp
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs /usr/share/icewm/themes /usr/share/doc/icewm-themes/jaywalk /usr/share/doc/icewm-themes
# Add here commands to install the package into debian/icewm-themes.
@@ -76,4 +75,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 patch unpatch
+.PHONY: build clean binary-indep binary-arch binary
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
