[Python-modules-commits] r23080 - in packages/python-gdata/trunk/debian (4 files)

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

    Date: Monday, November 26, 2012 @ 15:52:57
  Author: mitya57-guest
Revision: 23080

Merge 2.0.17+dfsg-1 upload into trunk

Added:
  packages/python-gdata/trunk/debian/get-orig-source.sh
    (from rev 23079, packages/python-gdata/branches/wheezy/debian/get-orig-source.sh)
Modified:
  packages/python-gdata/trunk/debian/changelog
  packages/python-gdata/trunk/debian/rules
  packages/python-gdata/trunk/debian/watch

Modified: packages/python-gdata/trunk/debian/changelog
===================================================================
--- packages/python-gdata/trunk/debian/changelog	2012-11-26 14:07:36 UTC (rev 23079)
+++ packages/python-gdata/trunk/debian/changelog	2012-11-26 15:52:57 UTC (rev 23080)
@@ -1,11 +1,24 @@
-python-gdata (2.0.17-3) UNRELEASED; urgency=low
+python-gdata (2.0.17+dfsg-2) UNRELEASED; urgency=low
 
-  * Add missing Breaks/Replaces for python-gdata (<< 2.0.14-2) to
-    python-gdata-doc (closes: #694289).
+  * Merge unstable upload 2.0.17+dfsg-1 into experimental.
   * Drop DM-Upload-Allowed header, no longer useful.
 
  -- Dmitry Shachnev <mitya57 at gmail.com>  Sun, 25 Nov 2012 13:44:38 +0400
 
+python-gdata (2.0.17+dfsg-1) unstable; urgency=low
+
+  * Add missing Breaks/Replaces for python-gdata (<< 2.0.14-2) to
+    python-gdata-doc (closes: #694289, thanks to Andreas Beckmann for the
+    bug report).
+  * Remove non-free .pyd files from upstream tarball (closes: #694336,
+    thanks to Jakub Wilk for the bug report).
+    + Add debian/get-orig-source.sh script.
+    + Add get-orig-source target to debian/rules and update debian/watch.
+  * Move chmod calls to debian/get-orig-source.sh, so that file
+    permissions do not differ before and after the build.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com>  Mon, 26 Nov 2012 09:43:03 +0400
+
 python-gdata (2.0.17-2) experimental; urgency=low
 
   * Remove bundled python-crypto copy (closes: #619428).

Copied: packages/python-gdata/trunk/debian/get-orig-source.sh (from rev 23079, packages/python-gdata/branches/wheezy/debian/get-orig-source.sh)
===================================================================
--- packages/python-gdata/trunk/debian/get-orig-source.sh	                        (rev 0)
+++ packages/python-gdata/trunk/debian/get-orig-source.sh	2012-11-26 15:52:57 UTC (rev 23080)
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+set -ex
+
+export TAR_OPTIONS='--owner root --group root --mode a+rX'
+export GZIP_OPTIONS='-9n'
+pwd=$(pwd)
+dfsg_version="$1"
+if [ -z "$dfsg_version" ]
+then
+	printf 'Usage: %s <version>\n' "$0"
+	exit 1
+fi
+upstream_version="${dfsg_version%+dfsg*}"
+cd "$(dirname "$0")/../"
+tmpdir=$(mktemp -t -d get-orig-source.XXXXXX)
+uscan --noconf --force-download --rename --download-version="$upstream_version" --destdir="$tmpdir"
+cd "$tmpdir"
+tar -xzf python-gdata_*.orig.tar.gz
+rm python-gdata_*.orig.tar.gz
+
+rm -rf gdata-*/src/gdata/Crypto/*/*.pyd # http://bugs.debian.org/694336
+
+chmod a-x gdata-*/samples/oauth/oauth_on_appengine/appengine_utilities/*.py
+chmod a-x gdata-*/samples/blogger/oauth-appengine/*.py
+chmod a-x gdata-*/samples/blogger/app/*.py
+chmod a-x gdata-*/samples/apps/marketplace_sample/gdata/tlslite/*.py
+chmod a-x gdata-*/samples/apps/marketplace_sample/gdata/tlslite/*/*
+chmod a-x gdata-*/samples/apps/marketplace_sample/gdata/oauth/*
+chmod a-x gdata-*/samples/apps/marketplace_sample/gdata/apps/client.py
+chmod a-x gdata-*/samples/apps/marketplace_sample/gdata/apps/multidomain/__init__.py
+
+mv gdata-*/ "python-gdata-${dfsg_version}.orig"
+tar -czf "$pwd/python-gdata_${dfsg_version}.orig.tar.gz" python-gdata-*.orig/
+cd ..
+rm -rf "$tmpdir"

Modified: packages/python-gdata/trunk/debian/rules
===================================================================
--- packages/python-gdata/trunk/debian/rules	2012-11-26 14:07:36 UTC (rev 23079)
+++ packages/python-gdata/trunk/debian/rules	2012-11-26 15:52:57 UTC (rev 23080)
@@ -1,20 +1,13 @@
 #!/usr/bin/make -f
 # -*- mode: makefile; coding: utf-8 -*-
 
+DEB_DIRECTORY = $(dir $(firstword $(MAKEFILE_LIST)))
+DEB_VERSION = $(word 2,$(shell cd $(DEB_DIRECTORY)/.. && dpkg-parsechangelog | grep ^Version:))
+UPSTREAM_DFSG_VERSION = $(firstword $(subst -, ,$(DEB_VERSION)))
+
 %:
 	dh $@ --with python2
 
-override_dh_auto_build:
-	chmod a-x samples/oauth/oauth_on_appengine/appengine_utilities/*.py
-	chmod a-x samples/blogger/oauth-appengine/*.py
-	chmod a-x samples/blogger/app/*.py
-	chmod a-x samples/apps/marketplace_sample/gdata/tlslite/*.py
-	chmod a-x samples/apps/marketplace_sample/gdata/tlslite/*/*
-	chmod a-x samples/apps/marketplace_sample/gdata/oauth/*
-	chmod a-x samples/apps/marketplace_sample/gdata/apps/client.py
-	chmod a-x samples/apps/marketplace_sample/gdata/apps/multidomain/__init__.py
-	dh_auto_build
-
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
 	set -ex; for pyversion in $(shell pyversions -vr); do \
@@ -33,3 +26,6 @@
 
 override_dh_compress:
 	dh_compress -X.py -X.c
+
+get-orig-source:
+	sh $(DEB_DIRECTORY)/get-orig-source.sh $(UPSTREAM_DFSG_VERSION)

Modified: packages/python-gdata/trunk/debian/watch
===================================================================
--- packages/python-gdata/trunk/debian/watch	2012-11-26 14:07:36 UTC (rev 23079)
+++ packages/python-gdata/trunk/debian/watch	2012-11-26 15:52:57 UTC (rev 23080)
@@ -1,3 +1,4 @@
 # Compulsory line, this is a version 3 file
 version=3
+opts=dversionmangle=s/\+dfsg// \
 http://code.google.com/p/gdata-python-client/downloads/list .*/gdata-(\d.*)\.tar\.gz