[Python-apps-commits] r6771 - in packages/pybtex/trunk/debian (18 files)

danstender-guest at users.alioth.debian.org danstender-guest at users.alioth.debian.org
Tue Mar 15 15:02:12 UTC 2011 

    Date: Tuesday, March 15, 2011 @ 15:01:53
  Author: danstender-guest
Revision: 6771

* New upstream release
  + Changed license in debian/copyright from GPL-3 to EXPAT. 
* Changed to build with dh_python2
  + Changed debian/rules to build with dh $@ --with python 2.
  + Changed debian/control to X-Python-Version, added Breaks,
    removed python-support build-dep.
* Changed debian/copyright
  + to meet CANDIDATE DEP-5.
  + removed GPL-2+ license for database/convert/__main__.py.
* Uploaded to Unstable.

Added:
  packages/pybtex/trunk/debian/clean
  packages/pybtex/trunk/debian/doc-base
  packages/pybtex/trunk/debian/docs
  packages/pybtex/trunk/debian/examples
  packages/pybtex/trunk/debian/manpages
  packages/pybtex/trunk/debian/postinst
  packages/pybtex/trunk/debian/prerm
Modified:
  packages/pybtex/trunk/debian/changelog
  packages/pybtex/trunk/debian/control
  packages/pybtex/trunk/debian/copyright
  packages/pybtex/trunk/debian/rules
Deleted:
  packages/pybtex/trunk/debian/clean
  packages/pybtex/trunk/debian/doc-base
  packages/pybtex/trunk/debian/docs
  packages/pybtex/trunk/debian/examples
  packages/pybtex/trunk/debian/manpages
  packages/pybtex/trunk/debian/postinst
  packages/pybtex/trunk/debian/prerm

Modified: packages/pybtex/trunk/debian/changelog
===================================================================
--- packages/pybtex/trunk/debian/changelog	2011-03-15 08:55:18 UTC (rev 6770)
+++ packages/pybtex/trunk/debian/changelog	2011-03-15 15:01:53 UTC (rev 6771)
@@ -1,10 +1,18 @@
-pybtex (0.14.1-1) UNRELEASED; urgency=low
+pybtex (0.15-1) unstable; urgency=low
 
-  * New upstream release. 
   * New maintainer (closes: #587423).
-  * Updated debian/copyright to meet CANDIDATE DEP-5.
+  * New upstream release
+    + Changed license in debian/copyright from GPL-3 to EXPAT. 
+  * Changed to build with dh_python2
+    + Changed debian/rules to build with dh $@ --with python 2.
+    + Changed debian/control to X-Python-Version, added Breaks,
+      removed python-support build-dep.
+  * Changed debian/copyright
+    + to meet CANDIDATE DEP-5.
+    + removed GPL-2+ license for database/convert/__main__.py.
+  * Uploaded to Unstable.
   
- -- Daniel Stender <daniel at danielstender.com>  Thu, 13 Jan 2011 19:49:32 +0100
+ -- Daniel Stender <daniel at danielstender.com>  Tue, 15 Mar 2011 16:00:33 +0100
 
 pybtex (0.14-1) experimental; urgency=low
 

Deleted: packages/pybtex/trunk/debian/clean
===================================================================
--- packages/pybtex/trunk/debian/clean	2011-03-15 08:55:18 UTC (rev 6770)
+++ packages/pybtex/trunk/debian/clean	2011-03-15 15:01:53 UTC (rev 6771)
@@ -1,2 +0,0 @@
-*.egg-info/*
-docs/changelog

Added: packages/pybtex/trunk/debian/clean
===================================================================
--- packages/pybtex/trunk/debian/clean	                        (rev 0)
+++ packages/pybtex/trunk/debian/clean	2011-03-15 15:01:53 UTC (rev 6771)
@@ -0,0 +1,2 @@
+*.egg-info/*
+docs/changelog

Modified: packages/pybtex/trunk/debian/control
===================================================================
--- packages/pybtex/trunk/debian/control	2011-03-15 08:55:18 UTC (rev 6770)
+++ packages/pybtex/trunk/debian/control	2011-03-15 15:01:53 UTC (rev 6771)
@@ -3,12 +3,10 @@
 Priority: optional
 Maintainer: Daniel Stender <daniel at danielstender.com>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.0.50~),
-  python-all (>= 2.5), python-support (>= 0.90), python-setuptools,
-  python-nose, python-pyparsing, python-yaml,
-  python-docutils, python-jinja2, python-pygments,
-  elinks-lite | elinks
-XS-Python-Version: >= 2.6
+Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.5),
+  python-setuptools, python-nose, python-pyparsing, python-yaml,
+  python-docutils, python-jinja2, python-pygments, elinks-lite | elinks
+X-Python-Version: >= 2.6
 Standards-Version: 3.9.1
 Homepage: http://pybtex.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/pybtex/trunk/
@@ -17,8 +15,10 @@
 Package: pybtex
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}, python-pyparsing
-Conflicts: pybliographer (<< 1.2.12-3.1~), texlive-binaries (<< 2009-5~), texlive-base-bin (<< 2009-5~)
+Conflicts: pybliographer (<< 1.2.12-3.1~), texlive-binaries (<< 2009-5~),
+  texlive-base-bin (<< 2009-5~)
 Recommends: python-yaml
+Breaks: ${python:Breaks}
 Description: BibTeX-compatible bibliography processor
  Pybtex reads citation information from a file and produces a formatted
  bibliography. BibTeX style files are supported. Alternatively it is

Modified: packages/pybtex/trunk/debian/copyright
===================================================================
--- packages/pybtex/trunk/debian/copyright	2011-03-15 08:55:18 UTC (rev 6770)
+++ packages/pybtex/trunk/debian/copyright	2011-03-15 15:01:53 UTC (rev 6771)
@@ -4,46 +4,16 @@
 Source: http://pybtex.sourceforge.net/
 
 Files: *
-Copyright: 2006-2010, Andrey Golovizin
-License: GPL-3+
- 
-Files: database/convert/__main__.py
-Copyright: 2006, Andrey Golovizin
-License: GPL-2+
- 
+Copyright: 2006-2011, Andrey Golovizin
+License: Expat
+
+
 Files: debian/*
 Copyright: 2009-2010, Jakub Wilk <jwilk at debian.org>
            2010-2011, Daniel Stender <daniel at danielstender.com>
 License: Expat
 
-License: GPL-3+
- This program 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 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 complete text of the GNU General Public License
- version 3 can be found in the /usr/share/common-licenses/GPL-3 file.
 
-License: GPL-2+
- pybtex is free software; you can redistribute it and/or modify
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2 of the License, or (at your
- option) any later version.
- .
- pybtex 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
- version 2 can be found in the /usr/share/common-licenses/GPL-2 file.
-
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining
  a copy of this software and associated documentation files (the
@@ -63,3 +33,4 @@
  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

Deleted: packages/pybtex/trunk/debian/doc-base
===================================================================
--- packages/pybtex/trunk/debian/doc-base	2011-03-15 08:55:18 UTC (rev 6770)
+++ packages/pybtex/trunk/debian/doc-base	2011-03-15 15:01:53 UTC (rev 6771)
@@ -1,12 +0,0 @@
-Document: pybtex-documentation
-Title: Pybtex documentation
-Author: Andrey Golovizin
-Section: Text
-
-Format: HTML
-Index: /usr/share/doc/pybtex/html/index.html
-Files: /usr/share/doc/pybtex/html/*.html
-
-Format: Text
-Index: /usr/share/doc/pybtex/rst/index.rst
-Files: /usr/share/doc/pybtex/rst/*.rst

Added: packages/pybtex/trunk/debian/doc-base
===================================================================
--- packages/pybtex/trunk/debian/doc-base	                        (rev 0)
+++ packages/pybtex/trunk/debian/doc-base	2011-03-15 15:01:53 UTC (rev 6771)
@@ -0,0 +1,12 @@
+Document: pybtex-documentation
+Title: Pybtex documentation
+Author: Andrey Golovizin
+Section: Text
+
+Format: HTML
+Index: /usr/share/doc/pybtex/html/index.html
+Files: /usr/share/doc/pybtex/html/*.html
+
+Format: Text
+Index: /usr/share/doc/pybtex/rst/index.rst
+Files: /usr/share/doc/pybtex/rst/*.rst

Deleted: packages/pybtex/trunk/debian/docs
===================================================================
--- packages/pybtex/trunk/debian/docs	2011-03-15 08:55:18 UTC (rev 6770)
+++ packages/pybtex/trunk/debian/docs	2011-03-15 15:01:53 UTC (rev 6771)
@@ -1,3 +0,0 @@
-README
-docs/html/
-docs/rst/

Added: packages/pybtex/trunk/debian/docs
===================================================================
--- packages/pybtex/trunk/debian/docs	                        (rev 0)
+++ packages/pybtex/trunk/debian/docs	2011-03-15 15:01:53 UTC (rev 6771)
@@ -0,0 +1,3 @@
+README
+docs/html/
+docs/rst/

Deleted: packages/pybtex/trunk/debian/examples
===================================================================
--- packages/pybtex/trunk/debian/examples	2011-03-15 08:55:18 UTC (rev 6770)
+++ packages/pybtex/trunk/debian/examples	2011-03-15 15:01:53 UTC (rev 6771)
@@ -1 +0,0 @@
-examples/*

Added: packages/pybtex/trunk/debian/examples
===================================================================
--- packages/pybtex/trunk/debian/examples	                        (rev 0)
+++ packages/pybtex/trunk/debian/examples	2011-03-15 15:01:53 UTC (rev 6771)
@@ -0,0 +1 @@
+examples/*

Deleted: packages/pybtex/trunk/debian/manpages
===================================================================
--- packages/pybtex/trunk/debian/manpages	2011-03-15 08:55:18 UTC (rev 6770)
+++ packages/pybtex/trunk/debian/manpages	2011-03-15 15:01:53 UTC (rev 6771)
@@ -1 +0,0 @@
-docs/man[0-9]/*.[0-9]

Added: packages/pybtex/trunk/debian/manpages
===================================================================
--- packages/pybtex/trunk/debian/manpages	                        (rev 0)
+++ packages/pybtex/trunk/debian/manpages	2011-03-15 15:01:53 UTC (rev 6771)
@@ -0,0 +1 @@
+docs/man[0-9]/*.[0-9]

Deleted: packages/pybtex/trunk/debian/postinst
===================================================================
--- packages/pybtex/trunk/debian/postinst	2011-03-15 08:55:18 UTC (rev 6770)
+++ packages/pybtex/trunk/debian/postinst	2011-03-15 15:01:53 UTC (rev 6771)
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-    configure)
-        update-alternatives \
-            --install /usr/bin/bibtex bibtex /usr/bin/bibtex.pybtex 10 \
-	    --slave /usr/share/man/man1/bibtex.1.gz bibtex.1.gz /usr/share/man/man1/bibtex.pybtex.1.gz
-        update-alternatives \
-            --install /usr/bin/pybtex pybtex /usr/bin/bibtex.pybtex 200 \
-	    --slave /usr/share/man/man1/pybtex.1.gz pybtex.1.gz /usr/share/man/man1/bibtex.pybtex.1.gz
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0

Added: packages/pybtex/trunk/debian/postinst
===================================================================
--- packages/pybtex/trunk/debian/postinst	                        (rev 0)
+++ packages/pybtex/trunk/debian/postinst	2011-03-15 15:01:53 UTC (rev 6771)
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    configure)
+        update-alternatives \
+            --install /usr/bin/bibtex bibtex /usr/bin/bibtex.pybtex 10 \
+	    --slave /usr/share/man/man1/bibtex.1.gz bibtex.1.gz /usr/share/man/man1/bibtex.pybtex.1.gz
+        update-alternatives \
+            --install /usr/bin/pybtex pybtex /usr/bin/bibtex.pybtex 200 \
+	    --slave /usr/share/man/man1/pybtex.1.gz pybtex.1.gz /usr/share/man/man1/bibtex.pybtex.1.gz
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0

Deleted: packages/pybtex/trunk/debian/prerm
===================================================================
--- packages/pybtex/trunk/debian/prerm	2011-03-15 08:55:18 UTC (rev 6770)
+++ packages/pybtex/trunk/debian/prerm	2011-03-15 15:01:53 UTC (rev 6771)
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-    remove|deconfigure)
-        update-alternatives --remove bibtex /usr/bin/bibtex.pybtex
-        update-alternatives --remove pybtex /usr/bin/bibtex.pybtex
-    ;;
-
-    upgrade|failed-upgrade)
-    ;;
-
-    *)
-        echo "prerm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0

Added: packages/pybtex/trunk/debian/prerm
===================================================================
--- packages/pybtex/trunk/debian/prerm	                        (rev 0)
+++ packages/pybtex/trunk/debian/prerm	2011-03-15 15:01:53 UTC (rev 6771)
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    remove|deconfigure)
+        update-alternatives --remove bibtex /usr/bin/bibtex.pybtex
+        update-alternatives --remove pybtex /usr/bin/bibtex.pybtex
+    ;;
+
+    upgrade|failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0

Modified: packages/pybtex/trunk/debian/rules
===================================================================
--- packages/pybtex/trunk/debian/rules	2011-03-15 08:55:18 UTC (rev 6770)
+++ packages/pybtex/trunk/debian/rules	2011-03-15 15:01:53 UTC (rev 6771)
@@ -1,40 +1,4 @@
 #!/usr/bin/make -f
+%:
+	dh $@ --with python2
 
-.PHONY: override_dh_auto_install
-override_dh_auto_install:
-	dh_auto_install
-	cd debian/pybtex/usr/bin && mv pybtex bibtex.pybtex
-	for module in tests docgen; do \
-	rm -Rf debian/pybtex/usr/lib/python*/*-packages/pybtex/$$module/; \
-	done
-	rm -f debian/pybtex/usr/lib/python*/*-packages/*.egg-info/requires.txt
-
-.PHONY: override_dh_installman
-override_dh_installman:
-	dh_installman
-	cd debian/pybtex/ && rename.ul pybtex bibtex.pybtex usr/share/man/man*/pybtex.[0-9]
-
-.PHONY: override_dh_auto_test
-override_dh_auto_test:
-ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
-	set -e; \
-	for python in $(shell pyversions -r); do \
-		$$python setup.py nosetests; \
-	done
-endif
-
-.PHONY: override_dh_installchangelogs
-override_dh_installchangelogs:
-	elinks -config-file /dev/null -dump -no-numbering -no-references docs/html/history.html \
-	| grep -A1000 ^Version \
-	| sed -e '/ *-\{50,\}- *$$/ { s///; q }' \
-	> docs/changelog
-	dh_installchangelogs docs/changelog
-
-.PHONY: build build-arch build-indep binary binary-arch binary-indep clean
-build build-arch build-indep binary binary-indep clean:
-	dh $(@)
-# In order not to confuse lintian, binary-arch is a separate target:
-binary-arch:
-
-# vim:ts=4 sw=4 noet

More information about the Python-apps-commits mailing list