diff -u xfce4-timer-plugin-0.6/debian/compat xfce4-timer-plugin-0.6/debian/compat --- xfce4-timer-plugin-0.6/debian/compat +++ xfce4-timer-plugin-0.6/debian/compat @@ -1 +1 @@ -4 +5 diff -u xfce4-timer-plugin-0.6/debian/copyright xfce4-timer-plugin-0.6/debian/copyright --- xfce4-timer-plugin-0.6/debian/copyright +++ xfce4-timer-plugin-0.6/debian/copyright @@ -1,15 +1,48 @@ -This package was debianized by Yves-Alexis Perez on -Tue, 16 Jan 2007 19:37:21 +0100 +This package was debianized by Vincent Legout on +Sat, 30 Jun 2007 09:46:34 +0200. It was downloaded from http://goodies.xfce.org/releases/xfce4-timer-plugin/ -Copyright Holder: -(c) 2005-2007 Kemal Ilgar Eroglu +Upstream Author: Kemal Ilgar Eroglu + +Copyright: + Copyright (C) 2005, 2006 Kemal Ilgar Eroglu + +po/ca.po + Pau Ruŀlan Ferragut , 2006. +po/cs.po + Michal Várady , 2006. +po/fr.po + S. Roy , 2006. +po/ja.po + Daichi Kawahata , 2006. +po/tr.po + Kemal Ilgar Eroglu , 2006. +po/eu.po + Piarres Beobide , 2006. +po/pl.po + Piotr Maliński , 2006. +po/ru.po + Andrey Fedoseev , 2006. License: -You are free to distribute this software under the terms of -the GNU General Public License (version 2 or later). -On Debian systems, the complete text of the GNU General Public -License can be found in the file `/usr/share/common-licenses/GPL' + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. +The Debian packaging is (C) 2007, Vincent Legout and +is licensed under the GPL, see above. diff -u xfce4-timer-plugin-0.6/debian/rules xfce4-timer-plugin-0.6/debian/rules --- xfce4-timer-plugin-0.6/debian/rules +++ xfce4-timer-plugin-0.6/debian/rules @@ -2,2 +2,2 @@ -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/autotools.mk + +include /usr/share/cdbs/1/class/xfce.mk diff -u xfce4-timer-plugin-0.6/debian/changelog xfce4-timer-plugin-0.6/debian/changelog --- xfce4-timer-plugin-0.6/debian/changelog +++ xfce4-timer-plugin-0.6/debian/changelog @@ -1,3 +1,17 @@ +xfce4-timer-plugin (0.6-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable (LP: #182639), Ubuntu remaining changes: + - Use xfce.mk + - debian/compat: bump to 5 + - debian/control: b-d debhelper (>= 5) and autotools-dev + - add a debian/watch + - keep our debian/copyright, more accurate. + - debian/patches/01_implicit-pointer-conversion.patch; + + dropped, fixed upstream + * Modify Maintainer value to match Debian-Maintainer-Field Spec + + -- Pedro Fragoso Fri, 28 Dec 2007 09:57:26 +0000 + xfce4-timer-plugin (0.6-1) unstable; urgency=low * New upstream release. @@ -11,6 +25,21 @@ -- Yves-Alexis Thu, 20 Dec 2007 15:58:55 +0000 +xfce4-timer-plugin (0.5.1-1ubuntu1) hardy; urgency=low + + * Fake-merge with Debian unstable, remaining Ubuntu changes: + - use xfce.mk + - debian/compat: bump to 5 + - debian/control: + + adhere to DebianMaintainerField + + b-d on debhelper (>= 5) and autotools-dev + - add a debian/watch + - keep our debian/copyright, more accurate. + * debian/patches/01_implicit-pointer-conversion.patch: patch to fix an + implicit pointer conversion (see Debian #456316). + + -- Lionel Le Folgoc Fri, 14 Dec 2007 17:32:38 +0100 + xfce4-timer-plugin (0.5.1-1) unstable; urgency=low [ Yves-Alexis Perez ] @@ -22,0 +52,8 @@ + +xfce4-timer-plugin (0.5.1-0ubuntu1) gutsy; urgency=low + + * Initial release (LP: #123141) + * Original tarball repacked to remove .svn dirs and aclocal.m4 + + -- Vincent Legout Mon, 06 Aug 2007 13:06:56 +0200 + diff -u xfce4-timer-plugin-0.6/debian/control xfce4-timer-plugin-0.6/debian/control --- xfce4-timer-plugin-0.6/debian/control +++ xfce4-timer-plugin-0.6/debian/control @@ -1,9 +1,10 @@ Source: xfce4-timer-plugin Section: x11 Priority: optional -Maintainer: Debian Xfce Maintainers +Maintainer: Xubuntu Developers +XSBC-Original-Maintainer: Debian Xfce Maintainers Uploaders: Yves-Alexis Perez , Emanuele Rocca , Simon Huggins , Rudy Godoy , Martin Loschwitz -Build-Depends: debhelper (>= 4.1.0), cdbs, libxml-parser-perl, xfce4-panel-dev (>= 4.3.90.1) +Build-Depends: autotools-dev, debhelper (>= 5), cdbs, libxml-parser-perl, xfce4-panel-dev (>= 4.3.90.1) Standards-Version: 3.7.3 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/xfce4-timer-plugin/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/xfce4-timer-plugin/ only in patch2: unchanged: --- xfce4-timer-plugin-0.6.orig/debian/watch +++ xfce4-timer-plugin-0.6/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://goodies.xfce.org/releases/xfce4-timer-plugin/xfce4-timer-plugin-(.*)\.tar\.bz2