[Python-apps-commits] r8474 - in packages/ocrfeeder/trunk/debian (4 files)

[agarcia-guest at users.alioth.debian.org]

    Date: Wednesday, April 11, 2012 @ 20:34:47
  Author: agarcia-guest
Revision: 8474

0.7.9-1: new upstream release

Modified:
  packages/ocrfeeder/trunk/debian/changelog
  packages/ocrfeeder/trunk/debian/copyright
  packages/ocrfeeder/trunk/debian/patches/series
Deleted:
  packages/ocrfeeder/trunk/debian/patches/03_missing-help-file.patch

Modified: packages/ocrfeeder/trunk/debian/changelog
===================================================================
--- packages/ocrfeeder/trunk/debian/changelog	2012-04-11 16:05:03 UTC (rev 8473)
+++ packages/ocrfeeder/trunk/debian/changelog	2012-04-11 20:34:47 UTC (rev 8474)
@@ -1,3 +1,12 @@
+ocrfeeder (0.7.9-1) unstable; urgency=low
+
+  * New upstream release (Closes: #661499).
+  * debian/copyright: update format URL to version 1.0.
+  * debian/copyright: add copyright information for Debian files.
+  * Drop 03_missing-help-file.patch, it's already in this release.
+
+ -- Alberto Garcia <agarcia at igalia.com>  Wed, 11 Apr 2012 22:26:53 +0300
+
 ocrfeeder (0.7.7-2) unstable; urgency=low
 
   * debian/control: 

Modified: packages/ocrfeeder/trunk/debian/copyright
===================================================================
--- packages/ocrfeeder/trunk/debian/copyright	2012-04-11 16:05:03 UTC (rev 8473)
+++ packages/ocrfeeder/trunk/debian/copyright	2012-04-11 20:34:47 UTC (rev 8474)
@@ -1,11 +1,25 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Contact: Joaquim Rocha <jrocha at igalia.com>
 Source: http://ftp.gnome.org/pub/GNOME/sources/ocrfeeder/
 
 Files: *
-Copyright: 2008-2011 Joaquim Rocha
-           2009-2011 Igalia, S.L.
+Copyright: 2008-2012 Joaquim Rocha
+           2009-2012 Igalia, S.L.
 License: GPL-3+
+
+Files: debian/*
+Copyright: 2010-2012 Alberto Garcia <agarcia at igalia.com>
+License: GPL-3+
+
+Files: src/ocrfeeder/odf/*
+Copyright: 2006-2007 Søren Roug, European Environment Agency
+License: LGPL-2.1+
+
+Files: src/ocrfeeder/odf/thumbnail.py
+Copyright: 2008 ZwahlenDesign
+License: GPL-2
+
+License: GPL-3+
  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 3 of the License, or (at
@@ -19,8 +33,6 @@
  On Debian systems, the complete text of the GNU General Public
  License can be found in `/usr/share/common-licenses/GPL-3'.
 
-Files: src/ocrfeeder/odf/*
-Copyright: 2006-2007 Søren Roug, European Environment Agency
 License: LGPL-2.1+
  This library is free software; you can redistribute it and/or modify
  it under the terms of the GNU Lesser General Public License as
@@ -35,8 +47,6 @@
  On Debian systems, the complete text of the GNU General Public
  License can be found in `/usr/share/common-licenses/LGPL-2.1'.
 
-Files: src/ocrfeeder/odf/thumbnail.py
-Copyright: 2008 ZwahlenDesign
 License: GPL-2
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License version 2, as

Deleted: packages/ocrfeeder/trunk/debian/patches/03_missing-help-file.patch
===================================================================
--- packages/ocrfeeder/trunk/debian/patches/03_missing-help-file.patch	2012-04-11 16:05:03 UTC (rev 8473)
+++ packages/ocrfeeder/trunk/debian/patches/03_missing-help-file.patch	2012-04-11 20:34:47 UTC (rev 8474)
@@ -1,29 +0,0 @@
-Include legal.xml file.
-Upstream forgot to add it to the dist tarball, but it's necessary in
-order to read the user manual.
-Index: ocrfeeder/help/C/legal.xml
-===================================================================
---- /dev/null
-+++ ocrfeeder/help/C/legal.xml
-@@ -0,0 +1,9 @@
-+<license xmlns="http://projectmallard.org/1.0/"
-+ href="http://creativecommons.org/licenses/by-sa/3.0/us/">
-+<p>This work is licensed under a
-+<link href="http://creativecommons.org/licenses/by-sa/3.0/us/">Creative Commons
-+Attribution-Share Alike 3.0 United States License</link>.</p>
-+<p>As a special exception, the copyright holders give you permission to copy,
-+modify, and distribute the example code contained in this document under the
-+terms of your choosing, without restriction.</p>
-+</license>
-Index: ocrfeeder/help/Makefile.in
-===================================================================
---- ocrfeeder.orig/help/Makefile.in
-+++ ocrfeeder/help/Makefile.in
-@@ -330,6 +330,7 @@ DOC_PAGES = \
- 	importingfromscanner.page \
- 	importingpdf.page \
- 	index.page \
-+	legal.xml \
- 	manualeditionandcorrection.page \
- 	ocrconfiguration.page \
- 	projects.page \

Modified: packages/ocrfeeder/trunk/debian/patches/series
===================================================================
--- packages/ocrfeeder/trunk/debian/patches/series	2012-04-11 16:05:03 UTC (rev 8473)
+++ packages/ocrfeeder/trunk/debian/patches/series	2012-04-11 20:34:47 UTC (rev 8474)
@@ -1,3 +1,2 @@
 01_icon-path.patch
 02_potfiles-quilt.patch
-03_missing-help-file.patch