--- Begin Message ---
Package: perlpanel
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 cfe5fddf8762df4a019b810b1dec4e5972ed624a Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Sat, 28 Apr 2012 15:14:25 +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 | 14 ++++++++
debian/compat | 2 +-
debian/control | 7 ++--
debian/patches/00list | 5 ---
debian/patches/10-doc-fixes.patch | 35 +++++++++++++++++++
debian/patches/10_doc_fixes.dpatch | 36 --------------------
...wd_fixes.dpatch => 11-makefile-pwd-fixes.patch} | 17 +++++----
debian/patches/20-fix-deleting-events.patch | 17 +++++++++
debian/patches/20_fix_deleting_events.dpatch | 17 ---------
.../patches/21-xterm-to-x-terminal-emulator.patch | 18 ++++++++++
.../patches/21_xterm_to_x-terminal-emulator.dpatch | 19 -----------
...patch => 24-improve-reminder-performance.patch} | 22 ++++++------
debian/patches/series | 5 +++
debian/perlpanel.menu | 2 +-
debian/rules | 22 ++++--------
debian/source/format | 1 +
16 files changed, 122 insertions(+), 117 deletions(-)
delete mode 100644 debian/patches/00list
create mode 100644 debian/patches/10-doc-fixes.patch
delete mode 100644 debian/patches/10_doc_fixes.dpatch
rename debian/patches/{11_makefile_pwd_fixes.dpatch => 11-makefile-pwd-fixes.patch} (63%)
create mode 100644 debian/patches/20-fix-deleting-events.patch
delete mode 100644 debian/patches/20_fix_deleting_events.dpatch
create mode 100644 debian/patches/21-xterm-to-x-terminal-emulator.patch
delete mode 100644 debian/patches/21_xterm_to_x-terminal-emulator.dpatch
rename debian/patches/{24_improve_reminder_performance.dpatch => 24-improve-reminder-performance.patch} (79%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 1fae373..1b1c09c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+perlpanel (1:0.9.1+cvs20051225-2.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.
+ * Update patches with "quilt refresh" to make them apply cleanly.
+ * Patch 05 is new; in-line changes to local sources.
+ * Fix menu-item-uses-apps-section (Lintian).
+ * Fix menu-item-creates-new-section (Lintian).
+ * Fix no-homepage-field (Lintian).
+
+ -- Jari Aalto <[email protected]> Sat, 28 Apr 2012 15:14:03 +0300
+
perlpanel (1:0.9.1+cvs20051225-2) unstable; urgency=low
* Makefile:
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 98e8c43..6461e5f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,13 @@ Source: perlpanel
Section: x11
Priority: optional
Maintainer: Marc 'HE' Brockschmidt <[email protected]>
-Build-Depends: debhelper (>= 4), dpatch, gettext, libgtk2-perl, libgtk2-gladexml-perl, libgnome2-wnck-perl, libxml-simple-perl, liblocale-gettext-perl
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 9), gettext, libgtk2-perl, libgtk2-gladexml-perl, libgnome2-wnck-perl, libxml-simple-perl, liblocale-gettext-perl
+Standards-Version: 3.9.3
+Homepage: http://freecode.com/projects/perlpanel
Package: perlpanel
Architecture: all
-Depends: perl (>= 5.8.0), libglib-perl, libgtk2-perl (>= 1:1.042-2), libgtk2.0-0 (>= 2.4), libgnome2-wnck-perl, libxml-simple-perl, libxml-parser-perl, libgtk2-gladexml-perl, liblocale-gettext-perl, libdate-manip-perl, libx11-freedesktop-desktopentry-perl, hicolor-icon-theme
+Depends: ${misc:Depends}, perl (>= 5.8.0), libglib-perl, libgtk2-perl (>= 1:1.042-2), libgtk2.0-0 (>= 2.4), libgnome2-wnck-perl, libxml-simple-perl, libxml-parser-perl, libgtk2-gladexml-perl, liblocale-gettext-perl, libdate-manip-perl, libx11-freedesktop-desktopentry-perl, hicolor-icon-theme
Recommends: libaudio-mixer-perl, libgnome2-vfs-perl, libgtk2-traymanager-perl, liburi-perl, libxmms-perl
Suggests: vorbis-tools, fortune-mod, ssh
Description: lean menu and launcher panel written in Perl and Gtk2
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index e4c0242..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,5 +0,0 @@
-10_doc_fixes.dpatch
-11_makefile_pwd_fixes.dpatch
-20_fix_deleting_events.dpatch
-21_xterm_to_x-terminal-emulator.dpatch
-24_improve_reminder_performance.dpatch
diff --git a/debian/patches/10-doc-fixes.patch b/debian/patches/10-doc-fixes.patch
new file mode 100644
index 0000000..777f9fc
--- /dev/null
+++ b/debian/patches/10-doc-fixes.patch
@@ -0,0 +1,35 @@
+From: Marc 'HE' Brockschmidt <[email protected]>
+Subject: Patch docs to get the thing lintian clean.
+
+---
+ doc/perlpanel-applet-howto.pod | 4 ++--
+ doc/perlpanel.pod | 4 ++++
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+--- a/doc/perlpanel-applet-howto.pod
++++ b/doc/perlpanel-applet-howto.pod
+@@ -3,9 +3,9 @@
+ =for comment
+ $Id: perlpanel-applet-howto.pod,v 1.29 2004/11/04 16:52:17 jodrell Exp $
+
+-=head1 DESCRIPTION
++=head1 NAME
+
+-This document explains how to write applets for the PerlPanel.
++perlpanel-applet-howto - explains how to write applets for the PerlPanel
+
+ =head1 EXAMPLE
+
+--- a/doc/perlpanel.pod
++++ b/doc/perlpanel.pod
+@@ -3,6 +3,10 @@
+ =for comment
+ $Id: perlpanel.pod,v 1.31 2005/04/14 14:50:54 jodrell Exp $
+
++=head1 NAME
++
++B<perlpanel> - lean menu and launcher panel written in Perl and Gtk2
++
+ =head1 Introduction
+
+ PerlPanel draws a small taskbar on your screen to display some useful widgets
diff --git a/debian/patches/10_doc_fixes.dpatch b/debian/patches/10_doc_fixes.dpatch
deleted file mode 100644
index 9cb3a4b..0000000
--- a/debian/patches/10_doc_fixes.dpatch
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_doc_fixes.dpatch by Marc 'HE' Brockschmidt <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch docs to get the thing lintian clean.
-
-@DPATCH@
-diff -wru PerlPanel-0.8.0.old/doc/perlpanel-applet-howto.pod PerlPanel-0.8.0/doc/perlpanel-applet-howto.pod
---- PerlPanel-0.8.0.old/doc/perlpanel-applet-howto.pod 2004-09-28 13:50:28.000000000 +0200
-+++ PerlPanel-0.8.0/doc/perlpanel-applet-howto.pod 2004-09-29 21:57:55.000000000 +0200
-@@ -3,9 +3,9 @@
- =for comment
- $Id: perlpanel-applet-howto.pod,v 1.27 2004/09/28 08:56:30 jodrell Exp $
-
--=head1 DESCRIPTION
-+=head1 NAME
-
--This document explains how to write applets for the PerlPanel.
-+perlpanel-applet-howto - explains how to write applets for the PerlPanel
-
- =head1 EXAMPLE
-
-diff -wru PerlPanel-0.8.0.old/doc/perlpanel.pod PerlPanel-0.8.0/doc/perlpanel.pod
---- PerlPanel-0.8.0.old/doc/perlpanel.pod 2004-09-29 13:34:12.000000000 +0200
-+++ PerlPanel-0.8.0/doc/perlpanel.pod 2004-09-29 21:57:55.000000000 +0200
-@@ -3,6 +3,10 @@
- =for comment
- $Id: perlpanel.pod,v 1.28 2004/09/29 11:34:12 jodrell Exp $
-
-+=head1 NAME
-+
-+B<perlpanel> - lean menu and launcher panel written in Perl and Gtk2
-+
- =head1 Introduction
-
- PerlPanel draws a small taskbar on your screen to display some useful widgets
diff --git a/debian/patches/11_makefile_pwd_fixes.dpatch b/debian/patches/11-makefile-pwd-fixes.patch
similarity index 63%
rename from debian/patches/11_makefile_pwd_fixes.dpatch
rename to debian/patches/11-makefile-pwd-fixes.patch
index 8b3336f..2f1b3ea 100644
--- a/debian/patches/11_makefile_pwd_fixes.dpatch
+++ b/debian/patches/11-makefile-pwd-fixes.patch
@@ -1,13 +1,12 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 11_makefile_pwd_fixes.dpatch by Marc 'HE' Brockschmidt <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use CURDIR instead of PWD.
+From: Marc 'HE' Brockschmidt <[email protected]>
+Subject: Use CURDIR instead of PWD.
-@DPATCH@
-diff -urNad PerlPanel-0.9.1+cvs20051225-1~/Makefile PerlPanel-0.9.1+cvs20051225-1/Makefile
---- PerlPanel-0.9.1+cvs20051225-1~/Makefile 2008-04-05 16:19:12.000000000 +0200
-+++ PerlPanel-0.9.1+cvs20051225-1/Makefile 2008-04-05 16:19:27.000000000 +0200
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/Makefile
++++ b/Makefile
@@ -48,7 +48,7 @@
perl -ne 's!\@PREFIX\@!$(PREFIX)!g ; s!\@LIBDIR\@!$(LIBDIR)!g ; print' < src/perlpanel-run-dialog > build/perlpanel-run-dialog
perl -ne 's!\@PREFIX\@!$(PREFIX)!g ; s!\@LIBDIR\@!$(LIBDIR)!g ; print' < src/perlpanel-applet-install > build/perlpanel-applet-install
diff --git a/debian/patches/20-fix-deleting-events.patch b/debian/patches/20-fix-deleting-events.patch
new file mode 100644
index 0000000..a120d13
--- /dev/null
+++ b/debian/patches/20-fix-deleting-events.patch
@@ -0,0 +1,17 @@
+From: Marc Brockschmidt <[email protected]>
+Subject: This fixes an ugly bug when two reminders have the same attributes
+
+---
+ lib/PerlPanel/Applet/Clock.pm | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/lib/PerlPanel/Applet/Clock.pm
++++ b/lib/PerlPanel/Applet/Clock.pm
+@@ -359,6 +359,7 @@
+ $_->{notes} eq $self->{deleted_event}->{notes}) {
+ splice(@{$self->{config}->{events}}, $deleted_index, 1);
+ delete($self->{deleted_event});
++ last;
+ }
+ $deleted_index += 1;
+ }
diff --git a/debian/patches/20_fix_deleting_events.dpatch b/debian/patches/20_fix_deleting_events.dpatch
deleted file mode 100644
index 5891f80..0000000
--- a/debian/patches/20_fix_deleting_events.dpatch
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 23_fix_deleting_events.dpatch by Marc Brockschmidt <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: This fixes an ugly bug when two reminders have the same attributes
-
-@DPATCH@
---- old/lib/PerlPanel/Applet/Clock.pm 2005-04-14 18:34:16.000000000 +0200
-+++ new/lib/PerlPanel/Applet/Clock.pm 2005-04-14 18:34:38.000000000 +0200
-@@ -361,6 +361,7 @@
- $_->{notes} eq $self->{deleted_event}->{notes}) {
- splice(@{$self->{config}->{events}}, $deleted_index, 1);
- delete($self->{deleted_event});
-+ last;
- }
- $deleted_index += 1;
- }
diff --git a/debian/patches/21-xterm-to-x-terminal-emulator.patch b/debian/patches/21-xterm-to-x-terminal-emulator.patch
new file mode 100644
index 0000000..c5fdcd9
--- /dev/null
+++ b/debian/patches/21-xterm-to-x-terminal-emulator.patch
@@ -0,0 +1,18 @@
+From: Marc Brockschmidt <[email protected]>
+Subject: Patch to use the Debian way to call terminals
+
+---
+ lib/PerlPanel/Applet/Commander.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/lib/PerlPanel/Applet/Commander.pm
++++ b/lib/PerlPanel/Applet/Commander.pm
+@@ -166,7 +166,7 @@
+ if ($_[1] eq 'ok' || $_[1] eq 0) {
+ my $command = $command_entry->entry->get_text;
+ if ($terminal_checkbutton->get_active) {
+- $command = 'xterm -e '.$command;
++ $command = 'x-terminal-emulator -e '.$command;
+ }
+
+ PerlPanel::append_run_history($command);
diff --git a/debian/patches/21_xterm_to_x-terminal-emulator.dpatch b/debian/patches/21_xterm_to_x-terminal-emulator.dpatch
deleted file mode 100644
index 0d95581..0000000
--- a/debian/patches/21_xterm_to_x-terminal-emulator.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 22_xterm_to_x-terminal-emulator.dpatch by Marc Brockschmidt <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch to use the Debian way to call terminals
-
-@DPATCH@
-diff -urNad PerlPanel.upstream/lib/PerlPanel/Applet/Commander.pm PerlPanel/lib/PerlPanel/Applet/Commander.pm
---- PerlPanel.upstream/lib/PerlPanel/Applet/Commander.pm 2004-09-29 15:17:43.000000000 +0200
-+++ PerlPanel/lib/PerlPanel/Applet/Commander.pm 2005-01-24 19:59:58.000000000 +0100
-@@ -166,7 +166,7 @@
- if ($_[1] eq 'ok' || $_[1] eq 0) {
- my $command = $command_entry->entry->get_text;
- if ($terminal_checkbutton->get_active) {
-- $command = 'xterm -e '.$command;
-+ $command = 'x-terminal-emulator -e '.$command;
- }
-
- PerlPanel::append_run_history($command);
diff --git a/debian/patches/24_improve_reminder_performance.dpatch b/debian/patches/24-improve-reminder-performance.patch
similarity index 79%
rename from debian/patches/24_improve_reminder_performance.dpatch
rename to debian/patches/24-improve-reminder-performance.patch
index 2540c81..03be4fa 100644
--- a/debian/patches/24_improve_reminder_performance.dpatch
+++ b/debian/patches/24-improve-reminder-performance.patch
@@ -1,13 +1,13 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 24_improve_reminder_performance.dpatch by Marc 'HE' Brockschmidt <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Does more caching and less checking for events to remind for, greatly
-## DP: lowering the number of cpu cycles wasted.
+From: Marc 'HE' Brockschmidt <[email protected]>
+Subject: Does more caching and less checking for events to remind for, greatly
+ lowering the number of cpu cycles wasted.
-@DPATCH@
---- old/lib/PerlPanel/Applet/Clock.pm 2005-04-14 18:23:19.000000000 +0200
-+++ new/lib/PerlPanel/Applet/Clock.pm 2005-04-14 18:28:52.000000000 +0200
+---
+ lib/PerlPanel/Applet/Clock.pm | 19 ++++++++++++++-----
+ 1 file changed, 14 insertions(+), 5 deletions(-)
+
+--- a/lib/PerlPanel/Applet/Clock.pm
++++ b/lib/PerlPanel/Applet/Clock.pm
@@ -41,6 +41,8 @@
our $REMINDER_DIALOG_FMT = "<span weight=\"bold\" size=\"x-large\">%s</span>\n\n%s";
@@ -33,7 +33,7 @@
return 1;
}
-@@ -382,8 +384,10 @@
+@@ -383,8 +385,10 @@
my $now = time();
foreach my $event (grep { $_->{reminder} > 0 && defined($_->{date}) } @{$self->{config}->{events}}) {
@@ -45,7 +45,7 @@
$event->{reminded} = 'true';
PerlPanel::save_config();
$self->reminder($event);
-@@ -410,9 +414,14 @@
+@@ -411,9 +415,14 @@
sub get_timestamp_for {
my ($self, $event) = @_;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..41ba36f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,5 @@
+10-doc-fixes.patch
+11-makefile-pwd-fixes.patch
+20-fix-deleting-events.patch
+21-xterm-to-x-terminal-emulator.patch
+24-improve-reminder-performance.patch
diff --git a/debian/perlpanel.menu b/debian/perlpanel.menu
index e415f2a..d5ae710 100644
--- a/debian/perlpanel.menu
+++ b/debian/perlpanel.menu
@@ -1,6 +1,6 @@
?package(perlpanel): \
needs="X11" \
- section="Apps/System" \
+ section="Applications/System" \
hints="GNOME,Perl" \
title="PerlPanel" \
command="/usr/bin/perlpanel" \
diff --git a/debian/rules b/debian/rules
index 1a1fda6..96703f4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,14 +2,16 @@
TMP=$(CURDIR)/debian/perlpanel
-build: patch build-stamp
+build-arch: build
+build-indep: build
+
+build: build-stamp
build-stamp:
dh_testdir
$(MAKE) PREFIX=/usr LIBDIR=/usr/share/perlpanel/
touch build-stamp
-clean: unpatch clean-unpatched
-clean-unpatched:
+clean:
dh_testdir
dh_testroot
rm -f build-stamp install-stamp
@@ -20,7 +22,7 @@ install: install-stamp
install-stamp: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr LIBDIR=/usr/share/perlpanel/
#Fix b0rken permissions in the upstream tarball:
find $(TMP)/usr/share/icons/hicolor/48x48/ -name '*png' -exec chmod 644 \{\} \;
@@ -50,15 +52,5 @@ binary-indep: build install
binary-arch: build install
# We have nothing to do by default.
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
- #dpatch call-all -a=pkg-info >patch-stamp #I don't understand this one.
- echo patched > patch-stamp
-
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
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
--- End Message ---
