[Python-modules-commits] r30099 - in packages/python-djvulibre/trunk/debian (13 files)

danstender-guest at users.alioth.debian.org danstender-guest at users.alioth.debian.org
Sun Aug 10 10:32:06 UTC 2014


    Date: Sunday, August 10, 2014 @ 10:32:05
  Author: danstender-guest
Revision: 30099

* deb/control:
  + Updated maintainer email address.
  + Removed unneccesary b-ds and updated for Python3 packages.
  + Added Python3 package descriptions (Closes: #604037).
  + Use canonical URIs for Vcs-* fields [Jakub Wilk].
* deb/copyright:
  + Changed Source URI to code repo.
  + Updated Format-Specification, copyright spans and email addresses.
* deb/rules:
  + added DEB_BUILD_OPTIONS export line.
  + build with pybuild, reduced.
  + added doc/credits.txt to dh_installdocs for all packages.
  + build documentation with dh_sphinxdoc.
* Dropped .install-s (unneeded), .examples (moved to doc package),
  -doc.links, updated -doc.doc-base.
* deb/compat: bumped Debhelper level to 9.
* deb/watch: added pgpsigurlmangle (also added deb/upstream-signing-key.pgp).
* Added \.egg.info to source/options.
* Wrapped-and-sorted -a.

Added:
  packages/python-djvulibre/trunk/debian/source/options
  packages/python-djvulibre/trunk/debian/upstream-signing-key.pgp
Modified:
  packages/python-djvulibre/trunk/debian/changelog
  packages/python-djvulibre/trunk/debian/compat
  packages/python-djvulibre/trunk/debian/control
  packages/python-djvulibre/trunk/debian/copyright
  packages/python-djvulibre/trunk/debian/python-djvu-doc.doc-base
  packages/python-djvulibre/trunk/debian/rules
  packages/python-djvulibre/trunk/debian/watch
Deleted:
  packages/python-djvulibre/trunk/debian/python-djvu-dbg.install
  packages/python-djvulibre/trunk/debian/python-djvu-doc.links
  packages/python-djvulibre/trunk/debian/python-djvu.examples
  packages/python-djvulibre/trunk/debian/python-djvu.install

Modified: packages/python-djvulibre/trunk/debian/changelog
===================================================================
--- packages/python-djvulibre/trunk/debian/changelog	2014-08-09 21:55:05 UTC (rev 30098)
+++ packages/python-djvulibre/trunk/debian/changelog	2014-08-10 10:32:05 UTC (rev 30099)
@@ -1,8 +1,26 @@
 python-djvulibre (0.3.9-2) UNRELEASED; urgency=low
 
-  * Use canonical URIs for Vcs-* fields.
+  * deb/control:
+    + Updated maintainer email address.
+    + Removed unneccesary b-ds and updated for Python3 packages.
+    + Added Python3 package descriptions (Closes: #604037).
+    + Use canonical URIs for Vcs-* fields [Jakub Wilk].
+  * deb/copyright:
+    + Changed Source URI to code repo.
+    + Updated Format-Specification, copyright spans and email addresses.
+  * deb/rules:
+    + added DEB_BUILD_OPTIONS export line.
+    + build with pybuild, reduced.
+    + added doc/credits.txt to dh_installdocs for all packages.
+    + build documentation with dh_sphinxdoc.
+  * Dropped .install-s (unneeded), .examples (moved to doc package),
+    -doc.links, updated -doc.doc-base.
+  * deb/compat: bumped Debhelper level to 9.
+  * deb/watch: added pgpsigurlmangle (also added deb/upstream-signing-key.pgp).
+  * Added \.egg.info to source/options.
+  * Wrapped-and-sorted -a.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 16:02:28 +0200
+ -- Daniel Stender <debian at danielstender.com>  Sun, 10 Aug 2014 12:20:40 +0200
 
 python-djvulibre (0.3.9-1) unstable; urgency=low
 

Modified: packages/python-djvulibre/trunk/debian/compat
===================================================================
--- packages/python-djvulibre/trunk/debian/compat	2014-08-09 21:55:05 UTC (rev 30098)
+++ packages/python-djvulibre/trunk/debian/compat	2014-08-10 10:32:05 UTC (rev 30099)
@@ -1 +1 @@
-7
+9

Modified: packages/python-djvulibre/trunk/debian/control
===================================================================
--- packages/python-djvulibre/trunk/debian/control	2014-08-09 21:55:05 UTC (rev 30098)
+++ packages/python-djvulibre/trunk/debian/control	2014-08-10 10:32:05 UTC (rev 30099)
@@ -1,24 +1,28 @@
 Source: python-djvulibre
 Section: python
 Priority: optional
-Maintainer: Daniel Stender <daniel at danielstender.com>
+Maintainer: Daniel Stender <debian at danielstender.com>
 Uploaders:
  Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Build-Depends:
  cython,
- debhelper (>= 7.3.5),
+ debhelper (>= 9),
+ dh-python,
  djvulibre-bin,
- ghostscript,
  libdjvulibre-dev,
- locales,
  pkg-config,
  python-all-dbg,
  python-all-dev,
  python-nose,
  python-setuptools,
- python-support (>= 0.90)
-Build-Depends-Indep: graphviz, python-pygments, python-sphinx
-Standards-Version: 3.9.2
+ python3-all-dbg,
+ python3-all-dev,
+ python3-nose
+Build-Depends-Indep:
+ graphviz,
+ python-pygments,
+ python-sphinx
+Standards-Version: 3.9.5
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-djvulibre/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-djvulibre/trunk/
 Homepage: http://jwilk.net/software/python-djvulibre
@@ -29,7 +33,8 @@
  ${misc:Depends},
  ${python:Depends},
  ${shlibs:Depends}
-Suggests: python-djvu-doc
+Suggests:
+ python-djvu-doc
 Description: Python support for the DjVu image format
  python-djvulibre is a set of Python bindings for the DjVuLibre library,
  an open source implementation of DjVu. This image format is designed
@@ -57,11 +62,50 @@
  This package contains the detached debugging symbols and the extensions built
  for the Python debug interpreter.
 
+Package: python3-djvu
+Architecture: any
+Depends:
+ ${misc:Depends},
+ ${python3:Depends},
+ ${shlibs:Depends}
+Suggests:
+ python-djvu-doc
+Description: Python3 support for the DjVu image format
+ python-djvulibre is a set of Python bindings for the DjVuLibre library,
+ an open source implementation of DjVu. This image format is designed
+ primarily for scanned documents, it includes advanced techniques like
+ image layer separation and arithmetic coding compression.
+ .
+ This package contains the Python3 bindings, please see python-djvu-doc
+ for its documentation and python3-djvu-dbg for debugging symbols.
+
+Package: python3-djvu-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends:
+ python3-djvu (= ${binary:Version}),
+ ${misc:Depends},
+ ${python3:Depends},
+ ${shlibs:Depends}
+Description: Python3 support for the DjVu image format (debug extension)
+ python-djvulibre is a set of Python bindings for the DjVuLibre library,
+ an open source implementation of DjVu. This image format is designed
+ primarily for scanned documents, it includes advanced techniques like
+ image layer separation and arithmetic coding compression.
+ .
+ This package contains the detached debugging symbols and the extensions built
+ for the Python3 debug interpreter.
+
 Package: python-djvu-doc
 Section: doc
 Architecture: all
-Depends: libjs-jquery, ${misc:Depends}
-Recommends: python-djvu
+Depends:
+ ${misc:Depends},
+ ${sphinxdoc:Depends}
+Recommends:
+ python-djvu,
+ python3-djvu
 Description: Python support for the DjVu image format (documentation)
  python-djvulibre is a set of Python bindings for the DjVuLibre library,
  an open source implementation of DjVu. This image format is designed

Modified: packages/python-djvulibre/trunk/debian/copyright
===================================================================
--- packages/python-djvulibre/trunk/debian/copyright	2014-08-09 21:55:05 UTC (rev 30098)
+++ packages/python-djvulibre/trunk/debian/copyright	2014-08-10 10:32:05 UTC (rev 30099)
@@ -1,15 +1,15 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=174
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: python-djvulibre
 Upstream-Contact: Jakub Wilk <jwilk at jwilk.net>
-Source: http://jwilk.net/software/python-djvulibre
+Source: https://bitbucket.org/jwilk/python-djvulibre/
 
 Files: *
-Copyright: 2007-2011 Jakub Wilk <jwilk at jwilk.net>
+Copyright: 2007-2012 Jakub Wilk <jwilk at jwilk.net>
 License: GPL-2
 
 Files: debian/*
 Copyright: 2009-2010 Jakub Wilk <jwilk at debian.org>
-           2011 Daniel Stender <daniel at danielstender.com>
+           2011-2014 Daniel Stender <debian at danielstender.com>
 License: GPL-2
 
 License: GPL-2
@@ -24,4 +24,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/python-djvulibre/trunk/debian/python-djvu-dbg.install
===================================================================
--- packages/python-djvulibre/trunk/debian/python-djvu-dbg.install	2014-08-09 21:55:05 UTC (rev 30098)
+++ packages/python-djvulibre/trunk/debian/python-djvu-dbg.install	2014-08-10 10:32:05 UTC (rev 30099)
@@ -1 +0,0 @@
-usr/lib/python*/*-packages/*/*_d.so

Modified: packages/python-djvulibre/trunk/debian/python-djvu-doc.doc-base
===================================================================
--- packages/python-djvulibre/trunk/debian/python-djvu-doc.doc-base	2014-08-09 21:55:05 UTC (rev 30098)
+++ packages/python-djvulibre/trunk/debian/python-djvu-doc.doc-base	2014-08-10 10:32:05 UTC (rev 30099)
@@ -5,8 +5,4 @@
 
 Format: HTML
 Index: /usr/share/doc/python-djvu-doc/html/index.html
-Files: /usr/share/doc/python-djvu-doc/html/*.html 
-
-Format: Text
-Index: /usr/share/doc/python-djvu-doc/rst/index.txt
-Files: /usr/share/doc/python-djvu-doc/rst/*.txt 
+Files: /usr/share/doc/python-djvu-doc/html/*.html

Deleted: packages/python-djvulibre/trunk/debian/python-djvu-doc.links
===================================================================
--- packages/python-djvulibre/trunk/debian/python-djvu-doc.links	2014-08-09 21:55:05 UTC (rev 30098)
+++ packages/python-djvulibre/trunk/debian/python-djvu-doc.links	2014-08-10 10:32:05 UTC (rev 30099)
@@ -1,4 +0,0 @@
-usr/share/doc/python-djvu-doc/html usr/share/doc/python-djvu/html
-usr/share/doc/python-djvu-doc/rst usr/share/doc/python-djvu/rst
-usr/share/doc/python-djvu-doc/html/_sources usr/share/doc/python-djvu-doc/rst
-usr/share/javascript/jquery/jquery.min.js usr/share/doc/python-djvu-doc/html/_static/jquery.js

Deleted: packages/python-djvulibre/trunk/debian/python-djvu.examples
===================================================================
--- packages/python-djvulibre/trunk/debian/python-djvu.examples	2014-08-09 21:55:05 UTC (rev 30098)
+++ packages/python-djvulibre/trunk/debian/python-djvu.examples	2014-08-10 10:32:05 UTC (rev 30099)
@@ -1 +0,0 @@
-examples/*

Deleted: packages/python-djvulibre/trunk/debian/python-djvu.install
===================================================================
--- packages/python-djvulibre/trunk/debian/python-djvu.install	2014-08-09 21:55:05 UTC (rev 30098)
+++ packages/python-djvulibre/trunk/debian/python-djvu.install	2014-08-10 10:32:05 UTC (rev 30099)
@@ -1,3 +0,0 @@
-usr/lib/python*/*-packages/*/*[!_][!_].so
-usr/lib/python*/*-packages/*/*.py
-usr/lib/python*/*-packages/*.egg-info/

Modified: packages/python-djvulibre/trunk/debian/rules
===================================================================
--- packages/python-djvulibre/trunk/debian/rules	2014-08-09 21:55:05 UTC (rev 30098)
+++ packages/python-djvulibre/trunk/debian/rules	2014-08-10 10:32:05 UTC (rev 30099)
@@ -1,66 +1,22 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
-export LC_ALL=C
+#export DEB_BUILD_OPTIONS=nocheck
+export PYBUILD_NAME=djvu
 
-PYX_FILES = $(wildcard djvu/*.pyx)
-C_FILES = $(PYX_FILES:.pyx=.c)
+%:
+	dh $@ --with python2,python3 --buildsystem=pybuild
 
-nosetests = /usr/bin/nosetests --verbose --no-skip
+override_dh_auto_test:
+	PYBUILD_SYSTEM=custom \
+	PYBUILD_TEST_ARGS="cd {dir}/tests; ln -sf {build_dir}/djvu djvu; {interpreter} -m nose --verbose --no-skip; rm djvu" \
+	dh_auto_test
 
-pythonpath = $$(_py_=$(strip $(1)); _py_=$${_py_\#python}; ls -d $(CURDIR)/build/lib.*-$${_py_})
-pythonpath_dbg = $$(_py_=$(strip $(1)); _py_=$${_py_\#python}; ls -d $(CURDIR)/build/lib_d.*-$${_py_} 2>/dev/null || ls -d $(CURDIR)/build/lib.*-$${_py_}-pydebug)
-
-:PHONY: override_dh_install
 override_dh_install:
-	dh_install
-	rm -f $(CURDIR)/debian/python-djvu/usr/lib/python*/dist-packages/djvu/dllpath.py
+	rm -r debian/python*-djvu/usr/lib/python*/dist-packages/djvu/dllpath.py
 
-.PHONY: override_dh_installdocs
 override_dh_installdocs:
-ifneq ($(shell dh_listpackages | grep -x -F python-djvu-doc),)
 	python setup.py build_sphinx
-endif
-	dh_installdocs -X.buildinfo -Xobjects.inv
+	dh_installdocs -Xobjects.inv -A doc/credits.txt
+	dh_sphinxdoc
 
-.PHONY: override_dh_auto_clean
-override_dh_auto_clean: 
-	rm -Rf doc/build/ doc/stamp
-	rm -Rf build/
-	find . -type f \( -name '*.py[co]' -or -name '*.so' -or -name '*.c' \) -delete
-	rm -Rf *.egg-info/
-	rm -f djvu/config.pxi
-
-.PHONY: override_dh_strip
-override_dh_strip:
-ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	dh_strip --dbg-package=python-djvu-dbg
-	cd debian/*-dbg/usr/lib/debug/usr/lib && mv pyshared pymodules
-endif
-
-.PHONY: override_dh_auto_test
-override_dh_auto_test:
-ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
-	mkdir -p debian/tmp/locale/
-	localedef -f UTF-8 -i ja_JP ./debian/tmp/locale/ja_JP.UTF-8/
-	export LOCPATH=$(CURDIR)/debian/tmp/locale/ && \
-	cd tests && \
-	set -x -e; \
-	for python in $(shell pyversions -r); do \
-		ln -sf $(call pythonpath,$$python)/djvu djvu; $$python $(nosetests); rm djvu; \
-		ln -sf $(call pythonpath_dbg,$$python)/djvu djvu; $$python-dbg $(nosetests); rm djvu; \
-	done
-endif
-
-.PHONY: override_dh_installchangelogs
-override_dh_installchangelogs:
-	dh_installchangelogs doc/changelog
-
-.PHONY: override_dh_compress
-override_dh_compress:
-	dh_compress -X.txt
-
-.PHONY: build build-arch build-indep binary binary-arch binary-indep clean
-build build-arch build-indep binary binary-arch binary-indep clean:
-	dh $(@)
-
-# vim:ts=4 sw=4 noet
+vim:ts=4 sw=4 noet

Added: packages/python-djvulibre/trunk/debian/source/options
===================================================================
--- packages/python-djvulibre/trunk/debian/source/options	                        (rev 0)
+++ packages/python-djvulibre/trunk/debian/source/options	2014-08-10 10:32:05 UTC (rev 30099)
@@ -0,0 +1 @@
+extend-diff-ignore="\.egg.info"
\ No newline at end of file

Added: packages/python-djvulibre/trunk/debian/upstream-signing-key.pgp
===================================================================
--- packages/python-djvulibre/trunk/debian/upstream-signing-key.pgp	                        (rev 0)
+++ packages/python-djvulibre/trunk/debian/upstream-signing-key.pgp	2014-08-10 10:32:05 UTC (rev 30099)
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+iQIcBAABCAAGBQJPZ5DXAAoJEC1Os6YBVHX1hyUP/2Fthd1psd02Q7GbPjPLioHJ
++buBKkyl2PtzMN05X4yS6R3mB0EQxofH2ZE9/29oeV/YbvW0PItfUMo6E17eBbbr
+iYNyN3SqFNMIoN46ygv/NgyRVVeF85qgLM2yh1vFH9E0HQiw+RuB6WmRrHTlWb6O
+Rt/Y7pIUJbR2w0zHYoyc6ljGidpBjv+1uVQwHjhNSRiMYf3xKoV5ZZauPJDq0aRj
+vC5k4bauU43APphCwx58m0Z3+Bh2RS3can5o0+h/BEH45XFsN3PAG62Dei3p5DjL
+ULMFJ5Pei+BHQZJIgEMHzat99AU1aJb5SIU33Mp48Ct3DrppsWwxt2PTT1poOmFd
+41lsj9AU7Gen5Qw8yzkQZJ+CtQkp0At/SCFraM8UrRHMENeKohi8yM21sGW+zwKe
+j+5Ly6jhq1RpNOIXBSEswS5yBue1GSWEqb1qvVDw+DxKKKZHqVET/tsHSY3ufgAb
+klzIXGkgR7Sq22POn8uvTJ9EreEH9Jl8BwJ/ToSGK2KZCYRhgRF5Cpf0FfHgMlMd
+fh8HDZPKzcWomiR3av4ttjwFa4wK4GwULbI8cSBJMxW410fV7BcILKHE8FAD5Y1Q
+18R3KU09eSopNwEDL82MzMvIE6irdhJT0PgHRh1ofM6poglnBY8We0kulq47qeJ8
+MokS1dUq2EGPS4YrwxbH
+=SuXG
+-----END PGP SIGNATURE-----

Modified: packages/python-djvulibre/trunk/debian/watch
===================================================================
--- packages/python-djvulibre/trunk/debian/watch	2014-08-09 21:55:05 UTC (rev 30098)
+++ packages/python-djvulibre/trunk/debian/watch	2014-08-10 10:32:05 UTC (rev 30099)
@@ -1,2 +1,2 @@
 version=3
-http://pypi.python.org/packages/source/p/python-djvulibre/python-djvulibre-([0-9.]+).tar.gz
+opts=pgpsigurlmangle=s/$/.asc/ http://pypi.python.org/packages/source/p/python-djvulibre/python-djvulibre-([0-9.]+).tar.gz




More information about the Python-modules-commits mailing list