[Python-modules-commits] r33128 - in packages/citeproc-py/trunk/debian (changelog control rules)

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

    Date: Saturday, June 27, 2015 @ 10:26:15
  Author: danstender-guest
Revision: 33128

contibute CLI tool with py3 package

Modified:
  packages/citeproc-py/trunk/debian/changelog
  packages/citeproc-py/trunk/debian/control
  packages/citeproc-py/trunk/debian/rules

Modified: packages/citeproc-py/trunk/debian/changelog
===================================================================
--- packages/citeproc-py/trunk/debian/changelog	2015-06-27 09:33:15 UTC (rev 33127)
+++ packages/citeproc-py/trunk/debian/changelog	2015-06-27 10:26:15 UTC (rev 33128)
@@ -2,4 +2,4 @@
 
   * Initial release (Closes: #769159).
 
- -- Daniel Stender <debian at danielstender.com>  Fri, 19 Jun 2015 10:12:05 +0200
+ -- Daniel Stender <debian at danielstender.com>  Sat, 27 Jun 2015 12:23:10 +0200

Modified: packages/citeproc-py/trunk/debian/control
===================================================================
--- packages/citeproc-py/trunk/debian/control	2015-06-27 09:33:15 UTC (rev 33127)
+++ packages/citeproc-py/trunk/debian/control	2015-06-27 10:26:15 UTC (rev 33128)
@@ -26,10 +26,6 @@
 Depends:
  ${misc:Depends},
  ${python:Depends}
-Conflicts:
- python3-citeproc
-Replaces:
- python3-citeproc
 Description: Citation Style Language (CSL) processor for Python
  Citeproc-py is a library that produces formatted bibliographies and
  citations from bibliographic databases following formatting instructions
@@ -45,10 +41,6 @@
 Depends:
  ${misc:Depends},
  ${python3:Depends}
-Conflicts:
- python-citeproc
-Replaces:
- python-citeproc
 Description: Citation Style Language (CSL) processor for Python3
  Citeproc-py is a library that produces formatted bibliographies and
  citations from bibliographic databases following formatting instructions

Modified: packages/citeproc-py/trunk/debian/rules
===================================================================
--- packages/citeproc-py/trunk/debian/rules	2015-06-27 09:33:15 UTC (rev 33127)
+++ packages/citeproc-py/trunk/debian/rules	2015-06-27 10:26:15 UTC (rev 33128)
@@ -8,6 +8,10 @@
 %:
 	dh $@ --with python2,python3 --buildsystem=pybuild
 
+override_dh_auto_install:
+	dh_auto_install
+	rm -rf debian/python-citeproc/usr/bin # don't contribute csl_unsorted in both packages 
+
 override_dh_installdocs:
 	dh_installdocs -A README.rst
 
@@ -16,9 +20,9 @@
 	sed -i 's/usr\/bin\/env\ python/usr\/bin\/env\ python3/' debian/python3-citeproc/usr/share/doc/python3-citeproc/examples/*py
 
 override_dh_installman:
-	txt2man -s 1 -v "citeproc-py" -t "csl_unsorted" -r "$(VERSION)" \
+	txt2man -s 1 -v "python3-citeproc" -t "csl_unsorted" -r "$(VERSION)" \
 	-d "$(DEBDATE)" debian/csl_unsorted.txt > .pybuild/csl_unsorted.1
-	dh_installman -A .pybuild/csl_unsorted.1
+	dh_installman -ppython3-citeproc .pybuild/csl_unsorted.1
 
 override_dh_compress:
 	dh_compress -X.py -X.bib # save examples