[Python-modules-commits] r26724 - in packages/stdeb/trunk/debian (4 files)

[lfaraone at users.alioth.debian.org]

    Date: Tuesday, December 10, 2013 @ 23:27:02
  Author: lfaraone
Revision: 26724

* Team upload.
* Ignore .egg-info files when building debian packages.  Thanks to Arnaud
  Fontaine and Diane Trout for the fix. (closes: #657611, LP: #1098366)
* Standards-Version bumped to 3.9.5 (no changes needed)

Added:
  packages/stdeb/trunk/debian/patches/0008-ignore-egg-info-debian-sorce-options.patch
Modified:
  packages/stdeb/trunk/debian/changelog
  packages/stdeb/trunk/debian/control
  packages/stdeb/trunk/debian/patches/series

Modified: packages/stdeb/trunk/debian/changelog
===================================================================
--- packages/stdeb/trunk/debian/changelog	2013-12-10 19:41:23 UTC (rev 26723)
+++ packages/stdeb/trunk/debian/changelog	2013-12-10 23:27:02 UTC (rev 26724)
@@ -1,9 +1,17 @@
-stdeb (0.6.0+20100620-3) UNRELEASED; urgency=low
+stdeb (0.6.0+20100620-4) UNRELEASED; urgency=low
 
+  * Team upload.
+
+  [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 16:04:03 +0200
+  [ Luke Faraone ]
+  * Ignore .egg-info files when building debian packages.  Thanks to Arnaud
+    Fontaine and Diane Trout for the fix. (closes: #657611, LP: #1098366)
+  * Standards-Version bumped to 3.9.5 (no changes needed)
 
+ -- Luke Faraone <lfaraone at debian.org>  Tue, 10 Dec 2013 18:10:17 -0500
+
 stdeb (0.6.0+20100620-2) unstable; urgency=low
 
   * Do not add "Breaks: ${python:Breaks}" to generated debian/control anymore

Modified: packages/stdeb/trunk/debian/control
===================================================================
--- packages/stdeb/trunk/debian/control	2013-12-10 19:41:23 UTC (rev 26723)
+++ packages/stdeb/trunk/debian/control	2013-12-10 23:27:02 UTC (rev 26724)
@@ -6,7 +6,7 @@
  Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.6.6-3)
 Build-Depends-Indep: python-setuptools, help2man
-Standards-Version: 3.9.1
+Standards-Version: 3.9.5
 Homepage: http://github.com/astraw/stdeb
 XS-Python-Version: all
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/stdeb/trunk/

Added: packages/stdeb/trunk/debian/patches/0008-ignore-egg-info-debian-sorce-options.patch
===================================================================
--- packages/stdeb/trunk/debian/patches/0008-ignore-egg-info-debian-sorce-options.patch	                        (rev 0)
+++ packages/stdeb/trunk/debian/patches/0008-ignore-egg-info-debian-sorce-options.patch	2013-12-10 23:27:02 UTC (rev 26724)
@@ -0,0 +1,33 @@
+Description: Ignore .egg-info files when building debian packages.
+ Previously, users reported py2dsc was dying because it was trying to generate
+ a diff that was including the .egg-info directory setup.py was creating.
+ .
+ A reasonably safe solution to this problem is to ignore the .egg-info
+ paths by adding an entry in debian/source/options.
+Author: Diane Trout <diane at ghic.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: other, http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=15;bug=657611
+Bug-Debian: http://bugs.debian.org/657611
+Bug-Ubuntu: https://launchpad.net/bugs/1098366
+Forwarded: https://github.com/astraw/stdeb/pull/57
+Reviewed-By: Luke Faraone <lfaraone at debian.org>
+Last-Update: 2013-12-10
+
+--- stdeb-0.6.0+20100620.orig/stdeb/util.py
++++ stdeb-0.6.0+20100620/stdeb/util.py
+@@ -1129,6 +1129,10 @@ def build_dsc(debinfo,
+     fd.write('3.0 (quilt)\n')
+     fd.close()
+ 
++    fd = open( os.path.join(debian_dir,'source','options'), mode='w')
++    fd.write('extend-diff-ignore="\.egg-info"')
++    fd.close()
++
+     if debian_dir_only:
+         return
+ 

Modified: packages/stdeb/trunk/debian/patches/series
===================================================================
--- packages/stdeb/trunk/debian/patches/series	2013-12-10 19:41:23 UTC (rev 26723)
+++ packages/stdeb/trunk/debian/patches/series	2013-12-10 23:27:02 UTC (rev 26724)
@@ -6,3 +6,4 @@
 0006-change-default-source-package-format-to-3.0-quilt.patch
 0007-adjust-debian-control-template-to-latest-changes-in-policy.patch
 replace_underscore_with_a_dash_in_package_names.patch
+0008-ignore-egg-info-debian-sorce-options.patch