[Python-apps-commits] r7943 - in packages/ocrfeeder/trunk/debian (6 files)
agarcia-guest at users.alioth.debian.org
agarcia-guest at users.alioth.debian.org
Mon Dec 12 23:10:02 UTC 2011
Date: Monday, December 12, 2011 @ 23:10:01
Author: agarcia-guest
Revision: 7943
0.7.7-1: new upstream release
Added:
packages/ocrfeeder/trunk/debian/patches/03_missing-help-file.patch
Modified:
packages/ocrfeeder/trunk/debian/changelog
packages/ocrfeeder/trunk/debian/control
packages/ocrfeeder/trunk/debian/copyright
packages/ocrfeeder/trunk/debian/patches/series
packages/ocrfeeder/trunk/debian/watch
Modified: packages/ocrfeeder/trunk/debian/changelog
===================================================================
--- packages/ocrfeeder/trunk/debian/changelog 2011-12-12 22:43:28 UTC (rev 7942)
+++ packages/ocrfeeder/trunk/debian/changelog 2011-12-12 23:10:01 UTC (rev 7943)
@@ -1,3 +1,13 @@
+ocrfeeder (0.7.7-1) unstable; urgency=low
+
+ * New upstream release (Closes: #646605).
+ * debian/watch: scan for .xz files, upstream no longer uses bz2.
+ * debian/copyright: rewrite using the machine-readable format.
+ * debian/control: add build dependency on python-reportlab.
+ * 03_missing-help-file.patch: upstream forgot to add this file.
+
+ -- Alberto Garcia <agarcia at igalia.com> Sat, 10 Dec 2011 18:21:56 +0200
+
ocrfeeder (0.7.6-1) unstable; urgency=low
* New upstream release.
Modified: packages/ocrfeeder/trunk/debian/control
===================================================================
--- packages/ocrfeeder/trunk/debian/control 2011-12-12 22:43:28 UTC (rev 7942)
+++ packages/ocrfeeder/trunk/debian/control 2011-12-12 23:10:01 UTC (rev 7943)
@@ -4,7 +4,7 @@
Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
Uploaders: W. Martin Borgert <debacle at debian.org>, Alberto Garcia <agarcia at igalia.com>
DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7), python-all (>= 2.6.6-3~), intltool, python-gtk2-dev, gnome-doc-utils, python-imaging-sane, python-enchant, python-gtkspell, python-pygoocanvas
+Build-Depends: debhelper (>= 7), python-all (>= 2.6.6-3~), intltool, python-gtk2-dev, gnome-doc-utils, python-imaging-sane, python-enchant, python-gtkspell, python-pygoocanvas, python-reportlab
Standards-Version: 3.9.2
X-Python-Version: >= 2.5
Vcs-Svn: svn://svn.debian.org/svn/python-apps/packages/ocrfeeder/trunk/
Modified: packages/ocrfeeder/trunk/debian/copyright
===================================================================
--- packages/ocrfeeder/trunk/debian/copyright 2011-12-12 22:43:28 UTC (rev 7942)
+++ packages/ocrfeeder/trunk/debian/copyright 2011-12-12 23:10:01 UTC (rev 7943)
@@ -1,58 +1,51 @@
-This package was debianized by Alberto Garcia Gonzalez
-<agarcia at igalia.com> on Tue, 30 Mar 2010 21:09:34 +0200
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202
+Upstream-Contact: Joaquim Rocha <jrocha at igalia.com>
+Source: http://ftp.gnome.org/pub/GNOME/sources/ocrfeeder/
-It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/ocrfeeder/
+Files: *
+Copyright: 2008-2011 Joaquim Rocha
+ 2009-2011 Igalia, S.L.
+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
+ your option) any later version.
+ .
+ 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.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License can be found in `/usr/share/common-licenses/GPL-3'.
-Upstream Author:
+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
+ published by the Free Software Foundation; either version 2.1 of the
+ License, or (at your option) any later version.
+ .
+ This library 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.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License can be found in `/usr/share/common-licenses/LGPL-2.1'.
- Joaquim Rocha <joaquimrocha1 at gmail.com>
-
-Copyright:
-
- Copyright (C) 2008-2010 Joaquim Rocha
- Copyright (C) 2009-2010 Igalia, S.L.
-
-OCRFeeder is licensed under the GNU General Public License v3:
-
- 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 your option) any later version.
-
- 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.
-
- On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-3'.
-
-OCRFeeder also contains the ODFPy module, that is
-
- Copyright (C) 2006-2007 Søren Roug, European Environment Agency
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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.
-
- On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
-
-The icon in src/ocrfeeder/odf/thumbnail.py is
-
- Copyright (C) 2008 ZwahlenDesign
-
- and is released under the GNU GPL, version 2
-
- On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-2'.
-
-The Debian packaging is Copyright (C) 2010, Alberto Garcia
-<agarcia at igalia.com> and is licensed under the GPLv3, see
-`/usr/share/common-licenses/GPL-3'.
+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
+ published by the Free Software Foundation.
+ .
+ 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.
+ .
+ On Debian systems the full text of the GNU General Public License 2
+ can be found in the `/usr/share/common-licenses/GPL-2' file.
Added: packages/ocrfeeder/trunk/debian/patches/03_missing-help-file.patch
===================================================================
--- packages/ocrfeeder/trunk/debian/patches/03_missing-help-file.patch (rev 0)
+++ packages/ocrfeeder/trunk/debian/patches/03_missing-help-file.patch 2011-12-12 23:10:01 UTC (rev 7943)
@@ -0,0 +1,29 @@
+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 2011-12-12 22:43:28 UTC (rev 7942)
+++ packages/ocrfeeder/trunk/debian/patches/series 2011-12-12 23:10:01 UTC (rev 7943)
@@ -1,2 +1,3 @@
01_icon-path.patch
02_potfiles-quilt.patch
+03_missing-help-file.patch
Modified: packages/ocrfeeder/trunk/debian/watch
===================================================================
--- packages/ocrfeeder/trunk/debian/watch 2011-12-12 22:43:28 UTC (rev 7942)
+++ packages/ocrfeeder/trunk/debian/watch 2011-12-12 23:10:01 UTC (rev 7943)
@@ -1,2 +1,2 @@
version=3
-http://ftp.gnome.org/pub/GNOME/sources/ocrfeeder/(\d\.\d)/ocrfeeder-(.*)\.tar\.bz2
+http://ftp.gnome.org/pub/GNOME/sources/ocrfeeder/(\d\.\d)/ocrfeeder-(.*)\.tar\.xz
More information about the Python-apps-commits
mailing list