Package: sawfish-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. Notes: Dpkg does not (yet) handle native packages with patches, so dependency to quilt was needed and patches were handled manually in debian/rules. See <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=670809> 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 37da2fc035caec842b4d36c6e71e755b094a31a9 Mon Sep 17 00:00:00 2001 From: Jari Aalto <jari.aa...@cante.net> Date: Sun, 29 Apr 2012 10:41:35 +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> --- debian/README.source | 3 ++ debian/changelog | 14 +++++++ debian/compat | 2 +- debian/control | 6 +-- debian/copyright | 2 +- debian/patches/00list | 21 ---------- ...0_font.dpatch => 02-TwoYearsToNever.font.patch} | 25 ++---------- debian/patches/04-Anonymous.font.patch | 15 +++++++ debian/patches/06-Aquiline.font.patch | 15 +++++++ debian/patches/08-BWM.font.patch | 15 +++++++ .../{Big.00_font.dpatch => 10-Big.font.patch} | 24 ++---------- debian/patches/12-Blackwindow.font.patch | 14 +++++++ ....00_font.dpatch => 14-Bubbles-Exact.font.patch} | 25 ++---------- ...lClean.00_gpl.dpatch => 16-CoolClean.gpl.patch} | 32 ++++----------- debian/patches/18-Coolclean.font.patch | 15 +++++++ ...iX.00_font.dpatch => 20-DoubleHeliX.font.patch} | 25 ++---------- debian/patches/22-Finalstep.font.patch | 15 +++++++ .../{HeliX.00_font.dpatch => 24-HeliX.font.patch} | 25 ++---------- ...tene.00_font.dpatch => 26-Microtene.font.patch} | 25 ++---------- ...ce.00_font.dpatch => 28-OrangeJuice.font.patch} | 25 ++---------- ...awLook.00_font.dpatch => 30-SawLook.font.patch} | 25 ++---------- .../{Strap.00_font.dpatch => 32-Strap.font.patch} | 25 ++---------- ...{Studio.00_font.dpatch => 34-Studio.font.patch} | 25 ++---------- debian/patches/36-Titanium.font.patch | 24 ++++++++++++ .../patches/{V.00_font.dpatch => 38-V.font.patch} | 25 ++---------- ...luefoo.00_font.dpatch => 40-bluefoo.font.patch} | 25 ++---------- .../{typo.00_font.dpatch => 42-typo.font.patch} | 25 ++---------- debian/patches/Anonymous.00_font.dpatch | 32 --------------- debian/patches/Aquiline.00_font.dpatch | 32 --------------- debian/patches/BWM.00_font.dpatch | 32 --------------- debian/patches/Blackwindow.00_font.dpatch | 31 --------------- debian/patches/Coolclean.01_font.dpatch | 32 --------------- debian/patches/Finalstep.00_font.dpatch | 32 --------------- debian/patches/Titanium.00_font.dpatch | 41 -------------------- debian/patches/series | 21 ++++++++++ debian/rules | 12 ++++-- debian/source.lintian-overrides | 4 -- debian/source/format | 1 + 38 files changed, 225 insertions(+), 562 deletions(-) create mode 100644 debian/README.source delete mode 100644 debian/patches/00list rename debian/patches/{2YearsToNever.00_font.dpatch => 02-TwoYearsToNever.font.patch} (53%) create mode 100755 debian/patches/04-Anonymous.font.patch create mode 100755 debian/patches/06-Aquiline.font.patch create mode 100755 debian/patches/08-BWM.font.patch rename debian/patches/{Big.00_font.dpatch => 10-Big.font.patch} (53%) create mode 100755 debian/patches/12-Blackwindow.font.patch rename debian/patches/{Bubbles_Exact.00_font.dpatch => 14-Bubbles-Exact.font.patch} (52%) rename debian/patches/{CoolClean.00_gpl.dpatch => 16-CoolClean.gpl.patch} (79%) create mode 100755 debian/patches/18-Coolclean.font.patch rename debian/patches/{DoubleHeliX.00_font.dpatch => 20-DoubleHeliX.font.patch} (64%) create mode 100755 debian/patches/22-Finalstep.font.patch rename debian/patches/{HeliX.00_font.dpatch => 24-HeliX.font.patch} (65%) rename debian/patches/{Microtene.00_font.dpatch => 26-Microtene.font.patch} (65%) rename debian/patches/{OrangeJuice.00_font.dpatch => 28-OrangeJuice.font.patch} (51%) rename debian/patches/{SawLook.00_font.dpatch => 30-SawLook.font.patch} (52%) rename debian/patches/{Strap.00_font.dpatch => 32-Strap.font.patch} (53%) rename debian/patches/{Studio.00_font.dpatch => 34-Studio.font.patch} (65%) create mode 100755 debian/patches/36-Titanium.font.patch rename debian/patches/{V.00_font.dpatch => 38-V.font.patch} (56%) rename debian/patches/{bluefoo.00_font.dpatch => 40-bluefoo.font.patch} (51%) rename debian/patches/{typo.00_font.dpatch => 42-typo.font.patch} (86%) delete mode 100755 debian/patches/Anonymous.00_font.dpatch delete mode 100755 debian/patches/Aquiline.00_font.dpatch delete mode 100755 debian/patches/BWM.00_font.dpatch delete mode 100755 debian/patches/Blackwindow.00_font.dpatch delete mode 100755 debian/patches/Coolclean.01_font.dpatch delete mode 100755 debian/patches/Finalstep.00_font.dpatch delete mode 100755 debian/patches/Titanium.00_font.dpatch create mode 100644 debian/patches/series delete mode 100644 debian/source.lintian-overrides create mode 100644 debian/source/format diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..977a072 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,3 @@ +Dpkg does not (as of 2012-04-29) support patches in native packages, +so refer to quilt(1) and see how patches are handled in debian/rules +file. diff --git a/debian/changelog b/debian/changelog index 6630ebd..d34ea30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +sawfish-themes (0.12+nmu1) unstable; urgency=low + + * Non-maintainer upload. + * Remove deprecated dpatch and upgrade to packaging format "3.0 (native)". + Note: dpkg does not support patches in native packages, so add depends + to quilt and handle patching in debian/rules file. + * 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. + * Fix copyright-refers-to-symlink-license (Lintian). + * Fix unused-override (Lintian). + + -- Jari Aalto <jari.aa...@cante.net> Sun, 29 Apr 2012 10:27:27 +0300 + sawfish-themes (0.12) unstable; urgency=low * Standards-version 3.7.3 diff --git a/debian/compat b/debian/compat index 1e8b314..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -6 +9 diff --git a/debian/control b/debian/control index 9797c96..cda0a1f 100644 --- a/debian/control +++ b/debian/control @@ -2,12 +2,12 @@ Source: sawfish-themes Section: x11 Priority: extra Maintainer: Devin Carraway <de...@debian.org> -Standards-Version: 3.7.3 -Build-Depends: debhelper (>> 4.0.0), dpatch +Standards-Version: 3.9.3 +Build-Depends: debhelper (>= 9), quilt Package: sawfish-themes Architecture: all -Depends: sawfish (>= 1:1.1a) +Depends: ${misc:Depends}, sawfish (>= 1:1.1a) Recommends: xfonts-base, xfonts-75dpi | xfonts-100dpi Description: Themes for the Sawfish window manager This package contains contributed themes for Sawfish; they can be used diff --git a/debian/copyright b/debian/copyright index 82a6e28..33f116c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -16,7 +16,7 @@ preamble to the GPL has been added to the sources. "GPL" in this file refers to the GNU General Public License. On Debian systems, the full text of the GPL license may be found in -/usr/share/common-licenses/GPL +/usr/share/common-licenses/GPL-2 Copyrights: diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index 8a0dfdc..0000000 --- a/debian/patches/00list +++ /dev/null @@ -1,21 +0,0 @@ -2YearsToNever.00_font.dpatch -Anonymous.00_font.dpatch -Aquiline.00_font.dpatch -BWM.00_font.dpatch -Big.00_font.dpatch -Blackwindow.00_font.dpatch -Bubbles_Exact.00_font.dpatch -CoolClean.00_gpl.dpatch -Coolclean.01_font.dpatch -DoubleHeliX.00_font.dpatch -Finalstep.00_font.dpatch -HeliX.00_font.dpatch -Microtene.00_font.dpatch -OrangeJuice.00_font.dpatch -SawLook.00_font.dpatch -Strap.00_font.dpatch -Studio.00_font.dpatch -Titanium.00_font.dpatch -V.00_font.dpatch -bluefoo.00_font.dpatch -typo.00_font.dpatch diff --git a/debian/patches/2YearsToNever.00_font.dpatch b/debian/patches/02-TwoYearsToNever.font.patch similarity index 53% rename from debian/patches/2YearsToNever.00_font.dpatch rename to debian/patches/02-TwoYearsToNever.font.patch index b753f71..f9555b5 100755 --- a/debian/patches/2YearsToNever.00_font.dpatch +++ b/debian/patches/02-TwoYearsToNever.font.patch @@ -1,26 +1,9 @@ -#!/bin/sh -# $Id: 2YearsToNever.00_font.dpatch 714 2008-01-10 08:04:45Z aqua $ - -## DP: choose font for theme - -set -e - -case "$1" in - -patch) - exec patch -p0 --no-backup-if-mismatch < $0 - ;; - -unpatch) - exec patch -R -p0 --no-backup-if-mismatch < $0 - ;; - *) - echo $0: invalid usage - exit 127 - ;; -esac +From: Aqua +Subject: choose font for theme diff -aruN 2YearsToNever.orig/theme.jl 2YearsToNever/theme.jl ---- 2YearsToNever.orig/theme.jl 2004-08-28 01:35:54.000000000 -0700 -+++ 2YearsToNever/theme.jl 2004-08-28 01:40:01.000000000 -0700 +--- a/2YearsToNever.orig/theme.jl 2004-08-28 01:35:54.000000000 -0700 ++++ b/2YearsToNever/theme.jl 2004-08-28 01:40:01.000000000 -0700 @@ -79,7 +79,6 @@ ((background . ,title-images) diff --git a/debian/patches/04-Anonymous.font.patch b/debian/patches/04-Anonymous.font.patch new file mode 100755 index 0000000..0040365 --- /dev/null +++ b/debian/patches/04-Anonymous.font.patch @@ -0,0 +1,15 @@ +From: Aqua +Subject: choose font for theme + +diff -baruN Anonymous.orig/theme.jl Anonymous/theme.jl +--- a/Anonymous.orig/theme.jl 2004-08-28 01:52:17.000000000 -0700 ++++ b/Anonymous/theme.jl 2004-08-28 02:12:13.000000000 -0700 +@@ -24,7 +24,7 @@ + :group appearance) + + (defcustom anon:title-font +- (get-font "-b&h-lucida-bold-r-normal-*-*-120-*-*-p-*-iso8859-1") ++ default-font + "Font for window titles." + :group (appearance Anonymous) + :type font) diff --git a/debian/patches/06-Aquiline.font.patch b/debian/patches/06-Aquiline.font.patch new file mode 100755 index 0000000..cf53608 --- /dev/null +++ b/debian/patches/06-Aquiline.font.patch @@ -0,0 +1,15 @@ +From: Aqua +Subject: choose font for theme + +diff -baruN Aquiline.orig/theme.jl Aquiline/theme.jl +--- a/Aquiline.orig/theme.jl 2004-08-28 01:52:29.000000000 -0700 ++++ b/Aquiline/theme.jl 2004-08-28 01:54:13.000000000 -0700 +@@ -12,8 +12,6 @@ + ((w-width (car (window-dimensions w)))) + (max 0 (min (- w-width 100) (text-width (window-name w))))))) + +- (font (get-font "-*-lucida-medium-r-normal-*-*-100-*-*-p-*-iso8859-1")) +- + (font-colors (list "white" "black")) + + (top-left-images (list (make-image "top_left_inactive.png") diff --git a/debian/patches/08-BWM.font.patch b/debian/patches/08-BWM.font.patch new file mode 100755 index 0000000..11d06c9 --- /dev/null +++ b/debian/patches/08-BWM.font.patch @@ -0,0 +1,15 @@ +From: Aqua +Subject: choose font for theme + +diff -baruN BWM.orig/theme.jl BWM/theme.jl +--- a/BWM.orig/theme.jl 2004-08-29 01:43:36.000000000 -0700 ++++ b/BWM/theme.jl 2004-08-29 01:47:59.000000000 -0700 +@@ -5,7 +5,7 @@ + (let* + + ( +- (font (get-font "-sharefont-comicscartoon-normal-r-normal-*-*-180-*-*-p-*-iso8859-1")) ++ (font (get-font-typed "Pango" "Sans Bold 10")) + + ;; Update window title pixel length + (title-width diff --git a/debian/patches/Big.00_font.dpatch b/debian/patches/10-Big.font.patch similarity index 53% rename from debian/patches/Big.00_font.dpatch rename to debian/patches/10-Big.font.patch index 35d0c7e..d107d84 100755 --- a/debian/patches/Big.00_font.dpatch +++ b/debian/patches/10-Big.font.patch @@ -1,25 +1,9 @@ -#!/bin/sh - -## DP: choose font for theme - -set -e - -case "$1" in - -patch) - exec patch -p0 --no-backup-if-mismatch < $0 - ;; - -unpatch) - exec patch -R -p0 --no-backup-if-mismatch < $0 - ;; - *) - echo $0: invalid usage - exit 127 - ;; -esac +From: Aqua +Subject: choose font for theme diff -aruN Big/theme.jl Big.font/theme.jl ---- Big.font/theme.jl 2002-08-19 06:03:46.000000000 -0700 -+++ Big/theme.jl 2002-10-20 02:12:01.000000000 -0700 +--- a/Big.font/theme.jl 2002-08-19 06:03:46.000000000 -0700 ++++ b/Big/theme.jl 2002-10-20 02:12:01.000000000 -0700 @@ -67,7 +67,7 @@ (right-edge . 72) (background . "minimize-button") diff --git a/debian/patches/12-Blackwindow.font.patch b/debian/patches/12-Blackwindow.font.patch new file mode 100755 index 0000000..829eda1 --- /dev/null +++ b/debian/patches/12-Blackwindow.font.patch @@ -0,0 +1,14 @@ +From: Aqua +Subject: choose font for theme + +diff -aruN Blackwindow.orig/theme.jl Blackwindow/theme.jl +--- a/Blackwindow.orig/theme.jl 2004-08-29 01:52:25.000000000 -0700 ++++ b/Blackwindow/theme.jl 2004-08-29 02:00:03.000000000 -0700 +@@ -105,6 +105,7 @@ + (font-colors ( list "#2f2f2f" "#1f1f1f" "#000000" "#2f2f2f" )) + (font-colors2 ( list "#ff0000" )) + ;; (font2 (get-font "-sharefont-blackforest-normal-r-normal-*-*-180-*-*-p-*-iso8859-1")) ++ (font default-font) + + (frame `( + ;; corners diff --git a/debian/patches/Bubbles_Exact.00_font.dpatch b/debian/patches/14-Bubbles-Exact.font.patch similarity index 52% rename from debian/patches/Bubbles_Exact.00_font.dpatch rename to debian/patches/14-Bubbles-Exact.font.patch index 37a2546..f687238 100755 --- a/debian/patches/Bubbles_Exact.00_font.dpatch +++ b/debian/patches/14-Bubbles-Exact.font.patch @@ -1,26 +1,9 @@ -#!/bin/sh -# $Id: Bubbles_Exact.00_font.dpatch 714 2008-01-10 08:04:45Z aqua $ - -## DP: choose font for theme - -set -e - -case "$1" in - -patch) - exec patch -p0 --no-backup-if-mismatch < $0 - ;; - -unpatch) - exec patch -R -p0 --no-backup-if-mismatch < $0 - ;; - *) - echo $0: invalid usage - exit 127 - ;; -esac +From: Aqua +Subject: choose font for theme diff -baruN Bubbles_Exact.orig/theme.jl Bubbles_Exact/theme.jl ---- Bubbles_Exact.orig/theme.jl 2004-08-28 01:52:21.000000000 -0700 -+++ Bubbles_Exact/theme.jl 2004-08-28 01:58:59.000000000 -0700 +--- a/Bubbles_Exact.orig/theme.jl 2004-08-28 01:52:21.000000000 -0700 ++++ b/Bubbles_Exact/theme.jl 2004-08-28 01:58:59.000000000 -0700 @@ -204,8 +204,7 @@ (frames-alist diff --git a/debian/patches/CoolClean.00_gpl.dpatch b/debian/patches/16-CoolClean.gpl.patch similarity index 79% rename from debian/patches/CoolClean.00_gpl.dpatch rename to debian/patches/16-CoolClean.gpl.patch index 602ee09..09b291f 100755 --- a/debian/patches/CoolClean.00_gpl.dpatch +++ b/debian/patches/16-CoolClean.gpl.patch @@ -1,27 +1,11 @@ -#!/bin/sh -# applies GPL to theme.jl and README; applied with permission of -# theme author and authors of prior versions from which CoolClean derives. - -## DP: add GPL preamble and copyright, with permission of authors - -set -e - -case "$1" in - -patch) - exec patch -p0 --no-backup-if-mismatch < $0 - ;; - -unpatch) - exec patch -R -p0 --no-backup-if-mismatch < $0 - ;; - *) - echo $0: invalid usage - exit 127 - ;; -esac +From: Unknown +Subject: applies GPL to theme.jl and README; applied with permission of + theme author and authors of prior versions from which CoolClean derives. + Add GPL preamble and copyright, with permission of authors. diff -aruN CoolClean/README CoolClean.dfsg/README ---- CoolClean/README 1999-11-16 08:23:01.000000000 -0800 -+++ CoolClean.dfsg/README 2004-06-25 01:20:42.101239000 -0700 +--- a/CoolClean/README 1999-11-16 08:23:01.000000000 -0800 ++++ b/CoolClean.dfsg/README 2004-06-25 01:20:42.101239000 -0700 @@ -2,6 +2,27 @@ from enlightenment. This theme supports customizable gradients and colors for the title bar. @@ -52,8 +36,8 @@ diff -aruN CoolClean/README CoolClean.dfsg/README +sbs...@nc.rr.com http://www.digitallabyrinth.com/linux/sawmill/index.html diff -aruN CoolClean/theme.jl CoolClean.dfsg/theme.jl ---- CoolClean/theme.jl 1999-11-29 10:22:59.000000000 -0800 -+++ CoolClean.dfsg/theme.jl 2004-06-25 01:20:27.568448000 -0700 +--- a/CoolClean/theme.jl 1999-11-29 10:22:59.000000000 -0800 ++++ b/CoolClean.dfsg/theme.jl 2004-06-25 01:20:27.568448000 -0700 @@ -1,7 +1,7 @@ ; CoolClean/theme.jl diff --git a/debian/patches/18-Coolclean.font.patch b/debian/patches/18-Coolclean.font.patch new file mode 100755 index 0000000..2e37a0a --- /dev/null +++ b/debian/patches/18-Coolclean.font.patch @@ -0,0 +1,15 @@ +From: Aqua +Subject: choose font for theme + +diff -aruN CoolClean.orig/theme.jl CoolClean/theme.jl +--- a/CoolClean.orig/theme.jl 2004-08-28 02:28:59.000000000 -0700 ++++ b/CoolClean/theme.jl 2004-08-28 02:29:33.000000000 -0700 +@@ -82,7 +82,7 @@ + + ;; The font + (defcustom CoolClean:font +- (get-font "-adobe-helvetica-bold-r-normal-*-*-120-*-*-p-*-iso8859-1") ++ default-font + "Font for window titles." + :type font + :group CoolClean-frame diff --git a/debian/patches/DoubleHeliX.00_font.dpatch b/debian/patches/20-DoubleHeliX.font.patch similarity index 64% rename from debian/patches/DoubleHeliX.00_font.dpatch rename to debian/patches/20-DoubleHeliX.font.patch index 7dec8da..a369b1d 100755 --- a/debian/patches/DoubleHeliX.00_font.dpatch +++ b/debian/patches/20-DoubleHeliX.font.patch @@ -1,26 +1,9 @@ -#!/bin/sh -# $Id: DoubleHeliX.00_font.dpatch 714 2008-01-10 08:04:45Z aqua $ - -## DP: choose font for theme - -set -e - -case "$1" in - -patch) - exec patch -p0 --no-backup-if-mismatch < $0 - ;; - -unpatch) - exec patch -R -p0 --no-backup-if-mismatch < $0 - ;; - *) - echo $0: invalid usage - exit 127 - ;; -esac +From: Aqua +Subject: choose font for theme diff -baruN DoubleHeliX.orig/theme.jl DoubleHeliX/theme.jl ---- DoubleHeliX.orig/theme.jl 2004-08-28 01:52:29.000000000 -0700 -+++ DoubleHeliX/theme.jl 2004-08-28 02:01:17.000000000 -0700 +--- a/DoubleHeliX.orig/theme.jl 2004-08-28 01:52:29.000000000 -0700 ++++ b/DoubleHeliX/theme.jl 2004-08-28 02:01:17.000000000 -0700 @@ -180,7 +180,6 @@ (y-justify . center)) ((left-edge . 18) diff --git a/debian/patches/22-Finalstep.font.patch b/debian/patches/22-Finalstep.font.patch new file mode 100755 index 0000000..9baceca --- /dev/null +++ b/debian/patches/22-Finalstep.font.patch @@ -0,0 +1,15 @@ +From: Aqua +Subject: choose font for theme + +diff -baruN FinalStep.orig/theme.jl FinalStep/theme.jl +--- a/FinalStep.orig/theme.jl 2004-08-28 01:52:16.000000000 -0700 ++++ b/FinalStep/theme.jl 2004-08-28 02:07:05.000000000 -0700 +@@ -37,7 +37,7 @@ + (defgroup FinalStep-frame "FinalStep" + :group appearance) + +-(defcustom FinalStep:the-font (get-font "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*") ++(defcustom FinalStep:the-font default-font + "Titlebar font: \\w" + :type font + :group (appearance FinalStep-frame) diff --git a/debian/patches/HeliX.00_font.dpatch b/debian/patches/24-HeliX.font.patch similarity index 65% rename from debian/patches/HeliX.00_font.dpatch rename to debian/patches/24-HeliX.font.patch index 3abc749..edcef53 100755 --- a/debian/patches/HeliX.00_font.dpatch +++ b/debian/patches/24-HeliX.font.patch @@ -1,26 +1,9 @@ -#!/bin/sh -# $Id: HeliX.00_font.dpatch 714 2008-01-10 08:04:45Z aqua $ - -## DP: choose font for theme - -set -e - -case "$1" in - -patch) - exec patch -p0 --no-backup-if-mismatch < $0 - ;; - -unpatch) - exec patch -R -p0 --no-backup-if-mismatch < $0 - ;; - *) - echo $0: invalid usage - exit 127 - ;; -esac +From: Aqua +Subject: choose font for theme diff -baruN HeliX.orig/theme.jl HeliX/theme.jl ---- HeliX.orig/theme.jl 2004-08-28 01:52:23.000000000 -0700 -+++ HeliX/theme.jl 2004-08-28 02:16:02.000000000 -0700 +--- a/HeliX.orig/theme.jl 2004-08-28 01:52:23.000000000 -0700 ++++ b/HeliX/theme.jl 2004-08-28 02:16:02.000000000 -0700 @@ -174,7 +174,6 @@ (y-justify . center)) ((left-edge . 18) diff --git a/debian/patches/Microtene.00_font.dpatch b/debian/patches/26-Microtene.font.patch similarity index 65% rename from debian/patches/Microtene.00_font.dpatch rename to debian/patches/26-Microtene.font.patch index 7fb4745..2c99452 100755 --- a/debian/patches/Microtene.00_font.dpatch +++ b/debian/patches/26-Microtene.font.patch @@ -1,26 +1,9 @@ -#!/bin/sh -# $Id: Microtene.00_font.dpatch 714 2008-01-10 08:04:45Z aqua $ - -## DP: choose font for theme - -set -e - -case "$1" in - -patch) - exec patch -p0 --no-backup-if-mismatch < $0 - ;; - -unpatch) - exec patch -R -p0 --no-backup-if-mismatch < $0 - ;; - *) - echo $0: invalid usage - exit 127 - ;; -esac +From: Aqua +Subject: choose font for theme diff -baruN Microtene.orig/theme.jl Microtene/theme.jl ---- Microtene.orig/theme.jl 2004-08-28 01:52:17.000000000 -0700 -+++ Microtene/theme.jl 2004-08-28 02:17:23.000000000 -0700 +--- a/Microtene.orig/theme.jl 2004-08-28 01:52:17.000000000 -0700 ++++ b/Microtene/theme.jl 2004-08-28 02:17:23.000000000 -0700 @@ -13,7 +13,6 @@ (let* diff --git a/debian/patches/OrangeJuice.00_font.dpatch b/debian/patches/28-OrangeJuice.font.patch similarity index 51% rename from debian/patches/OrangeJuice.00_font.dpatch rename to debian/patches/28-OrangeJuice.font.patch index f89e126..0d536ee 100755 --- a/debian/patches/OrangeJuice.00_font.dpatch +++ b/debian/patches/28-OrangeJuice.font.patch @@ -1,26 +1,9 @@ -#!/bin/sh -# $Id: OrangeJuice.00_font.dpatch 714 2008-01-10 08:04:45Z aqua $ - -## DP: choose font for theme - -set -e - -case "$1" in - -patch) - exec patch -p0 --no-backup-if-mismatch < $0 - ;; - -unpatch) - exec patch -R -p0 --no-backup-if-mismatch < $0 - ;; - *) - echo $0: invalid usage - exit 127 - ;; -esac +From: Aqua +Subject: choose font for theme diff -aruN OrangeJuice.orig/theme.jl OrangeJuice/theme.jl ---- OrangeJuice.orig/theme.jl 2004-08-28 01:52:27.000000000 -0700 -+++ OrangeJuice/theme.jl 2004-08-28 02:19:47.000000000 -0700 +--- a/OrangeJuice.orig/theme.jl 2004-08-28 01:52:27.000000000 -0700 ++++ b/OrangeJuice/theme.jl 2004-08-28 02:19:47.000000000 -0700 @@ -124,8 +124,7 @@ (frames-alist diff --git a/debian/patches/SawLook.00_font.dpatch b/debian/patches/30-SawLook.font.patch similarity index 52% rename from debian/patches/SawLook.00_font.dpatch rename to debian/patches/30-SawLook.font.patch index 0c661ab..ad49a52 100755 --- a/debian/patches/SawLook.00_font.dpatch +++ b/debian/patches/30-SawLook.font.patch @@ -1,26 +1,9 @@ -#!/bin/sh -# $Id: SawLook.00_font.dpatch 714 2008-01-10 08:04:45Z aqua $ - -## DP: choose font for theme - -set -e - -case "$1" in - -patch) - exec patch -p0 --no-backup-if-mismatch < $0 - ;; - -unpatch) - exec patch -R -p0 --no-backup-if-mismatch < $0 - ;; - *) - echo $0: invalid usage - exit 127 - ;; -esac +From: Aqua +Subject: choose font for theme diff -baruN SawLook.orig/theme.jl SawLook/theme.jl ---- SawLook.orig/theme.jl 2004-08-28 01:52:15.000000000 -0700 -+++ SawLook/theme.jl 2004-08-28 02:20:35.000000000 -0700 +--- a/SawLook.orig/theme.jl 2004-08-28 01:52:15.000000000 -0700 ++++ b/SawLook/theme.jl 2004-08-28 02:20:35.000000000 -0700 @@ -100,7 +100,6 @@ '(("estandar" ((top-edge . -25) diff --git a/debian/patches/Strap.00_font.dpatch b/debian/patches/32-Strap.font.patch similarity index 53% rename from debian/patches/Strap.00_font.dpatch rename to debian/patches/32-Strap.font.patch index 114e7de..c6bfc50 100755 --- a/debian/patches/Strap.00_font.dpatch +++ b/debian/patches/32-Strap.font.patch @@ -1,26 +1,9 @@ -#!/bin/sh -# $Id: Strap.00_font.dpatch 714 2008-01-10 08:04:45Z aqua $ - -## DP: choose font for theme - -set -e - -case "$1" in - -patch) - exec patch -p0 --no-backup-if-mismatch < $0 - ;; - -unpatch) - exec patch -R -p0 --no-backup-if-mismatch < $0 - ;; - *) - echo $0: invalid usage - exit 127 - ;; -esac +From: Aqua +Subject: choose font for theme diff -baruN Strap.orig/theme.jl Strap/theme.jl ---- Strap.orig/theme.jl 2004-08-28 01:52:25.000000000 -0700 -+++ Strap/theme.jl 2004-08-28 02:21:25.000000000 -0700 +--- a/Strap.orig/theme.jl 2004-08-28 01:52:25.000000000 -0700 ++++ b/Strap/theme.jl 2004-08-28 02:21:25.000000000 -0700 @@ -154,7 +154,6 @@ (top-edge . -12) (background . "TopLeft")) diff --git a/debian/patches/Studio.00_font.dpatch b/debian/patches/34-Studio.font.patch similarity index 65% rename from debian/patches/Studio.00_font.dpatch rename to debian/patches/34-Studio.font.patch index 21eeb9d..e4a3d2d 100755 --- a/debian/patches/Studio.00_font.dpatch +++ b/debian/patches/34-Studio.font.patch @@ -1,26 +1,9 @@ -#!/bin/sh -# $Id: Studio.00_font.dpatch 714 2008-01-10 08:04:45Z aqua $ - -## DP: choose font for theme - -set -e - -case "$1" in - -patch) - exec patch -p0 --no-backup-if-mismatch < $0 - ;; - -unpatch) - exec patch -R -p0 --no-backup-if-mismatch < $0 - ;; - *) - echo $0: invalid usage - exit 127 - ;; -esac +From: Aqua +Subject: choose font for theme diff -baruN Studio.orig/theme.jl Studio/theme.jl ---- Studio.orig/theme.jl 2004-08-28 01:52:23.000000000 -0700 -+++ Studio/theme.jl 2004-08-28 02:22:17.000000000 -0700 +--- a/Studio.orig/theme.jl 2004-08-28 01:52:23.000000000 -0700 ++++ b/Studio/theme.jl 2004-08-28 02:22:17.000000000 -0700 @@ -187,8 +187,7 @@ (background . "bottons-bg") (top-edge . -14) diff --git a/debian/patches/36-Titanium.font.patch b/debian/patches/36-Titanium.font.patch new file mode 100755 index 0000000..9a07122 --- /dev/null +++ b/debian/patches/36-Titanium.font.patch @@ -0,0 +1,24 @@ +From: Aqua +Subject: choose font for theme + +diff -aruN Titanium.orig/theme.jl Titanium/theme.jl +--- a/Titanium.orig/theme.jl 2004-08-28 01:52:26.000000000 -0700 ++++ b/Titanium/theme.jl 2004-08-28 02:23:58.000000000 -0700 +@@ -68,7 +68,7 @@ + ) + + (defcustom +- Titanium:TitleFont (get-font "-b&h-lucida-bold-r-normal-*-*-120-*-*-p-*-iso8859-1") ++ Titanium:TitleFont default-font + "Titlebar font" + :user-level expert + :type font +@@ -76,7 +76,7 @@ + ) + + (defcustom +- Titanium:TransientTitleFont (get-font "-b&h-lucida-bold-r-normal-*-*-100-*-*-p-*-iso8859-1") ++ Titanium:TransientTitleFont default-font + "Transient titlebar font" + :user-level expert + :type font diff --git a/debian/patches/V.00_font.dpatch b/debian/patches/38-V.font.patch similarity index 56% rename from debian/patches/V.00_font.dpatch rename to debian/patches/38-V.font.patch index ddfa47b..9c45e00 100755 --- a/debian/patches/V.00_font.dpatch +++ b/debian/patches/38-V.font.patch @@ -1,26 +1,9 @@ -#!/bin/sh -# $Id: V.00_font.dpatch 714 2008-01-10 08:04:45Z aqua $ - -## DP: choose font for theme - -set -e - -case "$1" in - -patch) - exec patch -p0 --no-backup-if-mismatch < $0 - ;; - -unpatch) - exec patch -R -p0 --no-backup-if-mismatch < $0 - ;; - *) - echo $0: invalid usage - exit 127 - ;; -esac +From: Aqua +Subject: choose font for theme diff -aruN V.orig/theme.jl V/theme.jl ---- V.orig/theme.jl 2004-08-28 01:52:23.000000000 -0700 -+++ V/theme.jl 2004-08-28 02:24:32.000000000 -0700 +--- a/V.orig/theme.jl 2004-08-28 01:52:23.000000000 -0700 ++++ b/V/theme.jl 2004-08-28 02:24:32.000000000 -0700 @@ -107,7 +107,6 @@ ((background . ,title-images) diff --git a/debian/patches/bluefoo.00_font.dpatch b/debian/patches/40-bluefoo.font.patch similarity index 51% rename from debian/patches/bluefoo.00_font.dpatch rename to debian/patches/40-bluefoo.font.patch index dff4002..b651b4e 100755 --- a/debian/patches/bluefoo.00_font.dpatch +++ b/debian/patches/40-bluefoo.font.patch @@ -1,26 +1,9 @@ -#!/bin/sh -# $Id: bluefoo.00_font.dpatch 714 2008-01-10 08:04:45Z aqua $ - -## DP: choose font for theme - -set -e - -case "$1" in - -patch) - exec patch -p0 --no-backup-if-mismatch < $0 - ;; - -unpatch) - exec patch -R -p0 --no-backup-if-mismatch < $0 - ;; - *) - echo $0: invalid usage - exit 127 - ;; -esac +From: Aqua +Subject: choose font for theme diff -aruN bluefoo.orig/theme.jl bluefoo/theme.jl ---- bluefoo.orig/theme.jl 2004-08-28 01:52:26.000000000 -0700 -+++ bluefoo/theme.jl 2004-08-28 02:25:12.000000000 -0700 +--- a/bluefoo.orig/theme.jl 2004-08-28 01:52:26.000000000 -0700 ++++ b/bluefoo/theme.jl 2004-08-28 02:25:12.000000000 -0700 @@ -63,7 +63,6 @@ '(("normal" ((left-edge . -3) diff --git a/debian/patches/typo.00_font.dpatch b/debian/patches/42-typo.font.patch similarity index 86% rename from debian/patches/typo.00_font.dpatch rename to debian/patches/42-typo.font.patch index b9a8a21..f1582ab 100755 --- a/debian/patches/typo.00_font.dpatch +++ b/debian/patches/42-typo.font.patch @@ -1,26 +1,9 @@ -#!/bin/sh -# $Id: typo.00_font.dpatch 714 2008-01-10 08:04:45Z aqua $ - -## DP: choose font for theme - -set -e - -case "$1" in - -patch) - exec patch -p0 --no-backup-if-mismatch < $0 - ;; - -unpatch) - exec patch -R -p0 --no-backup-if-mismatch < $0 - ;; - *) - echo $0: invalid usage - exit 127 - ;; -esac +From: Aqua +Subject: choose font for theme diff -aruN typo.orig/theme.jl typo/theme.jl ---- typo.orig/theme.jl 2004-08-28 01:52:20.000000000 -0700 -+++ typo/theme.jl 2004-08-28 02:27:16.000000000 -0700 +--- a/typo.orig/theme.jl 2004-08-28 01:52:20.000000000 -0700 ++++ b/typo/theme.jl 2004-08-28 02:27:16.000000000 -0700 @@ -22,7 +22,6 @@ '(("typo" ((right-edge . 72) diff --git a/debian/patches/Anonymous.00_font.dpatch b/debian/patches/Anonymous.00_font.dpatch deleted file mode 100755 index e130dda..0000000 --- a/debian/patches/Anonymous.00_font.dpatch +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# $Id: Anonymous.00_font.dpatch 714 2008-01-10 08:04:45Z aqua $ - -## DP: choose font for theme - -set -e - -case "$1" in - -patch) - exec patch -p0 --no-backup-if-mismatch < $0 - ;; - -unpatch) - exec patch -R -p0 --no-backup-if-mismatch < $0 - ;; - *) - echo $0: invalid usage - exit 127 - ;; -esac - -diff -baruN Anonymous.orig/theme.jl Anonymous/theme.jl ---- Anonymous.orig/theme.jl 2004-08-28 01:52:17.000000000 -0700 -+++ Anonymous/theme.jl 2004-08-28 02:12:13.000000000 -0700 -@@ -24,7 +24,7 @@ - :group appearance) - - (defcustom anon:title-font -- (get-font "-b&h-lucida-bold-r-normal-*-*-120-*-*-p-*-iso8859-1") -+ default-font - "Font for window titles." - :group (appearance Anonymous) - :type font) diff --git a/debian/patches/Aquiline.00_font.dpatch b/debian/patches/Aquiline.00_font.dpatch deleted file mode 100755 index 1fb606e..0000000 --- a/debian/patches/Aquiline.00_font.dpatch +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# $Id: Aquiline.00_font.dpatch 714 2008-01-10 08:04:45Z aqua $ - -## DP: choose font for theme - -set -e - -case "$1" in - -patch) - exec patch -p0 --no-backup-if-mismatch < $0 - ;; - -unpatch) - exec patch -R -p0 --no-backup-if-mismatch < $0 - ;; - *) - echo $0: invalid usage - exit 127 - ;; -esac - -diff -baruN Aquiline.orig/theme.jl Aquiline/theme.jl ---- Aquiline.orig/theme.jl 2004-08-28 01:52:29.000000000 -0700 -+++ Aquiline/theme.jl 2004-08-28 01:54:13.000000000 -0700 -@@ -12,8 +12,6 @@ - ((w-width (car (window-dimensions w)))) - (max 0 (min (- w-width 100) (text-width (window-name w))))))) - -- (font (get-font "-*-lucida-medium-r-normal-*-*-100-*-*-p-*-iso8859-1")) -- - (font-colors (list "white" "black")) - - (top-left-images (list (make-image "top_left_inactive.png") diff --git a/debian/patches/BWM.00_font.dpatch b/debian/patches/BWM.00_font.dpatch deleted file mode 100755 index 43e0ea8..0000000 --- a/debian/patches/BWM.00_font.dpatch +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# $Id: BWM.00_font.dpatch 714 2008-01-10 08:04:45Z aqua $ - -## DP: choose font for theme - -set -e - -case "$1" in - -patch) - exec patch -p0 --no-backup-if-mismatch < $0 - ;; - -unpatch) - exec patch -R -p0 --no-backup-if-mismatch < $0 - ;; - *) - echo $0: invalid usage - exit 127 - ;; -esac - -diff -baruN BWM.orig/theme.jl BWM/theme.jl ---- BWM.orig/theme.jl 2004-08-29 01:43:36.000000000 -0700 -+++ BWM/theme.jl 2004-08-29 01:47:59.000000000 -0700 -@@ -5,7 +5,7 @@ - (let* - - ( -- (font (get-font "-sharefont-comicscartoon-normal-r-normal-*-*-180-*-*-p-*-iso8859-1")) -+ (font (get-font-typed "Pango" "Sans Bold 10")) - - ;; Update window title pixel length - (title-width diff --git a/debian/patches/Blackwindow.00_font.dpatch b/debian/patches/Blackwindow.00_font.dpatch deleted file mode 100755 index d3ad6b9..0000000 --- a/debian/patches/Blackwindow.00_font.dpatch +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# $Id: Blackwindow.00_font.dpatch 714 2008-01-10 08:04:45Z aqua $ - -## DP: choose font for theme - -set -e - -case "$1" in - -patch) - exec patch -p0 --no-backup-if-mismatch < $0 - ;; - -unpatch) - exec patch -R -p0 --no-backup-if-mismatch < $0 - ;; - *) - echo $0: invalid usage - exit 127 - ;; -esac - -diff -aruN Blackwindow.orig/theme.jl Blackwindow/theme.jl ---- Blackwindow.orig/theme.jl 2004-08-29 01:52:25.000000000 -0700 -+++ Blackwindow/theme.jl 2004-08-29 02:00:03.000000000 -0700 -@@ -105,6 +105,7 @@ - (font-colors ( list "#2f2f2f" "#1f1f1f" "#000000" "#2f2f2f" )) - (font-colors2 ( list "#ff0000" )) - ;; (font2 (get-font "-sharefont-blackforest-normal-r-normal-*-*-180-*-*-p-*-iso8859-1")) -+ (font default-font) - - (frame `( - ;; corners diff --git a/debian/patches/Coolclean.01_font.dpatch b/debian/patches/Coolclean.01_font.dpatch deleted file mode 100755 index 4bdb2e5..0000000 --- a/debian/patches/Coolclean.01_font.dpatch +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# $Id: Coolclean.01_font.dpatch 714 2008-01-10 08:04:45Z aqua $ - -## DP: choose font for theme - -set -e - -case "$1" in - -patch) - exec patch -p0 --no-backup-if-mismatch < $0 - ;; - -unpatch) - exec patch -R -p0 --no-backup-if-mismatch < $0 - ;; - *) - echo $0: invalid usage - exit 127 - ;; -esac - -diff -aruN CoolClean.orig/theme.jl CoolClean/theme.jl ---- CoolClean.orig/theme.jl 2004-08-28 02:28:59.000000000 -0700 -+++ CoolClean/theme.jl 2004-08-28 02:29:33.000000000 -0700 -@@ -82,7 +82,7 @@ - - ;; The font - (defcustom CoolClean:font -- (get-font "-adobe-helvetica-bold-r-normal-*-*-120-*-*-p-*-iso8859-1") -+ default-font - "Font for window titles." - :type font - :group CoolClean-frame diff --git a/debian/patches/Finalstep.00_font.dpatch b/debian/patches/Finalstep.00_font.dpatch deleted file mode 100755 index 56945c1..0000000 --- a/debian/patches/Finalstep.00_font.dpatch +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# $Id: Finalstep.00_font.dpatch 714 2008-01-10 08:04:45Z aqua $ - -## DP: choose font for theme - -set -e - -case "$1" in - -patch) - exec patch -p0 --no-backup-if-mismatch < $0 - ;; - -unpatch) - exec patch -R -p0 --no-backup-if-mismatch < $0 - ;; - *) - echo $0: invalid usage - exit 127 - ;; -esac - -diff -baruN FinalStep.orig/theme.jl FinalStep/theme.jl ---- FinalStep.orig/theme.jl 2004-08-28 01:52:16.000000000 -0700 -+++ FinalStep/theme.jl 2004-08-28 02:07:05.000000000 -0700 -@@ -37,7 +37,7 @@ - (defgroup FinalStep-frame "FinalStep" - :group appearance) - --(defcustom FinalStep:the-font (get-font "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*") -+(defcustom FinalStep:the-font default-font - "Titlebar font: \\w" - :type font - :group (appearance FinalStep-frame) diff --git a/debian/patches/Titanium.00_font.dpatch b/debian/patches/Titanium.00_font.dpatch deleted file mode 100755 index bc73d8a..0000000 --- a/debian/patches/Titanium.00_font.dpatch +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh -# $Id: Titanium.00_font.dpatch 714 2008-01-10 08:04:45Z aqua $ - -## DP: choose font for theme - -set -e - -case "$1" in - -patch) - exec patch -p0 --no-backup-if-mismatch < $0 - ;; - -unpatch) - exec patch -R -p0 --no-backup-if-mismatch < $0 - ;; - *) - echo $0: invalid usage - exit 127 - ;; -esac - -diff -aruN Titanium.orig/theme.jl Titanium/theme.jl ---- Titanium.orig/theme.jl 2004-08-28 01:52:26.000000000 -0700 -+++ Titanium/theme.jl 2004-08-28 02:23:58.000000000 -0700 -@@ -68,7 +68,7 @@ - ) - - (defcustom -- Titanium:TitleFont (get-font "-b&h-lucida-bold-r-normal-*-*-120-*-*-p-*-iso8859-1") -+ Titanium:TitleFont default-font - "Titlebar font" - :user-level expert - :type font -@@ -76,7 +76,7 @@ - ) - - (defcustom -- Titanium:TransientTitleFont (get-font "-b&h-lucida-bold-r-normal-*-*-100-*-*-p-*-iso8859-1") -+ Titanium:TransientTitleFont default-font - "Transient titlebar font" - :user-level expert - :type font diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..0e814a9 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,21 @@ +02-TwoYearsToNever.font.patch +04-Anonymous.font.patch +06-Aquiline.font.patch +08-BWM.font.patch +10-Big.font.patch +12-Blackwindow.font.patch +14-Bubbles-Exact.font.patch +16-CoolClean.gpl.patch +18-Coolclean.font.patch +20-DoubleHeliX.font.patch +22-Finalstep.font.patch +24-HeliX.font.patch +26-Microtene.font.patch +28-OrangeJuice.font.patch +30-SawLook.font.patch +32-Strap.font.patch +34-Studio.font.patch +36-Titanium.font.patch +38-V.font.patch +40-bluefoo.font.patch +42-typo.font.patch diff --git a/debian/rules b/debian/rules index 5d07874..0ba4b7e 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -include /usr/share/dpatch/dpatch.make DOCDIR=$(CURDIR)/debian/sawfish-themes/usr/share/doc/sawfish-themes THEMEDIR=$(CURDIR)/debian/sawfish-themes/usr/share/sawfish/themes @@ -15,9 +14,13 @@ THEMES=2YearsToNever absolute-metal Anonymous Aquiline BWM Big \ Titanium T-16-blue T-16-red T-16-yellow V bluefoo gorillaz \ mxflat typo +build-arch: build +build-indep: build + build: build-stamp -build-stamp: patch +build-stamp: dh_testdir + QUILT_PATCHES=debian/patches quilt push -a # arrange the upstream documentation to dh_installdocs' liking for t in $(THEMES) ; do \ for f in $$t/README* ; do \ @@ -40,17 +43,18 @@ build-stamp: patch # no compile stage touch build-stamp -clean: unpatch +clean: dh_testdir dh_testroot rm -f build-stamp rm -rf $(CURDIR)/debian/doc dh_clean + QUILT_PATCHES=debian/patches quilt pop -a || : install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs for t in $(THEMES) ; do \ diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides deleted file mode 100644 index 707e05c..0000000 --- a/debian/source.lintian-overrides +++ /dev/null @@ -1,4 +0,0 @@ -# $Id$ -sawfish-themes source: diff-contains-svn-conflict-file Anonymous/.gtkrc.mine -sawfish-themes source: source-contains-svn-conflict-copy Anonymous/.gtkrc.mine -sawfish-themes source: diff-contains-svn-conflict-file Anonymous/.gtkrc.mine diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) -- 1.7.10