diff -Nru kshutdown-2.0~beta6/debian/changelog kshutdown-2.0~beta6/debian/changelog --- kshutdown-2.0~beta6/debian/changelog 2009-04-26 20:04:21.000000000 +0200 +++ kshutdown-2.0~beta6/debian/changelog 2009-05-12 14:55:41.000000000 +0200 @@ -1,4 +1,15 @@ -kshutdown (2.0~beta6-1) unstable; urgency=low +kshutdown (2.0~beta6-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - Transition from kde4.mk to pkg-kde-tools: + - debian/rules: Change '/usr/share/cdbs/1/class/kde4.mk' to + '/usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk' + - debian/control: Build-Depend on 'pkg-kde-tools' + - chrpath, cmake not need in build-deps + + -- Alessandro Ghersi Tue, 12 May 2009 04:29:31 +0200 + +shutdown (2.0~beta6-1) unstable; urgency=low * New upstream release. - Fixes crash when choosing "When selected application exits" @@ -18,6 +29,13 @@ -- Romain Beauxis Sat, 11 Apr 2009 20:42:56 +0200 +kshutdown (2.0~beta4-1ubuntu1) jaunty; urgency=low + + * New upstream release + * Packaging ported to KDE4 + + -- Anthony Mercatante Fri, 23 Jan 2009 20:03:51 +0100 + kshutdown (1.0.4-1) unstable; urgency=low * New upstream release. @@ -35,6 +53,16 @@ -- Romain Beauxis Fri, 20 Jun 2008 02:33:51 +0200 +kshutdown (1.0.2-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - Ubuntu maintainer spec. + - Use simple-patchsys instead. + - Moved Homepage to new policy location. + - Added kubuntu_01_kdepot.patch + + -- Harald Sitter Thu, 05 Jun 2008 23:10:50 +0200 + kshutdown (1.0.2-1) unstable; urgency=low * New upstream release @@ -42,6 +70,22 @@ -- Romain Beauxis Tue, 11 Dec 2007 01:38:55 +0100 +kshutdown (1.0.1-2ubuntu2) hardy; urgency=low + + * Added build-dep of chrpath. + + -- Jonathan Patrick Davies Thu, 29 Nov 2007 20:39:26 +0100 + +kshutdown (1.0.1-2ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - Ubuntu maintainer spec. + - Use simple-patchsys instead. + * Moved Homepage to new policy location. + * New upstream release. + + -- Jonathan Patrick Davies Thu, 29 Nov 2007 18:49:26 +0100 + kshutdown (1.0.1-2) unstable; urgency=low * Added linker flags to remove non-needed link dependencies. @@ -56,6 +100,15 @@ -- Romain Beauxis Sun, 18 Nov 2007 14:39:07 +0100 +kshutdown (1.0-1ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + * Added homepage to control file + * Added kubuntu_01_kdepot for rosetta export of pot file + * Modify Maintainer value to match Debian-Maintainer-Field Spec + + -- Sarah Hobbs Sat, 19 May 2007 13:48:54 +1000 + kshutdown (1.0-1) unstable; urgency=low * New upstream release. @@ -73,12 +126,39 @@ -- Romain Beauxis Wed, 21 Feb 2007 02:10:26 +0100 +kshutdown (0.9~beta-0ubuntu1) edgy; urgency=low + + * New upstream release + * Switched to debhelper 5 + * Cleaned build dependancies + * Added homepage to control file + * Removed useless debian/cdbs folder + * Removed obsolete kubuntu_01_fix_desktop_file.patch + * Added kubuntu_01_kdepot for rosetta export of pot file + + -- Anthony Mercatante Mon, 17 Jul 2006 11:24:20 +0200 + kshutdown (0.8.2-1) unstable; urgency=low * New upstream release -- Romain Beauxis Tue, 14 Feb 2006 03:08:46 +0100 +kshutdown (0.8-1ubuntu2) dapper; urgency=low + + * Added dh_iconcache + + -- Sarah Hobbs Wed, 10 May 2006 21:41:20 +1000 + +kshutdown (0.8-1ubuntu1) dapper; urgency=low + + * Resynchronise with Debian. + * debian/control: + - added patchutils to Build-Depends + - added include for autotools.mk + + -- Benjamin Montgomery Thu, 15 Dec 2005 21:07:10 -0600 + kshutdown (0.8-1) unstable; urgency=low * New upstream release @@ -86,6 +166,21 @@ -- Romain Beauxis Tue, 29 Nov 2005 02:30:38 +0100 +kshutdown (0.7.1beta-0ubuntu1) dapper; urgency=low + + * New upstream release + * Added kubuntu_01_fix_desktop_file.patch to add french + translation and missing GenericName to kshutdown.desktop file + * Sponsored upload for Anthony Mercatante + + -- Jonathan Riddell Mon, 14 Nov 2005 14:49:43 +0100 + +kshutdown (0.6.1-0ubuntu1) breezy; urgency=low + + * New upstream release + + -- Anthony Mercatante Thu, 15 Sep 2005 22:36:05 +0200 + kshutdown (0.6.0-4) unstable; urgency=low * Workaround for FTBFS on some arch (see gcc Bug#323133) diff -Nru kshutdown-2.0~beta6/debian/control kshutdown-2.0~beta6/debian/control --- kshutdown-2.0~beta6/debian/control 2009-04-26 13:05:56.000000000 +0200 +++ kshutdown-2.0~beta6/debian/control 2009-05-12 14:55:41.000000000 +0200 @@ -1,13 +1,12 @@ Source: kshutdown Section: kde Priority: optional -Maintainer: Romain Beauxis -Uploaders: Eike Sauer , Romain Beauxis -Build-Depends: cdbs (>= 0.4.23-1.1), cmake, - debhelper (>= 7.0.1), kdelibs5-dev, - kdebase-workspace-dev, chrpath +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Romain Beauxis +Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>> 7.0.1), kdelibs5-dev, + kdebase-workspace-dev, pkg-kde-tools Standards-Version: 3.8.1 -Homepage: http://kshutdown.sourceforge.net +Homepage: http://kshutdown.sourceforge.net/ Package: kshutdown Architecture: any diff -Nru kshutdown-2.0~beta6/debian/rules kshutdown-2.0~beta6/debian/rules --- kshutdown-2.0~beta6/debian/rules 2009-04-26 13:05:56.000000000 +0200 +++ kshutdown-2.0~beta6/debian/rules 2009-05-12 14:55:41.000000000 +0200 @@ -1,21 +1,5 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -#include /usr/share/cdbs/1/rules/patchsys-quilt.mk - -# In order to regenerate 'debian/control' : -# DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean -# Then check manually if everything's ok - -LDFLAGS := -Wl,-z,defs -Wl,--as-needed - -# DEB_INSTALL_DOCS_ALL := README AUTHORS TODO VERSION +include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk DEB_INSTALL_MANPAGES_kshutdown := debian/kshutdown.1 - -binary-install/kshutdown:: - chrpath -d $(CURDIR)/debian/kshutdown/usr/bin/kshutdown -# chrpath -d $(CURDIR)/debian/kshutdown/usr/lib/kde3/kshutdownlockout_panelapplet.so - # Remove empty directories - find $(CURDIR)/debian/kshutdown -type d -empty -delete diff -Nru kshutdown-2.0~beta6/patches/audacious-shutdown.desktop kshutdown-2.0~beta6/patches/audacious-shutdown.desktop --- kshutdown-2.0~beta6/patches/audacious-shutdown.desktop 2009-04-21 22:43:50.000000000 +0200 +++ kshutdown-2.0~beta6/patches/audacious-shutdown.desktop 2009-05-12 04:27:48.000000000 +0200 @@ -13,4 +13,3 @@ X-DCOP-ServiceType= X-KDE-SubstituteUID=false X-KDE-Username= -X-Ubuntu-Gettext-Domain=desktop_kdebase