rev 18635 - in kde-extras/kbarcode/trunk/debian: . patches source
Fathi Boudra
fabo at alioth.debian.org
Wed Aug 11 06:46:38 UTC 2010
Author: fabo
Date: 2010-08-11 06:46:34 +0000 (Wed, 11 Aug 2010)
New Revision: 18635
Added:
kde-extras/kbarcode/trunk/debian/patches/09_missing_name_key.diff
kde-extras/kbarcode/trunk/debian/source/
kde-extras/kbarcode/trunk/debian/source/format
Modified:
kde-extras/kbarcode/trunk/debian/changelog
kde-extras/kbarcode/trunk/debian/compat
kde-extras/kbarcode/trunk/debian/control
kde-extras/kbarcode/trunk/debian/copyright
kde-extras/kbarcode/trunk/debian/kbarcode.1
kde-extras/kbarcode/trunk/debian/patches/series
Log:
* Add missing Name key to kbarcode-label desktop file. (Closes: #570129)
* Remove deprecated Encoding key from desktop files.
* Switch to dpkg-source 3.0 (quilt) format.
* Bump compat/debhelper to 7.
* Bump Standards-Version to 3.9.1 (no changes needed).
* Update debian/copyright:
- update to latest dh-make template.
- remove BSD license reference.
Modified: kde-extras/kbarcode/trunk/debian/changelog
===================================================================
--- kde-extras/kbarcode/trunk/debian/changelog 2010-08-09 22:15:54 UTC (rev 18634)
+++ kde-extras/kbarcode/trunk/debian/changelog 2010-08-11 06:46:34 UTC (rev 18635)
@@ -1,8 +1,21 @@
+kbarcode (2.0.7-3) unstable; urgency=low
+
+ * Add missing Name key to kbarcode-label desktop file. (Closes: #570129)
+ * Remove deprecated Encoding key from desktop files.
+ * Switch to dpkg-source 3.0 (quilt) format.
+ * Bump compat/debhelper to 7.
+ * Bump Standards-Version to 3.9.1 (no changes needed).
+ * Update debian/copyright:
+ - update to latest dh-make template.
+ - remove BSD license reference.
+
+ -- Fathi Boudra <fabo at debian.org> Wed, 11 Aug 2010 08:50:45 +0300
+
kbarcode (2.0.7-2) unstable; urgency=low
- * Add autoconf2.64 fixes. Thanks to pld-linux. Closes: 543014.
+ * Add autoconf2.64 fixes. Thanks to pld-linux. (Closes: #543014)
* Allow automake 1.11
- * reautotool and stuff after applying patches
+ * Reautotool and stuff after applying patches
-- Sune Vuorela <debian at pusling.com> Tue, 01 Sep 2009 22:40:31 +0200
Modified: kde-extras/kbarcode/trunk/debian/compat
===================================================================
--- kde-extras/kbarcode/trunk/debian/compat 2010-08-09 22:15:54 UTC (rev 18634)
+++ kde-extras/kbarcode/trunk/debian/compat 2010-08-11 06:46:34 UTC (rev 18635)
@@ -1 +1 @@
-6
+7
Modified: kde-extras/kbarcode/trunk/debian/control
===================================================================
--- kde-extras/kbarcode/trunk/debian/control 2010-08-09 22:15:54 UTC (rev 18634)
+++ kde-extras/kbarcode/trunk/debian/control 2010-08-11 06:46:34 UTC (rev 18635)
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Fathi Boudra <fabo at debian.org>, Mark Purcell <msp at debian.org>
-Build-Depends: cdbs, debhelper (>= 6), quilt, automake, kdelibs4-dev
-Standards-Version: 3.8.0
+Build-Depends: cdbs (>= 0.4.52), debhelper (>= 7), quilt, automake, kdelibs4-dev
+Standards-Version: 3.9.1
Homepage: http://www.kbarcode.net/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kbarcode/?op=log
Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/kbarcode/trunk
Modified: kde-extras/kbarcode/trunk/debian/copyright
===================================================================
--- kde-extras/kbarcode/trunk/debian/copyright 2010-08-09 22:15:54 UTC (rev 18634)
+++ kde-extras/kbarcode/trunk/debian/copyright 2010-08-11 06:46:34 UTC (rev 18635)
@@ -1,75 +1,83 @@
-This package was debianized by Theodore Karkoulis <bilbo at debian.org> on
-Tue, 16 Sep 2003 13:36:54 +0300.
+This work was packaged for Debian by:
-It is now maintained by KDE Extras Team.
+ Theodore Karkoulis <bilbo at debian.org> on Tue, 16 Sep 2003 13:36:54 +0300.
+ It is now maintained by Debian KDE Extras team.
-It was downloaded from http://www.kbarcode.net
+It was downloaded from:
-Upstream Author: Dominik Seichter <domseichter at web.de>
+ http://www.kbarcode.net
-Copyright: Copyright (C) 2002-2006 Dominik Seichter <domseichter at web.de>
+Upstream Author:
-Copyright for barkode: Copyright (C) 1998-2000 Torben Weis <weis at kde.org>
+ Dominik Seichter <domseichter at web.de>
-Copyright for Barcode Writer in Pure PostScript:
- Copyright (C) 2006 Terry Burton <tez at terryburton.co.uk>
+Copyright:
-barcode.ps license:
+ Copyright (C) 2002-2006 Dominik Seichter <domseichter at web.de>
-The file kbarcode/barcode.ps which is included in this
-distribution is licensed under the following conditions:
-========================================================
+License:
-Barcode Writer in Pure PostScript
-http://www.terryburton.co.uk/barcodewriter/
+ This package 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.
-Copyright (c) 2005 Terry Burton - tez at terryburton.co.uk
+ This package 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
+ Lesser General Public License for more details.
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
-THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
+The Debian packaging is:
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/BSD'.
+ Copyright (C) 2006-2010 Fathi Boudra <fabo at debian.org>
-kbarcode license:
+and is licensed under the GPL-2 or any later version , see above.
- This package 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.
+Copyright for barkode:
- This package 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.
+ Copyright (C) 1998-2000 Torben Weis <weis at kde.org>
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+Copyright for Barcode Writer in Pure PostScript:
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
+ Copyright (C) 2006 Terry Burton <tez at terryburton.co.uk>
-The Debian packaging is (C) 2006, Fathi Boudra <fboudra at free.fr> and
-is licensed under the GPL, see above.
+barcode.ps license:
+
+ The file kbarcode/barcode.ps which is included in this
+ distribution is licensed under the following conditions:
+ ========================================================
+
+ Barcode Writer in Pure PostScript
+ http://www.terryburton.co.uk/barcodewriter/
+
+ Copyright (c) 2005 Terry Burton - tez at terryburton.co.uk
+
+ Permission is hereby granted, free of charge, to any
+ person obtaining a copy of this software and associated
+ documentation files (the "Software"), to deal in the
+ Software without restriction, including without
+ limitation the rights to use, copy, modify, merge,
+ publish, distribute, sublicense, and/or sell copies of
+ the Software, and to permit persons to whom the Software
+ is furnished to do so, subject to the following
+ conditions:
+
+ The above copyright notice and this permission notice
+ shall be included in all copies or substantial portions
+ of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+ KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
+ THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ IN THE SOFTWARE.
Modified: kde-extras/kbarcode/trunk/debian/kbarcode.1
===================================================================
--- kde-extras/kbarcode/trunk/debian/kbarcode.1 2010-08-09 22:15:54 UTC (rev 18634)
+++ kde-extras/kbarcode/trunk/debian/kbarcode.1 2010-08-11 06:46:34 UTC (rev 18635)
@@ -170,7 +170,7 @@
.SH SEE ALSO
.TP
\fI/usr/share/apps/kbarcode/barcodes.html\fP
-informations about different barcodes
+information about different barcodes
.TP
\fBhttp://freshmeat.net/projects/kbarcode/\fP
\fBKBarcode\fP project page
Added: kde-extras/kbarcode/trunk/debian/patches/09_missing_name_key.diff
===================================================================
--- kde-extras/kbarcode/trunk/debian/patches/09_missing_name_key.diff (rev 0)
+++ kde-extras/kbarcode/trunk/debian/patches/09_missing_name_key.diff 2010-08-11 06:46:34 UTC (rev 18635)
@@ -0,0 +1,45 @@
+--- a/kbarcode/kbarcode-label.desktop
++++ b/kbarcode/kbarcode-label.desktop
+@@ -1,9 +1,9 @@
+ [Desktop Entry]
+ Type=MimeType
+ Comment=KBarcode Label
+-Encoding=UTF-8
+ Icon=kbarcode
+ MimeType=application/kbarcode-label
++Name=kbarcode-label.desktop
+ Name[de]=kbarcode-label.desktop
+ Patterns=*.kbarcode;*.KBARCODE;
+
+--- a/kbarcode/kbarcode-batch.desktop
++++ b/kbarcode/kbarcode-batch.desktop
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Application
+ Exec=kbarcode --batch
+ Icon=kbarcode.png
+--- a/kbarcode/kbarcode-editor.desktop
++++ b/kbarcode/kbarcode-editor.desktop
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Application
+ Exec=kbarcode --label
+ Icon=kbarcode.png
+--- a/kbarcode/kbarcode-single.desktop
++++ b/kbarcode/kbarcode-single.desktop
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Application
+ Exec=kbarcode --barcode
+ Icon=kbarcode.png
+--- a/kbarcode/kbarcode.desktop
++++ b/kbarcode/kbarcode.desktop
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Application
+ Exec=kbarcode -caption "%c" %i %m %f
+ Icon=kbarcode.png
Modified: kde-extras/kbarcode/trunk/debian/patches/series
===================================================================
--- kde-extras/kbarcode/trunk/debian/patches/series 2010-08-09 22:15:54 UTC (rev 18634)
+++ kde-extras/kbarcode/trunk/debian/patches/series 2010-08-11 06:46:34 UTC (rev 18635)
@@ -5,3 +5,4 @@
06_disable_no_undefined.diff
07_autoconf2.64.diff
08_automake-1.1x.diff
+09_missing_name_key.diff
Added: kde-extras/kbarcode/trunk/debian/source/format
===================================================================
--- kde-extras/kbarcode/trunk/debian/source/format (rev 0)
+++ kde-extras/kbarcode/trunk/debian/source/format 2010-08-11 06:46:34 UTC (rev 18635)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the pkg-kde-commits
mailing list