diff -u perlpanel-0.9.1+cvs20051225/debian/patches/00list perlpanel-0.9.1+cvs20051225/debian/patches/00list --- perlpanel-0.9.1+cvs20051225/debian/patches/00list +++ perlpanel-0.9.1+cvs20051225/debian/patches/00list @@ -1,4 +1,5 @@ 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 -u perlpanel-0.9.1+cvs20051225/debian/control perlpanel-0.9.1+cvs20051225/debian/control --- perlpanel-0.9.1+cvs20051225/debian/control +++ perlpanel-0.9.1+cvs20051225/debian/control @@ -4,7 +4,7 @@ Maintainer: Ubuntu MOTU Developers XSBC-Original-Maintainer: Marc 'HE' Brockschmidt Build-Depends: debhelper (>= 4), dpatch, gettext, libgtk2-perl, libgtk2-gladexml-perl, libgnome2-wnck-perl, libxml-simple-perl, liblocale-gettext-perl -Standards-Version: 3.6.2 +Standards-Version: 3.7.3 Package: perlpanel Architecture: all @@ -14,7 +14,7 @@ Description: lean menu and launcher panel written in Perl and Gtk2 PerlPanel draws a small taskbar on your screen to display some useful widgets like a programs menu, some shortcut icons, a system tray and so on. It's - similar to the Windows Taskbar, the Gnome Panel, and KDE's Kicker. + similar to the Windows Taskbar, the GNOME Panel, and KDE's Kicker. . PerlPanel is completely independent of any particular environment. You can use it with any window manager, without need for one of the big desktop diff -u perlpanel-0.9.1+cvs20051225/debian/rules perlpanel-0.9.1+cvs20051225/debian/rules --- perlpanel-0.9.1+cvs20051225/debian/rules +++ perlpanel-0.9.1+cvs20051225/debian/rules @@ -13,7 +13,7 @@ dh_testdir dh_testroot rm -f build-stamp install-stamp - -$(MAKE) clean + $(MAKE) clean dh_clean install: install-stamp @@ -24,7 +24,7 @@ $(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 \{\} \; - find $(TMP)/usr/share/perlpanel/glade/ -name '*glade' -exec chmod 644 \{\} \; + find $(TMP)/usr/share/perlpanel/glade/ -type f -name '*glade' -exec chmod 644 \{\} \; find $(TMP)/usr/share/perlpanel/PerlPanel/Applet/ -name '*pm' -exec chmod 644 \{\} \; dh_install diff -u perlpanel-0.9.1+cvs20051225/debian/changelog perlpanel-0.9.1+cvs20051225/debian/changelog --- perlpanel-0.9.1+cvs20051225/debian/changelog +++ perlpanel-0.9.1+cvs20051225/debian/changelog @@ -1,3 +1,27 @@ +perlpanel (1:0.9.1+cvs20051225-2ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes (LP: #235125): + - debian/rules: added dh_iconcache + - debian/control: Update maintainer fields according to debian- + maintainer-field spec. + + -- Nathan Handler Mon, 26 May 2008 21:42:10 -0500 + +perlpanel (1:0.9.1+cvs20051225-2) unstable; urgency=low + + * Makefile: + + Use $(CURDIR) instead of $(PWD) (Closes: #399381) + + Fix /usr/share/perlpanel/glade to have 755 permissions + * debian/control: + + build-dep on liblocale-gettext-perl. (Closes: #467334) + + recommend libaudio-xmmsclient-perl instead of libxmms-perl (Closes: + #473839) + + Bump Standards-Version + * debian/rules: + + Don't ignore make clean errors + + -- Marc 'HE' Brockschmidt Sat, 05 Apr 2008 15:44:03 +0200 + perlpanel (1:0.9.1+cvs20051225-1ubuntu3) gutsy; urgency=low * debian/control: Update maintainer fields according to debian- @@ -191,0 +216 @@ + only in patch2: unchanged: --- perlpanel-0.9.1+cvs20051225.orig/debian/patches/11_makefile_pwd_fixes.dpatch +++ perlpanel-0.9.1+cvs20051225/debian/patches/11_makefile_pwd_fixes.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 11_makefile_pwd_fixes.dpatch by Marc 'HE' Brockschmidt +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: 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 +@@ -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 + perl -ne 's!\@VERSION\@!$(VERSION)!g ; print' < lib/PerlPanel.pm > build/PerlPanel.pm +- perl -I$(PWD)/build -MPerlPanel -MXML::Simple -e 'print XMLout(\%PerlPanel::DEFAULTS)' > build/perlpanelrc ++ perl -I$(CURDIR)/build -MPerlPanel -MXML::Simple -e 'print XMLout(\%PerlPanel::DEFAULTS)' > build/perlpanelrc + pod2man doc/perlpanel.pod | gzip -9c > build/perlpanel.1.gz + pod2man doc/perlpanel-applet-howto.pod | gzip -9c > build/perlpanel-applet-howto.1.gz + pod2man doc/perlpanel-run-dialog.pod | gzip -9c > build/perlpanel-run-dialog.1.gz