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

mitya57-guest at users.alioth.debian.org mitya57-guest at users.alioth.debian.org
Mon May 12 13:38:58 UTC 2014


    Date: Monday, May 12, 2014 @ 13:38:57
  Author: mitya57-guest
Revision: 28874

* Remove minified JS without source from the tarball.
* Get rid of debian/clean and debian/get-orig-source.sh in favor of
  Files-Excluded field in debian/copyright.
* Remove references to Crypto library from setup.py.

Added:
  packages/python-gdata/trunk/debian/patches/use_system_crypto.patch
Modified:
  packages/python-gdata/trunk/debian/changelog
  packages/python-gdata/trunk/debian/copyright
  packages/python-gdata/trunk/debian/rules
Deleted:
  packages/python-gdata/trunk/debian/clean
  packages/python-gdata/trunk/debian/get-orig-source.sh

Modified: packages/python-gdata/trunk/debian/changelog
===================================================================
--- packages/python-gdata/trunk/debian/changelog	2014-05-12 13:17:08 UTC (rev 28873)
+++ packages/python-gdata/trunk/debian/changelog	2014-05-12 13:38:57 UTC (rev 28874)
@@ -5,6 +5,10 @@
   * Add handle_redirects.patch to fix issues with Google forcing
     HTTPS URIs (closes: #747849).
   * Replace build directory with real files paths in docs.
+  * Remove minified JS without source from the tarball.
+  * Get rid of debian/clean and debian/get-orig-source.sh in favor of
+    Files-Excluded field in debian/copyright.
+  * Remove references to Crypto library from setup.py.
 
  -- Dmitry Shachnev <mitya57 at gmail.com>  Sat, 23 Nov 2013 20:12:59 +0400
 

Deleted: packages/python-gdata/trunk/debian/clean
===================================================================
--- packages/python-gdata/trunk/debian/clean	2014-05-12 13:17:08 UTC (rev 28873)
+++ packages/python-gdata/trunk/debian/clean	2014-05-12 13:38:57 UTC (rev 28874)
@@ -1 +0,0 @@
-pydocs/*.html

Modified: packages/python-gdata/trunk/debian/copyright
===================================================================
--- packages/python-gdata/trunk/debian/copyright	2014-05-12 13:17:08 UTC (rev 28873)
+++ packages/python-gdata/trunk/debian/copyright	2014-05-12 13:38:57 UTC (rev 28874)
@@ -2,6 +2,12 @@
 Upstream-Name: gdata-python-client
 Upstream-Contact: http://groups.google.com/group/gdata-python-client-library-contributors?pli=1
 Source: http://code.google.com/p/gdata-python-client/
+Files-Excluded: pydocs/*.html
+                samples/oauth/oauth_on_appengine
+                src/gdata/Crypto
+# pydocs/*.html: we rebuild docs manually
+# samples/oauth/oauth_on_appengine: uses minified js without source
+# src/gdata/Crypto: contains compiled Windows binaries; we use system Crypto library
 
 Files: *
 Copyright: 2006-2011, Google Inc.
@@ -113,6 +119,7 @@
 Files: debian/*
 Copyright: 2007-2010, Gustavo Franco <stratus at debian.org>
            2011, Andreas Noteng <andreas at noteng.no>
+           2012-2014, Dmitry Shachnev <mitya57 at gmail.com>
 License: GPL-3
 
 License: GPL-3

Deleted: packages/python-gdata/trunk/debian/get-orig-source.sh
===================================================================
--- packages/python-gdata/trunk/debian/get-orig-source.sh	2014-05-12 13:17:08 UTC (rev 28873)
+++ packages/python-gdata/trunk/debian/get-orig-source.sh	2014-05-12 13:38:57 UTC (rev 28874)
@@ -1,36 +0,0 @@
-#!/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"

Added: packages/python-gdata/trunk/debian/patches/use_system_crypto.patch
===================================================================
--- packages/python-gdata/trunk/debian/patches/use_system_crypto.patch	                        (rev 0)
+++ packages/python-gdata/trunk/debian/patches/use_system_crypto.patch	2014-05-12 13:38:57 UTC (rev 28874)
@@ -0,0 +1,20 @@
+Description: use system Crypto library
+Author: Dmitry Shachnev <mitya57 at gmail.com>
+Forwarded: no
+Last-Update: 2014-05-12
+
+--- a/setup.py
++++ b/setup.py
+@@ -65,12 +65,6 @@
+     packages=[
+       'atom', 
+       'gdata', 
+-      'gdata.Crypto', 
+-      'gdata.Crypto.Cipher', 
+-      'gdata.Crypto.Hash', 
+-      'gdata.Crypto.Protocol', 
+-      'gdata.Crypto.PublicKey', 
+-      'gdata.Crypto.Util',
+       'gdata.acl', 
+       'gdata.alt', 
+       'gdata.analytics', 

Modified: packages/python-gdata/trunk/debian/rules
===================================================================
--- packages/python-gdata/trunk/debian/rules	2014-05-12 13:17:08 UTC (rev 28873)
+++ packages/python-gdata/trunk/debian/rules	2014-05-12 13:38:57 UTC (rev 28874)
@@ -3,8 +3,7 @@
 
 DEB_DIRECTORY = $(dir $(firstword $(MAKEFILE_LIST)))
 SOURCE_DIRECTORY = $(realpath $(DEB_DIRECTORY)/..)
-DEB_VERSION = $(word 2,$(shell cd $(SOURCE_DIRECTORY) && dpkg-parsechangelog | grep ^Version:))
-UPSTREAM_DFSG_VERSION = $(firstword $(subst -, ,$(DEB_VERSION)))
+EXAMPLES_DIRECTORY = $(DEB_DIRECTORY)/python-gdata-doc/usr/share/doc/python-gdata-doc/examples
 
 %:
 	dh $@ --with python2
@@ -24,14 +23,18 @@
 override_dh_installchangelogs:
 	dh_installchangelogs RELEASE_NOTES.txt
 
-override_dh_install:
-	dh_install -X/Crypto
+override_dh_installexamples:
+	dh_installexamples
+	chmod a-x $(EXAMPLES_DIRECTORY)/blogger/oauth-appengine/*.py
+	chmod a-x $(EXAMPLES_DIRECTORY)/blogger/app/*.py
+	chmod a-x $(EXAMPLES_DIRECTORY)/apps/marketplace_sample/gdata/tlslite/*.py
+	chmod a-x $(EXAMPLES_DIRECTORY)/apps/marketplace_sample/gdata/tlslite/*/*
+	chmod a-x $(EXAMPLES_DIRECTORY)/apps/marketplace_sample/gdata/oauth/*
+	chmod a-x $(EXAMPLES_DIRECTORY)/apps/marketplace_sample/gdata/apps/client.py
+	chmod a-x $(EXAMPLES_DIRECTORY)/apps/marketplace_sample/gdata/apps/multidomain/__init__.py
 
-override_dh_installdocs:
-	dh_installdocs -X.Crypto
-
 override_dh_compress:
 	dh_compress -X.py -X.c
 
 get-orig-source:
-	sh $(DEB_DIRECTORY)/get-orig-source.sh $(UPSTREAM_DFSG_VERSION)
+	uscan --verbose --download-current-version




More information about the Python-modules-commits mailing list