[Python-modules-commits] r33597 - in packages/stdeb/trunk/debian (13 files)

piotr at users.alioth.debian.org piotr at users.alioth.debian.org
Sun Aug 2 18:37:29 UTC 2015


    Date: Sunday, August 2, 2015 @ 18:37:28
  Author: piotr
Revision: 33597

* New upstream release
* Drop fix_debianize_on_python3 and fix_pypi-download patches (fixed
  upstream)
* Update use_pybuild_buildsystem patch (also: make sure dh-python is in
  Build-Depends)
* Add patches from pull requests:
  - add_support_for_DEBEMAIL.patch (pull request #105)
  - add_debian_watch.patch (pull request #106)
  - add_homepage_support.patch (based on pull request #103)
* debian/watch: use pypi.debian.net redirector
* Standards-Version bumped to 3.9.6 (no changes needed)

Added:
  packages/stdeb/trunk/debian/patches/add_debian_watch.patch
  packages/stdeb/trunk/debian/patches/add_homepage_support.patch
  packages/stdeb/trunk/debian/patches/add_support_for_DEBEMAIL.patch
  packages/stdeb/trunk/debian/patches/bump_standards-version.patch
  packages/stdeb/trunk/debian/patches/remove_newlines.patch
Modified:
  packages/stdeb/trunk/debian/changelog
  packages/stdeb/trunk/debian/control
  packages/stdeb/trunk/debian/patches/bump_debian_compat_to_9.patch
  packages/stdeb/trunk/debian/patches/series
  packages/stdeb/trunk/debian/patches/use_pybuild_buildsystem.patch
  packages/stdeb/trunk/debian/watch
Deleted:
  packages/stdeb/trunk/debian/patches/fix_debianize_on_python3.patch
  packages/stdeb/trunk/debian/patches/fix_pypi-download

Modified: packages/stdeb/trunk/debian/changelog
===================================================================
--- packages/stdeb/trunk/debian/changelog	2015-08-02 16:35:48 UTC (rev 33596)
+++ packages/stdeb/trunk/debian/changelog	2015-08-02 18:37:28 UTC (rev 33597)
@@ -1,3 +1,19 @@
+stdeb (0.8.5-1) unstable; urgency=medium
+
+  * New upstream release
+  * Drop fix_debianize_on_python3 and fix_pypi-download patches (fixed
+    upstream)
+  * Update use_pybuild_buildsystem patch (also: make sure dh-python is in
+    Build-Depends)
+  * Add patches from pull requests:
+    - add_support_for_DEBEMAIL.patch (pull request #105)
+    - add_debian_watch.patch (pull request #106)
+    - add_homepage_support.patch (based on pull request #103)
+  * debian/watch: use pypi.debian.net redirector
+  * Standards-Version bumped to 3.9.6 (no changes needed)
+
+ -- Piotr Ożarowski <piotr at debian.org>  Sun, 02 Aug 2015 20:35:47 +0200
+
 stdeb (0.8.2-4) unstable; urgency=medium
 
   * Team upload.

Modified: packages/stdeb/trunk/debian/control
===================================================================
--- packages/stdeb/trunk/debian/control	2015-08-02 16:35:48 UTC (rev 33596)
+++ packages/stdeb/trunk/debian/control	2015-08-02 18:37:28 UTC (rev 33597)
@@ -5,7 +5,7 @@
 Uploaders: Piotr Ożarowski <piotr at debian.org>
 Build-Depends: debhelper (>= 9), dh-python, python-all (>= 2.6.6-3), python3-all
 Build-Depends-Indep: python-setuptools, help2man, python-requests
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 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/add_debian_watch.patch
===================================================================
--- packages/stdeb/trunk/debian/patches/add_debian_watch.patch	                        (rev 0)
+++ packages/stdeb/trunk/debian/patches/add_debian_watch.patch	2015-08-02 18:37:28 UTC (rev 33597)
@@ -0,0 +1,19 @@
+Index: stdeb-0.8.5/stdeb/util.py
+===================================================================
+--- stdeb-0.8.5.orig/stdeb/util.py
++++ stdeb-0.8.5/stdeb/util.py
+@@ -1308,6 +1308,14 @@ def build_dsc(debinfo,
+     fd.write('3.0 (quilt)\n')
+     fd.close()
+ 
++    #    K. debian/watch
++    with open(os.path.join(debian_dir, 'watch'), mode='w') as fd:
++        fd.write(('# please also check http://pypi.debian.net/{name}/watch\n'
++                  'version=3\n'
++                  'opts=uversionmangle=s/(rc|a|b|c)/~$1/ \\\n'
++                  'http://pypi.debian.net/{name}/{name}-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))').\
++                 format(name=debinfo.module_name))
++
+     if debian_dir_only:
+         return
+ 

Added: packages/stdeb/trunk/debian/patches/add_homepage_support.patch
===================================================================
--- packages/stdeb/trunk/debian/patches/add_homepage_support.patch	                        (rev 0)
+++ packages/stdeb/trunk/debian/patches/add_homepage_support.patch	2015-08-02 18:37:28 UTC (rev 33597)
@@ -0,0 +1,34 @@
+Index: stdeb-0.8.5/stdeb/command/common.py
+===================================================================
+--- stdeb-0.8.5.orig/stdeb/command/common.py
++++ stdeb-0.8.5/stdeb/command/common.py
+@@ -209,6 +209,7 @@ class common_debian_package_command(Comm
+             has_ext_modules = self.distribution.has_ext_modules(),
+             description = description,
+             long_description = long_description,
++            homepage = self.distribution.get_url(),
+             patch_file = self.patch_file,
+             patch_level = self.patch_level,
+             debian_version = self.debian_version,
+Index: stdeb-0.8.5/stdeb/util.py
+===================================================================
+--- stdeb-0.8.5.orig/stdeb/util.py
++++ stdeb-0.8.5/stdeb/util.py
+@@ -691,6 +691,7 @@ class DebianInfo:
+                  has_ext_modules=NotGiven,
+                  description=NotGiven,
+                  long_description=NotGiven,
++                 homepage=NotGiven,
+                  patch_file=None,
+                  patch_level=None,
+                  setup_requires=None,
+@@ -924,6 +925,9 @@ class DebianInfo:
+             self.source_stanza_extras += ('X-Python3-Version: '+
+                                           ', '.join(x_python3_version)+'\n')
+ 
++        if homepage not in ('UNKNOWN', NotGiven):
++            self.source_stanza_extras += "Homepage: %s\n" % homepage
++
+         dpkg_shlibdeps_params = parse_val(
+             cfg,module_name,'dpkg-shlibdeps-params')
+         if dpkg_shlibdeps_params:

Added: packages/stdeb/trunk/debian/patches/add_support_for_DEBEMAIL.patch
===================================================================
--- packages/stdeb/trunk/debian/patches/add_support_for_DEBEMAIL.patch	                        (rev 0)
+++ packages/stdeb/trunk/debian/patches/add_support_for_DEBEMAIL.patch	2015-08-02 18:37:28 UTC (rev 33597)
@@ -0,0 +1,17 @@
+Index: stdeb-0.8.5/stdeb/command/common.py
+===================================================================
+--- stdeb-0.8.5.orig/stdeb/command/common.py
++++ stdeb-0.8.5/stdeb/command/common.py
+@@ -91,7 +91,11 @@ class common_debian_package_command(Comm
+ 
+         if 1:
+             # set default maintainer
+-            if (self.distribution.get_maintainer() != 'UNKNOWN' and
++            if os.environ.get('DEBEMAIL'):
++                guess_maintainer = "%s <%s>" % (os.environ.get('DEBFULLNAME',
++                                                               os.environ['DEBEMAIL']),
++                                                os.environ['DEBEMAIL'])
++            elif (self.distribution.get_maintainer() != 'UNKNOWN' and
+                 self.distribution.get_maintainer_email() != 'UNKNOWN'):
+                 guess_maintainer = "%s <%s>"%(
+                     self.distribution.get_maintainer(),

Modified: packages/stdeb/trunk/debian/patches/bump_debian_compat_to_9.patch
===================================================================
--- packages/stdeb/trunk/debian/patches/bump_debian_compat_to_9.patch	2015-08-02 16:35:48 UTC (rev 33596)
+++ packages/stdeb/trunk/debian/patches/bump_debian_compat_to_9.patch	2015-08-02 18:37:28 UTC (rev 33597)
@@ -1,8 +1,8 @@
-Index: stdeb-0.8.2/stdeb/util.py
+Index: stdeb-0.8.5/stdeb/util.py
 ===================================================================
---- stdeb-0.8.2.orig/stdeb/util.py
-+++ stdeb-0.8.2/stdeb/util.py
-@@ -24,8 +24,8 @@ __all__ = ['DebianInfo','build_dsc','exp
+--- stdeb-0.8.5.orig/stdeb/util.py
++++ stdeb-0.8.5/stdeb/util.py
+@@ -25,8 +25,8 @@ __all__ = ['DebianInfo','build_dsc','exp
             'apply_patch','repack_tarball_with_debianized_dirname',
             'expand_sdist_file','stdeb_cfg_options']
  
@@ -13,7 +13,7 @@
  
  PYTHON_ALL_MIN_VERS = '2.6.6-3'
  
-@@ -1215,7 +1215,7 @@ def build_dsc(debinfo,
+@@ -1295,7 +1295,7 @@ def build_dsc(debinfo,
  
      #    D. debian/compat
      fd = open( os.path.join(debian_dir,'compat'), mode='w')

Added: packages/stdeb/trunk/debian/patches/bump_standards-version.patch
===================================================================
--- packages/stdeb/trunk/debian/patches/bump_standards-version.patch	                        (rev 0)
+++ packages/stdeb/trunk/debian/patches/bump_standards-version.patch	2015-08-02 18:37:28 UTC (rev 33597)
@@ -0,0 +1,13 @@
+Index: stdeb-0.8.5/stdeb/util.py
+===================================================================
+--- stdeb-0.8.5.orig/stdeb/util.py
++++ stdeb-0.8.5/stdeb/util.py
+@@ -1406,7 +1406,7 @@ Maintainer: %(maintainer)s
+ %(uploaders)sSection: %(debian_section)s
+ Priority: optional
+ Build-Depends: %(build_depends)s
+-Standards-Version: 3.9.1
++Standards-Version: 3.9.6
+ %(source_stanza_extras)s
+ 
+ %(control_py2_stanza)s

Deleted: packages/stdeb/trunk/debian/patches/fix_debianize_on_python3.patch
===================================================================
--- packages/stdeb/trunk/debian/patches/fix_debianize_on_python3.patch	2015-08-02 16:35:48 UTC (rev 33596)
+++ packages/stdeb/trunk/debian/patches/fix_debianize_on_python3.patch	2015-08-02 18:37:28 UTC (rev 33597)
@@ -1,11 +0,0 @@
-Index: stdeb-0.8.2/stdeb/command/debianize.py
-===================================================================
---- stdeb-0.8.2.orig/stdeb/command/debianize.py
-+++ stdeb-0.8.2/stdeb/command/debianize.py
-@@ -1,5 +1,5 @@
- from distutils.core import Command
--from common import common_debian_package_command
-+from .common import common_debian_package_command
- 
- from stdeb.util import build_dsc, stdeb_cmdline_opts, \
-      stdeb_cmd_bool_opts, stdeb_cfg_options

Deleted: packages/stdeb/trunk/debian/patches/fix_pypi-download
===================================================================
--- packages/stdeb/trunk/debian/patches/fix_pypi-download	2015-08-02 16:35:48 UTC (rev 33596)
+++ packages/stdeb/trunk/debian/patches/fix_pypi-download	2015-08-02 18:37:28 UTC (rev 33597)
@@ -1,13 +0,0 @@
-Index: stdeb-0.8.2/scripts/pypi-download
-===================================================================
---- stdeb-0.8.2.orig/scripts/pypi-download
-+++ stdeb-0.8.2/scripts/pypi-download
-@@ -17,7 +17,7 @@ def main():
-                       help='allow unsafe downloads')
-     (options, args) = parser.parse_args()
-     if len(args) != 1:
--        myprint('need exactly one PACKAGE_NAME',fd=sys.stderr)
-+        myprint('need exactly one PACKAGE_NAME',file=sys.stderr)
-         parser.print_help()
-         sys.exit(1)
- 

Added: packages/stdeb/trunk/debian/patches/remove_newlines.patch
===================================================================
--- packages/stdeb/trunk/debian/patches/remove_newlines.patch	                        (rev 0)
+++ packages/stdeb/trunk/debian/patches/remove_newlines.patch	2015-08-02 18:37:28 UTC (rev 33597)
@@ -0,0 +1,20 @@
+Index: stdeb-0.8.5/stdeb/util.py
+===================================================================
+--- stdeb-0.8.5.orig/stdeb/util.py
++++ stdeb-0.8.5/stdeb/util.py
+@@ -1278,6 +1278,7 @@ def build_dsc(debinfo,
+     else:
+         debinfo.uploaders = ''
+     control = CONTROL_FILE%debinfo.__dict__
++    control = re.sub('\n{3,}', '\n\n', control)
+     with codecs.open( os.path.join(debian_dir,'control'),
+                       mode='w', encoding='utf-8') as fd:
+         fd.write(control)
+@@ -1287,6 +1288,7 @@ def build_dsc(debinfo,
+     rules = RULES_MAIN%debinfo.__dict__
+ 
+     rules = rules.replace('        ','\t')
++    rules = re.sub('\n{3,}', '\n\n', rules)
+     rules_fname = os.path.join(debian_dir,'rules')
+     with codecs.open( rules_fname,
+                       mode='w', encoding='utf-8') as fd:

Modified: packages/stdeb/trunk/debian/patches/series
===================================================================
--- packages/stdeb/trunk/debian/patches/series	2015-08-02 16:35:48 UTC (rev 33596)
+++ packages/stdeb/trunk/debian/patches/series	2015-08-02 18:37:28 UTC (rev 33597)
@@ -1,4 +1,7 @@
-fix_pypi-download
-fix_debianize_on_python3.patch
 bump_debian_compat_to_9.patch
+remove_newlines.patch
 use_pybuild_buildsystem.patch
+bump_standards-version.patch
+add_support_for_DEBEMAIL.patch
+add_debian_watch.patch
+add_homepage_support.patch

Modified: packages/stdeb/trunk/debian/patches/use_pybuild_buildsystem.patch
===================================================================
--- packages/stdeb/trunk/debian/patches/use_pybuild_buildsystem.patch	2015-08-02 16:35:48 UTC (rev 33596)
+++ packages/stdeb/trunk/debian/patches/use_pybuild_buildsystem.patch	2015-08-02 18:37:28 UTC (rev 33597)
@@ -1,9 +1,18 @@
-Index: stdeb-0.8.2/stdeb/util.py
+Index: stdeb-0.8.5/stdeb/util.py
 ===================================================================
---- stdeb-0.8.2.orig/stdeb/util.py
-+++ stdeb-0.8.2/stdeb/util.py
-@@ -999,42 +999,16 @@ class DebianInfo:
-             workaround_virtualenv_distutils = False
+--- stdeb-0.8.5.orig/stdeb/util.py
++++ stdeb-0.8.5/stdeb/util.py
+@@ -790,7 +790,7 @@ class DebianInfo:
+         self.uploaders = parse_vals(cfg,module_name,'Uploaders')
+         self.date822 = get_date_822()
+ 
+-        build_deps = []
++        build_deps = ['dh-python']
+         if use_setuptools:
+             if with_python2:
+                 build_deps.append('python-setuptools (>= 0.6b3)')
+@@ -1066,36 +1066,10 @@ class DebianInfo:
+         else:
              self.install_prefix = ''
  
 -        rules_override_clean_target_pythons = []
@@ -40,6 +49,22 @@
 +            self.override_dh_auto_install = RULES_OVERRIDE_INSTALL_TARGET%self.__dict__
 +        else:
 +            self.override_dh_auto_install = ''
+ 
+         if force_x_python3_version and with_python3 and x_python3_version and \
+                 x_python3_version[0]:
+@@ -1104,21 +1078,13 @@ class DebianInfo:
+             version = x_python3_version[0]
+             if not version.endswith('~'):
+                 version += '~'
+-            self.override_dh_python3 = RULES_OVERRIDE_PYTHON3%{
+-                'scripts': (
+-                    '        sed -i ' +
+-                    '"s/\([ =]python3:any (\)>= [^)]*\()\)/\\1%s\\2/g" ' +
+-                    'debian/%s.substvars') % (version, self.package3)
+-            }
+-        else:
+-            self.override_dh_python3 = ''
+ 
          sequencer_options = ['--with '+','.join(sequencer_with)]
 -        sequencer_options.append('--buildsystem=python_distutils')
 +        sequencer_options.append('--buildsystem=pybuild')
@@ -51,23 +76,7 @@
          if len(setup_env_vars):
              self.exports += '\n'
              self.exports += '#exports specified using stdeb Setup-Env-Vars:\n'
-@@ -1198,6 +1172,7 @@ def build_dsc(debinfo,
-     else:
-         debinfo.uploaders = ''
-     control = CONTROL_FILE%debinfo.__dict__
-+    control = re.sub('\n{3,}', '\n\n', control)
-     fd = open( os.path.join(debian_dir,'control'), mode='w')
-     fd.write(control)
-     fd.close()
-@@ -1205,6 +1180,7 @@ def build_dsc(debinfo,
-     #    C. debian/rules
-     debinfo.percent_symbol = '%'
-     rules = RULES_MAIN%debinfo.__dict__
-+    rules = re.sub('\n{3,}', '\n\n', rules)
- 
-     rules = rules.replace('        ','\t')
-     rules_fname = os.path.join(debian_dir,'rules')
-@@ -1260,10 +1236,6 @@ def build_dsc(debinfo,
+@@ -1342,10 +1308,6 @@ def build_dsc(debinfo,
      fd.write('3.0 (quilt)\n')
      fd.close()
  
@@ -78,7 +87,7 @@
      if debian_dir_only:
          return
  
-@@ -1388,37 +1360,14 @@ RULES_MAIN = """\
+@@ -1477,59 +1439,17 @@ RULES_MAIN = """\
  %(percent_symbol)s:
          dh $@ %(sequencer_options)s
  
@@ -88,6 +97,11 @@
 -
  %(override_dh_auto_install)s
  
+-override_dh_python2:
+-        dh_python2 --no-guessing-versions
+-
+-%(override_dh_python3)s
+-
  %(binary_target_lines)s
  """
  
@@ -113,7 +127,24 @@
  RULES_OVERRIDE_INSTALL_TARGET = """
  override_dh_auto_install:
 -%(rules_override_install_target_pythons)s
-+	dh_auto_install
++    dh_auto_install
  %(scripts_cleanup)s
  """
  
+-RULES_OVERRIDE_PYTHON3 = """
+-override_dh_python3:
+-        dh_python3
+-%(scripts)s
+-"""
+-
+-RULES_BINARY_TARGET = """
+-binary: binary-arch binary-indep
+-"""
+-
+-RULES_BINARY_ALL_TARGET = """
+-binary: binary-indep
+-"""
+-
+ RULES_BINARY_ARCH_TARGET = """
+ binary-arch: build
+ %(dh_binary_arch_lines)s

Modified: packages/stdeb/trunk/debian/watch
===================================================================
--- packages/stdeb/trunk/debian/watch	2015-08-02 16:35:48 UTC (rev 33596)
+++ packages/stdeb/trunk/debian/watch	2015-08-02 18:37:28 UTC (rev 33597)
@@ -1,2 +1,3 @@
 version=3
-http://pypi.python.org/packages/source/s/stdeb/stdeb-(.*)\.tar\.gz debian uupdate
+opts=uversionmangle=s/(rc|a|b|c)/~$1/ \
+http://pypi.debian.net/stdeb/stdeb-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
\ No newline at end of file




More information about the Python-modules-commits mailing list