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

[piotr at users.alioth.debian.org]

    Date: Saturday, May 7, 2011 @ 20:11:41
  Author: piotr
Revision: 16976

* Do not add "Breaks: ${python:Breaks}" to generated debian/control anymore
* Add replace_underscore_with_a_dash_in_package_names patch
  (binary package name for vim_bridge should be python-vim-bridge, not
  python-vimbridge)

Added:
  packages/stdeb/trunk/debian/patches/replace_underscore_with_a_dash_in_package_names.patch
Modified:
  packages/stdeb/trunk/debian/changelog
  packages/stdeb/trunk/debian/patches/0007-adjust-debian-control-template-to-latest-changes-in-policy.patch
  packages/stdeb/trunk/debian/patches/series

Modified: packages/stdeb/trunk/debian/changelog
===================================================================
--- packages/stdeb/trunk/debian/changelog	2011-05-07 19:48:51 UTC (rev 16975)
+++ packages/stdeb/trunk/debian/changelog	2011-05-07 20:11:41 UTC (rev 16976)
@@ -1,3 +1,12 @@
+stdeb (0.6.0+20100620-2) unstable; urgency=low
+
+  * Do not add "Breaks: ${python:Breaks}" to generated debian/control anymore
+  * Add replace_underscore_with_a_dash_in_package_names patch
+    (binary package name for vim_bridge should be python-vim-bridge, not
+    python-vimbridge)
+
+ -- Piotr Ożarowski <piotr at debian.org>  Sat, 07 May 2011 21:56:33 +0200
+
 stdeb (0.6.0+20100620-1) unstable; urgency=low
 
   * New upstream snapshot

Modified: packages/stdeb/trunk/debian/patches/0007-adjust-debian-control-template-to-latest-changes-in-policy.patch
===================================================================
--- packages/stdeb/trunk/debian/patches/0007-adjust-debian-control-template-to-latest-changes-in-policy.patch	2011-05-07 19:48:51 UTC (rev 16975)
+++ packages/stdeb/trunk/debian/patches/0007-adjust-debian-control-template-to-latest-changes-in-policy.patch	2011-05-07 20:11:41 UTC (rev 16976)
@@ -7,10 +7,10 @@
  stdeb/util.py |   16 ++++++++--------
  1 files changed, 8 insertions(+), 8 deletions(-)
 
-diff --git a/stdeb/util.py b/stdeb/util.py
-index 8bdb7a5..b447a93 100644
---- a/stdeb/util.py
-+++ b/stdeb/util.py
+Index: stdeb-0.6.0+20100620/stdeb/util.py
+===================================================================
+--- stdeb-0.6.0+20100620.orig/stdeb/util.py
++++ stdeb-0.6.0+20100620/stdeb/util.py
 @@ -826,11 +826,8 @@ class DebianInfo:
          xs_python_version = parse_vals(cfg,module_name,'XS-Python-Version')
  
@@ -42,7 +42,7 @@
  
          if len(replaces):
              self.package_stanza_extras += ('Replaces: ' +
-@@ -1221,11 +1221,12 @@ Maintainer: %(maintainer)s
+@@ -1221,7 +1221,7 @@ Maintainer: %(maintainer)s
  %(uploaders)sSection: %(debian_section)s
  Priority: optional
  Build-Depends: %(build_depends)s
@@ -51,12 +51,7 @@
  %(source_stanza_extras)s
  Package: %(package)s
  Architecture: %(architecture)s
- Depends: %(depends)s
-+Breaks: ${python:Breaks}
- %(package_stanza_extras)sDescription: %(description)s
- %(long_description)s
- """
-@@ -1236,7 +1237,6 @@ RULES_MAIN = """\
+@@ -1236,7 +1236,6 @@ RULES_MAIN = """\
  # This file was automatically generated by stdeb %(stdeb_version)s at
  # %(date822)s
  %(exports)s
@@ -64,6 +59,3 @@
  %(percent_symbol)s:
          dh $@ %(sequencer_options)s
  
--- 
-1.7.2.3
-

Added: packages/stdeb/trunk/debian/patches/replace_underscore_with_a_dash_in_package_names.patch
===================================================================
--- packages/stdeb/trunk/debian/patches/replace_underscore_with_a_dash_in_package_names.patch	                        (rev 0)
+++ packages/stdeb/trunk/debian/patches/replace_underscore_with_a_dash_in_package_names.patch	2011-05-07 20:11:41 UTC (rev 16976)
@@ -0,0 +1,20 @@
+Index: stdeb-0.6.0+20100620/stdeb/util.py
+===================================================================
+--- stdeb-0.6.0+20100620.orig/stdeb/util.py
++++ stdeb-0.6.0+20100620/stdeb/util.py
+@@ -166,13 +166,13 @@ def recursive_hardlink(src,dst):
+ 
+ def debianize_name(name):
+     "make name acceptable as a Debian (binary) package name"
+-    name = name.replace('_','')
++    name = name.replace('_','-')
+     name = name.lower()
+     return name
+ 
+ def source_debianize_name(name):
+     "make name acceptable as a Debian source package name"
+-    name = name.replace('_','')
++    name = name.replace('_','-')
+     name = name.replace('.','-')
+     name = name.lower()
+     return name

Modified: packages/stdeb/trunk/debian/patches/series
===================================================================
--- packages/stdeb/trunk/debian/patches/series	2011-05-07 19:48:51 UTC (rev 16975)
+++ packages/stdeb/trunk/debian/patches/series	2011-05-07 20:11:41 UTC (rev 16976)
@@ -5,3 +5,4 @@
 0005-use-dh_python2-instead-of-dh_pysupport.patch
 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