[Python-modules-commits] r29618 - in packages/ocr4gamera/trunk/debian (9 files)
danstender-guest at users.alioth.debian.org
danstender-guest at users.alioth.debian.org
Fri Jul 4 13:37:51 UTC 2014
Date: Friday, July 4, 2014 @ 13:37:50
Author: danstender-guest
Revision: 29618
* New upstream release.
+ Removed doc-fix-hyperlink-target.diff, doc-plugin-import.diff,
and no-wx-import.diff.
* deb/control:
+ New maintainer (Closes: #629179).
+ Dropped b-d on python-support.
+ Added versioning to b-d on python-all-dev.
+ Bumped standards to 3.9.5 (no changes needed).
+ Use canonical URIs for Vcs-* fields [Jakub Wilk].
+ Changed XS-Python-Version to X-Python-Version, bumped to 2.5.
+ Rearranged, wrapped and sorted.
* deb/copyright:
+ Specified Upstream-Contact according to README.
+ Added new maintainer.
+ Improved Copyright lines.
* deb/rules:
+ Added export for DH_VERBOSE.
+ Reduced to build with dh sequencer.
* Removal of generated manpage(s) moved to deb/clean.
Modified:
packages/ocr4gamera/trunk/debian/changelog
packages/ocr4gamera/trunk/debian/clean
packages/ocr4gamera/trunk/debian/control
packages/ocr4gamera/trunk/debian/copyright
packages/ocr4gamera/trunk/debian/patches/series
packages/ocr4gamera/trunk/debian/rules
Deleted:
packages/ocr4gamera/trunk/debian/patches/doc-fix-hyperlink-target.diff
packages/ocr4gamera/trunk/debian/patches/doc-plugin-import.diff
packages/ocr4gamera/trunk/debian/patches/no-wx-import.diff
Modified: packages/ocr4gamera/trunk/debian/changelog
===================================================================
--- packages/ocr4gamera/trunk/debian/changelog 2014-07-04 12:14:31 UTC (rev 29617)
+++ packages/ocr4gamera/trunk/debian/changelog 2014-07-04 13:37:50 UTC (rev 29618)
@@ -1,9 +1,26 @@
-ocr4gamera (1.0.6-4) UNRELEASED; urgency=low
+ocr4gamera (1.1.0-1) UNRELEASED; urgency=low
- * New maintainer (Closes: #629179).
- * Use canonical URIs for Vcs-* fields [Jakub Wilk].
+ * New upstream release.
+ + Removed doc-fix-hyperlink-target.diff, doc-plugin-import.diff,
+ and no-wx-import.diff.
+ * deb/control:
+ + New maintainer (Closes: #629179).
+ + Dropped b-d on python-support.
+ + Added versioning to b-d on python-all-dev.
+ + Bumped standards to 3.9.5 (no changes needed).
+ + Use canonical URIs for Vcs-* fields [Jakub Wilk].
+ + Changed XS-Python-Version to X-Python-Version, bumped to 2.5.
+ + Rearranged, wrapped and sorted.
+ * deb/copyright:
+ + Specified Upstream-Contact according to README.
+ + Added new maintainer.
+ + Improved Copyright lines.
+ * deb/rules:
+ + Added export for DH_VERBOSE.
+ + Reduced to build with dh sequencer.
+ * Removal of generated manpage(s) moved to deb/clean.
- -- Daniel Stender <debian at danielstender.com> Thu, 26 Jun 2014 16:08:12 +0200
+ -- Daniel Stender <debian at danielstender.com> Fri, 04 Jul 2014 15:16:14 +0200
ocr4gamera (1.0.6-3) unstable; urgency=low
Modified: packages/ocr4gamera/trunk/debian/clean
===================================================================
--- packages/ocr4gamera/trunk/debian/clean 2014-07-04 12:14:31 UTC (rev 29617)
+++ packages/ocr4gamera/trunk/debian/clean 2014-07-04 13:37:50 UTC (rev 29618)
@@ -1 +1,2 @@
gamera/toolkits/ocr/plugins/*.cpp
+debian/ocr4gamera.1
Modified: packages/ocr4gamera/trunk/debian/control
===================================================================
--- packages/ocr4gamera/trunk/debian/control 2014-07-04 12:14:31 UTC (rev 29617)
+++ packages/ocr4gamera/trunk/debian/control 2014-07-04 13:37:50 UTC (rev 29618)
@@ -2,21 +2,24 @@
Section: python
Priority: optional
Maintainer: Daniel Stender <debian at danielstender.com>
-Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/ocr4gamera/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/ocr4gamera/trunk/
-Build-Depends: debhelper (>= 7),
- python-support (>= 0.90), python-all-dev,
- python-gamera (>= 3.2.6), python-gamera-dev,
+Uploaders:
+ Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Build-Depends:
+ debhelper (>= 7),
+ python-all-dev (>= 2.6.6-3~),
python-docutils (>= 0.6),
+ python-gamera (>= 3.2.6),
+ python-gamera-dev,
python-pygments (>= 0.6)
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
Homepage: http://gamera.informatik.hsnr.de/addons/ocr4gamera/
-XS-Python-Version: >= 2.4
+Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/ocr4gamera/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/ocr4gamera/trunk/
+X-Python-Version: >= 2.5
Package: python-gamera.toolkits.ocr
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-gamera (>= 3.2.6)
+Depends: python-gamera (>= 3.2.6), ${misc:Depends}, ${python:Depends}
Suggests: aspell | ispell
Enhances: python-gamera
Description: toolkit for building OCR systems
Modified: packages/ocr4gamera/trunk/debian/copyright
===================================================================
--- packages/ocr4gamera/trunk/debian/copyright 2014-07-04 12:14:31 UTC (rev 29617)
+++ packages/ocr4gamera/trunk/debian/copyright 2014-07-04 13:37:50 UTC (rev 29618)
@@ -1,18 +1,17 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: ocr4gamera
-Upstream-Contact: Rene Baston, Christoph Dalitz
+Upstream-Contact: Christoph Dalitz <christoph.dalitz at hsnr.de>
Source: http://gamera.informatik.hsnr.de/addons/ocr4gamera/
Files: *
-Copyright:
- 2009-2010, Rene Baston
- 2009-2012, Christoph Dalitz
- 2010, Robert Butz
+Copyright: 2009-2010 Rene Baston
+ 2009-2012 Christoph Dalitz
+ 2010 Robert Butz
License: GPL-2+
This toolkit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, 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
@@ -22,12 +21,13 @@
version 2 can be found in the /usr/share/common-licenses/GPL-2 file.
Files: debian/*
-Copyright: 2009-2012, Jakub Wilk
+Copyright: 2014 Daniel Stender <debian at danielstender.com
+ 2009-2012 Jakub Wilk
License: GPL-2
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; version 2 dated June, 1991.
- .
+ .
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
@@ -35,4 +35,3 @@
.
On Debian systems, the complete text of the GNU General Public License
version 2 can be found in the /usr/share/common-licenses/GPL-2 file.
-
Deleted: packages/ocr4gamera/trunk/debian/patches/doc-fix-hyperlink-target.diff
===================================================================
--- packages/ocr4gamera/trunk/debian/patches/doc-fix-hyperlink-target.diff 2014-07-04 12:14:31 UTC (rev 29617)
+++ packages/ocr4gamera/trunk/debian/patches/doc-fix-hyperlink-target.diff 2014-07-04 13:37:50 UTC (rev 29618)
@@ -1,17 +0,0 @@
-Description: Fix hyperlink target in the documentation.
-Author: Jakub Wilk <jwilk at debian.org>
-Bug: http://tech.groups.yahoo.com/group/gamera-devel/message/2210
-Forwarded: yes
-Last-Update: 2012-02-13
-
---- a/gamera/toolkits/ocr/ocr_toolkit.py
-+++ b/gamera/toolkits/ocr/ocr_toolkit.py
-@@ -55,7 +55,7 @@
- to a `standard unicode character name`_,
- as in the examples of the following table:
-
--.. _`standard unicode character names`: http://www.unicode.org/charts/
-+.. _`standard unicode character name`: http://www.unicode.org/charts/
-
-
- +-----------+----------------------------+----------------------------+
Deleted: packages/ocr4gamera/trunk/debian/patches/doc-plugin-import.diff
===================================================================
--- packages/ocr4gamera/trunk/debian/patches/doc-plugin-import.diff 2014-07-04 12:14:31 UTC (rev 29617)
+++ packages/ocr4gamera/trunk/debian/patches/doc-plugin-import.diff 2014-07-04 13:37:50 UTC (rev 29618)
@@ -1,17 +0,0 @@
-Description: Import correct plugin when building documentation.
-Author: Jakub Wilk <jwilk at debian.org>
-Bug: http://tech.groups.yahoo.com/group/gamera-devel/message/2211
-Forwarded: yes
-Last-Update: 2012-02-13
-
---- a/doc/gendoc.py
-+++ b/doc/gendoc.py
-@@ -10,7 +10,7 @@
- # If the plugins are not already installed, we'll just ignore
- # them and generate the narrative documentation.
- try:
-- from gamera.toolkits.ocr.plugins import clear
-+ from gamera.toolkits.ocr.plugins import bbox_merging_mcmillan
- except ImportError:
- print "WARNING:"
- print "This `ocr` toolkit must be installed before generating"
Deleted: packages/ocr4gamera/trunk/debian/patches/no-wx-import.diff
===================================================================
--- packages/ocr4gamera/trunk/debian/patches/no-wx-import.diff 2014-07-04 12:14:31 UTC (rev 29617)
+++ packages/ocr4gamera/trunk/debian/patches/no-wx-import.diff 2014-07-04 13:37:50 UTC (rev 29618)
@@ -1,16 +0,0 @@
-Description: Don't import the wx module, it's not unused by anything.
-Author: Jakub Wilk <jwilk at debian.org>
-Bug: http://tech.groups.yahoo.com/group/gamera-devel/message/2209
-Forwarded: yes
-Last-Update: 2012-02-13
-
---- a/gamera/toolkits/ocr/__init__.py
-+++ b/gamera/toolkits/ocr/__init__.py
-@@ -9,7 +9,6 @@
-
- from gamera import toolkit
- import plugins
--import wx
-
-
- # You can inherit from toolkit.CustomMenu to create a menu
Modified: packages/ocr4gamera/trunk/debian/patches/series
===================================================================
--- packages/ocr4gamera/trunk/debian/patches/series 2014-07-04 12:14:31 UTC (rev 29617)
+++ packages/ocr4gamera/trunk/debian/patches/series 2014-07-04 13:37:50 UTC (rev 29618)
@@ -1,4 +1 @@
-no-wx-import.diff
-doc-plugin-import.diff
-doc-fix-hyperlink-target.diff
doc-build-local.diff
Modified: packages/ocr4gamera/trunk/debian/rules
===================================================================
--- packages/ocr4gamera/trunk/debian/rules 2014-07-04 12:14:31 UTC (rev 29617)
+++ packages/ocr4gamera/trunk/debian/rules 2014-07-04 13:37:50 UTC (rev 29618)
@@ -1,48 +1,23 @@
#!/usr/bin/make -f
+#export DH_VERBOSE=1
-python_all = pyversions -r | tr ' ' '\n' | xargs -t -I {} env {}
+%:
+ dh $@ --with python2
-.PHONY: clean
-clean:
- dh_testdir
- dh_clean
- rm -rf build debian/*.[1-9]
- find -name '*.py[co]' -delete
+override_dh_auto_install:
+ dh_auto_install
+ find debian/*/ -name '_bbox_*.so' -delete
+ cd debian/*/usr/bin/ && \
+ rename.ul '.py' '' ocr4gamera.py && \
+ sed -i -e '1s,^#!.*,#!/usr/bin/python,' ocr4gamera
-.PHONY: build build-arch build-indep
-build build-indep: build-stamp
-
-build-stamp:
- dh_testdir
- $(python_all) setup.py build
- rst2man debian/ocr4gamera.rst > debian/ocr4gamera.1
+override_dh_installdocs:
rm -rf doc/html/
cd doc && python gendoc.py
- touch $(@)
-
-.PHONY: binary binary-arch binary-indep
-binary binary-indep: build-stamp
- dh_testdir
- dh_testroot
- dh_prep
- $(python_all) setup.py install --prefix=/usr --root=debian/python-gamera.toolkits.ocr/
- find debian/*/ -name '_bbox_*.so' -delete
- find debian/*/ -name '*.egg-info' -delete
- cd debian/*/usr/bin/ && \
- rename.ul '.py' '' ocr4gamera.py && \
- sed -i -e '1s,^#!.*,#!/usr/bin/python,' ocr4gamera
dh_installdocs
- cd debian/*/usr/share/doc/*/html/ && \
- $(CURDIR)/debian/symlink-helper ../src/ .
- dh_installchangelogs
+
+override_dh_installman:
+ rst2man debian/ocr4gamera.rst > debian/ocr4gamera.1
dh_installman debian/*.[1-9]
- dh_pysupport
- dh_link
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
# vim:ts=4 sw=4 noet
More information about the Python-modules-commits
mailing list