[Python-apps-commits] r10618 - in packages/pybik/trunk/debian (9 files)

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

    Date: Thursday, February 27, 2014 @ 05:24:01
  Author: barcc-guest
Revision: 10618

* Use the new debian/upstream directory
* Use pickle protocol 3 or 4
* autopkgtest depends on xauth

Added:
  packages/pybik/trunk/debian/upstream/
  packages/pybik/trunk/debian/upstream/metadata
    (from rev 10516, packages/pybik/trunk/debian/upstream)
  packages/pybik/trunk/debian/upstream/signing-key.pgp
    (from rev 10516, packages/pybik/trunk/debian/upstream-signing-key.pgp)
Modified:
  packages/pybik/trunk/debian/changelog
  packages/pybik/trunk/debian/copyright
  packages/pybik/trunk/debian/rules
  packages/pybik/trunk/debian/tests/control
Deleted:
  packages/pybik/trunk/debian/upstream
  packages/pybik/trunk/debian/upstream-signing-key.pgp

Modified: packages/pybik/trunk/debian/changelog
===================================================================
--- packages/pybik/trunk/debian/changelog	2014-02-26 06:00:15 UTC (rev 10617)
+++ packages/pybik/trunk/debian/changelog	2014-02-27 05:24:01 UTC (rev 10618)
@@ -4,12 +4,13 @@
     + New and updated translations
     + Misc bugfixes and improvements
   * Cryptographic verification of upstream packages
-  * Added DEP12 debian/upstream file
+  * Added DEP12 upstream metadata
   * Removed patches (included upstream)
-  * Use pickle protocol 3 for compatibility with Python 3.3 and 3.4
+  * Use a pickle protocol compatible with all supported Python 3 versions
   * No need to remove __pycache__ directories in debian/rules any more
+  * autopkgtest depends on xauth
 
- -- B. Clausius <barcc at gmx.de>  Tue, 11 Feb 2014 19:28:37 +0100
+ -- B. Clausius <barcc at gmx.de>  Wed, 26 Feb 2014 21:34:56 +0100
 
 pybik (1.1-2) unstable; urgency=low
 

Modified: packages/pybik/trunk/debian/copyright
===================================================================
--- packages/pybik/trunk/debian/copyright	2014-02-26 06:00:15 UTC (rev 10617)
+++ packages/pybik/trunk/debian/copyright	2014-02-27 05:24:01 UTC (rev 10618)
@@ -2,7 +2,7 @@
 Upstream-Name: pybik
 Upstream-Contact: B. Clausius <barcc at gmx.de>
 Source: https://launchpad.net/pybik/+download
-Comment: 
+Comment:
  Originally this package was derived from GNUbik 2.3
  and ported from C to Python.
  Authors of GNUbik:

Modified: packages/pybik/trunk/debian/rules
===================================================================
--- packages/pybik/trunk/debian/rules	2014-02-26 06:00:15 UTC (rev 10617)
+++ packages/pybik/trunk/debian/rules	2014-02-27 05:24:01 UTC (rev 10618)
@@ -9,6 +9,13 @@
     NUMJOBS = auto
 endif
 
+PY3VERSIONS=$(shell py3versions -vr)
+ifneq (,$(filter 3.2 3.3,$(PY3VERSIONS)))
+    PICKLE_PROTOCOL=3
+else
+    PICKLE_PROTOCOL=4
+endif
+
 %:
 	dh $@ --with python3 --buildsystem=pybuild
 
@@ -24,7 +31,7 @@
 	dh_auto_build -- --build-args=" \
 	                        --indep-only \
 	                        --parallel=$(NUMJOBS) \
-	                        --pickle-protocol=3"
+	                        --pickle-protocol=$(PICKLE_PROTOCOL)"
 
 override_dh_auto_install-arch:
 	dh_auto_install -- --install-args=" \

Modified: packages/pybik/trunk/debian/tests/control
===================================================================
--- packages/pybik/trunk/debian/tests/control	2014-02-26 06:00:15 UTC (rev 10617)
+++ packages/pybik/trunk/debian/tests/control	2014-02-27 05:24:01 UTC (rev 10618)
@@ -1,2 +1,2 @@
 Tests: all
-Depends: @, xvfb
+Depends: @, xvfb, xauth

Deleted: packages/pybik/trunk/debian/upstream
===================================================================
--- packages/pybik/trunk/debian/upstream	2014-02-26 06:00:15 UTC (rev 10617)
+++ packages/pybik/trunk/debian/upstream	2014-02-27 05:24:01 UTC (rev 10618)
@@ -1,5 +0,0 @@
-Bug-Database: https://bugs.launchpad.net/pybik
-Bug-Submit: https://bugs.launchpad.net/pybik/+filebug
-Contact: https://answers.launchpad.net/pybik
-Repository: lp:pybik
-Repository-Browse: http://bazaar.launchpad.net/~barcc/pybik/trunk/files

Copied: packages/pybik/trunk/debian/upstream/metadata (from rev 10516, packages/pybik/trunk/debian/upstream)
===================================================================
--- packages/pybik/trunk/debian/upstream/metadata	                        (rev 0)
+++ packages/pybik/trunk/debian/upstream/metadata	2014-02-27 05:24:01 UTC (rev 10618)
@@ -0,0 +1,5 @@
+Bug-Database: https://bugs.launchpad.net/pybik
+Bug-Submit: https://bugs.launchpad.net/pybik/+filebug
+Contact: https://answers.launchpad.net/pybik
+Repository: lp:pybik
+Repository-Browse: http://bazaar.launchpad.net/~barcc/pybik/trunk/files

Copied: packages/pybik/trunk/debian/upstream/signing-key.pgp (from rev 10516, packages/pybik/trunk/debian/upstream-signing-key.pgp)
===================================================================
(Binary files differ)

Deleted: packages/pybik/trunk/debian/upstream-signing-key.pgp
===================================================================
(Binary files differ)