[Python-modules-commits] r33350 - in packages/citeproc-py/trunk/debian (8 files)

Sun Jul 12 15:44:55 UTC 2015

Date: Sunday, July 12, 2015 @ 15:44:53
  Author: danstender-guest
Revision: 33350

dropped DFSG build; deb/copyright: added license info; added deb/source/options; finalized

Added:
  packages/citeproc-py/trunk/debian/source/options
Modified:
  packages/citeproc-py/trunk/debian/changelog
  packages/citeproc-py/trunk/debian/control
  packages/citeproc-py/trunk/debian/copyright
  packages/citeproc-py/trunk/debian/rules
  packages/citeproc-py/trunk/debian/watch
Deleted:
  packages/citeproc-py/trunk/debian/patches/
  packages/citeproc-py/trunk/debian/repack.sh

Modified: packages/citeproc-py/trunk/debian/changelog
===================================================================

--- packages/citeproc-py/trunk/debian/changelog	2015-07-12 14:57:59 UTC (rev 33349)
+++ packages/citeproc-py/trunk/debian/changelog	2015-07-12 15:44:53 UTC (rev 33350)
@@ -1,5 +1,5 @@
-citeproc-py (0.3.0+dfsg-1) UNRELEASED; urgency=medium
+citeproc-py (0.3.0-1) UNRELEASED; urgency=medium
 
   * Initial release (Closes: #769159).
 
- -- Daniel Stender <debian at danielstender.com>  Sat, 27 Jun 2015 12:23:10 +0200
+ -- Daniel Stender <debian at danielstender.com>  Sun, 12 Jul 2015 17:42:53 +0200

Modified: packages/citeproc-py/trunk/debian/control
===================================================================
--- packages/citeproc-py/trunk/debian/control	2015-07-12 14:57:59 UTC (rev 33349)
+++ packages/citeproc-py/trunk/debian/control	2015-07-12 15:44:53 UTC (rev 33350)
@@ -49,4 +49,4 @@
  Currently, BibTeX and JSON are supported as input database formats, and
  plain text, reStructuredText and HTML as output format.
  .
- This package contains the Python3 modules.
+ This package contains the Python 3 modules and the CLI tool csl_unsorted.

Modified: packages/citeproc-py/trunk/debian/copyright
===================================================================
--- packages/citeproc-py/trunk/debian/copyright	2015-07-12 14:57:59 UTC (rev 33349)
+++ packages/citeproc-py/trunk/debian/copyright	2015-07-12 15:44:53 UTC (rev 33350)
@@ -16,6 +16,11 @@
 Comment: https://github.com/citation-style-language/locales
 License: CC-BY-SA-3.0
 
+Files: citeproc/data/schema/*
+Copyright: CSL developers
+Comment: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=775532#57
+License: Expat
+
 Files: citeproc/data/styles/harvard1.csl
 Copyright: 2012 Julian Onions <julian.onions at gmail.com>
 License: CC-BY-SA-3.0
@@ -369,3 +374,23 @@
  not granted under this License, such additional rights are deemed to be
  included in the License; this License is not intended to restrict the license
  of any rights under applicable law.
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ 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/citeproc-py/trunk/debian/repack.sh
===================================================================
--- packages/citeproc-py/trunk/debian/repack.sh	2015-07-12 14:57:59 UTC (rev 33349)
+++ packages/citeproc-py/trunk/debian/repack.sh	2015-07-12 15:44:53 UTC (rev 33350)
@@ -1,21 +0,0 @@
-#!/bin/sh -e
-# Repackaging script to be called by Uscan
-
-echo "Repackaging ..."
-TARBALL="$3"
-TMP=`mktemp -d`
-PKG="`dpkg-parsechangelog|sed 's/^Source: //p;d'`_$2+dfsg.orig"
-
-echo "Extracting tarball ..."
-tar xzf "$TARBALL" -C "$TMP"
-cd "$TMP"
-
-echo "Removing unwanted stuff ..."
-rm -rf citeproc-py*/citeproc/data/schema # recent copyright doesn't comply
-
-echo "Repackaging ..."
-tar cf "$PKG.tar" citeproc-py*/
-xz -9 < "$PKG.tar" > "$PKG.tar.xz"
-rm "$PKG.tar"
-
-echo "Repackaged tarball created in $TMP."

Modified: packages/citeproc-py/trunk/debian/rules
===================================================================
--- packages/citeproc-py/trunk/debian/rules	2015-07-12 14:57:59 UTC (rev 33349)
+++ packages/citeproc-py/trunk/debian/rules	2015-07-12 15:44:53 UTC (rev 33350)
@@ -20,12 +20,8 @@
 	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 "python3-citeproc" -t "csl_unsorted" -r "$(VERSION)" \
-	-d "$(DEBDATE)" debian/csl_unsorted.txt > .pybuild/csl_unsorted.1
+	txt2man -s 1 -v "python3-citeproc" -t "csl_unsorted" -r "$(VERSION)" -d "$(DEBDATE)" debian/csl_unsorted.txt > .pybuild/csl_unsorted.1
 	dh_installman -ppython3-citeproc .pybuild/csl_unsorted.1
 
 override_dh_compress:
 	dh_compress -X.py -X.bib # save examples
-
-get-orig-source:
-	uscan --no-conf --verbose --download-current-version --destdir ../ --rename

Added: packages/citeproc-py/trunk/debian/source/options
===================================================================
--- packages/citeproc-py/trunk/debian/source/options	                        (rev 0)
+++ packages/citeproc-py/trunk/debian/source/options	2015-07-12 15:44:53 UTC (rev 33350)
@@ -0,0 +1 @@
+extend-diff-ignore="^[^/]+\.egg-info/"
\ No newline at end of file

Modified: packages/citeproc-py/trunk/debian/watch
===================================================================
--- packages/citeproc-py/trunk/debian/watch	2015-07-12 14:57:59 UTC (rev 33349)
+++ packages/citeproc-py/trunk/debian/watch	2015-07-12 15:44:53 UTC (rev 33350)
@@ -1,4 +1,3 @@
 version=3
-opts=uversionmangle=s/(rc|a|b|c)/~$1/,\
-dversionmangle=s/\+dfsg\d*$// \
-http://pypi.debian.net/citeproc-py/citeproc-py-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) debian debian/repack.sh
\ No newline at end of file
+opts=uversionmangle=s/(rc|a|b|c)/~$1/ \
+http://pypi.debian.net/citeproc-py/citeproc-py-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
\ No newline at end of file


