[Python-modules-commits] r30361 - in packages/stdeb/trunk/debian (5 files)

piotr at users.alioth.debian.org piotr at users.alioth.debian.org
Sat Aug 30 02:54:08 UTC 2014 

    Date: Saturday, August 30, 2014 @ 02:54:07
  Author: piotr
Revision: 30361

* Add bump_debian_compat_to_9 patch
* Add use_pybuild_buildsystem patch

Added:
  packages/stdeb/trunk/debian/patches/bump_debian_compat_to_9.patch
  packages/stdeb/trunk/debian/patches/fix_debianize_on_python3.patch
  packages/stdeb/trunk/debian/patches/use_pybuild_buildsystem.patch
Modified:
  packages/stdeb/trunk/debian/changelog
  packages/stdeb/trunk/debian/patches/series

Modified: packages/stdeb/trunk/debian/changelog
===================================================================
--- packages/stdeb/trunk/debian/changelog	2014-08-30 02:23:59 UTC (rev 30360)
+++ packages/stdeb/trunk/debian/changelog	2014-08-30 02:54:07 UTC (rev 30361)
@@ -2,6 +2,8 @@
 
   * Fix binary packages' description (python-steb ←→ python3-stdeb)
   * Add fix_debianize_on_python3 patch
+  * Add bump_debian_compat_to_9 patch
+  * Add use_pybuild_buildsystem patch
 
  -- Piotr Ożarowski <piotr at debian.org>  Thu, 28 Aug 2014 22:07:23 -0700
 

Added: packages/stdeb/trunk/debian/patches/bump_debian_compat_to_9.patch
===================================================================
--- packages/stdeb/trunk/debian/patches/bump_debian_compat_to_9.patch	                        (rev 0)
+++ packages/stdeb/trunk/debian/patches/bump_debian_compat_to_9.patch	2014-08-30 02:54:07 UTC (rev 30361)
@@ -0,0 +1,24 @@
+Index: stdeb-0.8.2/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
+            'apply_patch','repack_tarball_with_debianized_dirname',
+            'expand_sdist_file','stdeb_cfg_options']
+ 
+-DH_MIN_VERS = '7'       # Fundamental to stdeb >= 0.4
+-DH_IDEAL_VERS = '7.4.3' # fixes Debian bug 548392
++DH_MIN_VERS = '9'       # Fundamental to stdeb >= 0.4
++DH_IDEAL_VERS = '9'	    # required by debian/compat = 9
+ 
+ PYTHON_ALL_MIN_VERS = '2.6.6-3'
+ 
+@@ -1215,7 +1215,7 @@ def build_dsc(debinfo,
+ 
+     #    D. debian/compat
+     fd = open( os.path.join(debian_dir,'compat'), mode='w')
+-    fd.write('7\n')
++    fd.write('9\n')
+     fd.close()
+ 
+     #    E. debian/package.mime

Added: packages/stdeb/trunk/debian/patches/fix_debianize_on_python3.patch
===================================================================
--- packages/stdeb/trunk/debian/patches/fix_debianize_on_python3.patch	                        (rev 0)
+++ packages/stdeb/trunk/debian/patches/fix_debianize_on_python3.patch	2014-08-30 02:54:07 UTC (rev 30361)
@@ -0,0 +1,11 @@
+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

Modified: packages/stdeb/trunk/debian/patches/series
===================================================================
--- packages/stdeb/trunk/debian/patches/series	2014-08-30 02:23:59 UTC (rev 30360)
+++ packages/stdeb/trunk/debian/patches/series	2014-08-30 02:54:07 UTC (rev 30361)
@@ -1,2 +1,4 @@
 fix_pypi-download
 fix_debianize_on_python3.patch
+bump_debian_compat_to_9.patch
+use_pybuild_buildsystem.patch

Added: packages/stdeb/trunk/debian/patches/use_pybuild_buildsystem.patch
===================================================================
--- packages/stdeb/trunk/debian/patches/use_pybuild_buildsystem.patch	                        (rev 0)
+++ packages/stdeb/trunk/debian/patches/use_pybuild_buildsystem.patch	2014-08-30 02:54:07 UTC (rev 30361)
@@ -0,0 +1,67 @@
+Index: stdeb-0.8.2/stdeb/util.py
+===================================================================
+--- stdeb-0.8.2.orig/stdeb/util.py
++++ stdeb-0.8.2/stdeb/util.py
+@@ -1002,26 +1002,6 @@ class DebianInfo:
+         rules_override_clean_target_pythons = []
+         rules_override_build_target_pythons = []
+         rules_override_install_target_pythons = []
+-        if with_python2:
+-            rules_override_clean_target_pythons.append(
+-                RULES_OVERRIDE_CLEAN_TARGET_PY2%self.__dict__
+-                )
+-            rules_override_build_target_pythons.append(
+-                RULES_OVERRIDE_BUILD_TARGET_PY2%self.__dict__
+-                )
+-            rules_override_install_target_pythons.append(
+-                RULES_OVERRIDE_INSTALL_TARGET_PY2%self.__dict__
+-                )
+-        if with_python3:
+-            rules_override_clean_target_pythons.append(
+-                RULES_OVERRIDE_CLEAN_TARGET_PY3%self.__dict__
+-                )
+-            rules_override_build_target_pythons.append(
+-                RULES_OVERRIDE_BUILD_TARGET_PY3%self.__dict__
+-                )
+-            rules_override_install_target_pythons.append(
+-                RULES_OVERRIDE_INSTALL_TARGET_PY3%self.__dict__
+-                )
+         self.rules_override_clean_target_pythons = '\n'.join(rules_override_clean_target_pythons)
+         self.rules_override_build_target_pythons = '\n'.join(rules_override_build_target_pythons)
+         self.rules_override_install_target_pythons = '\n'.join(rules_override_install_target_pythons)
+@@ -1030,7 +1010,7 @@ class DebianInfo:
+         self.override_dh_auto_build = RULES_OVERRIDE_BUILD_TARGET%self.__dict__
+         self.override_dh_auto_install = RULES_OVERRIDE_INSTALL_TARGET%self.__dict__
+         sequencer_options = ['--with '+','.join(sequencer_with)]
+-        sequencer_options.append('--buildsystem=python_distutils')
++        sequencer_options.append('--buildsystem=pybuild')
+         self.sequencer_options = ' '.join(sequencer_options)
+ 
+         setup_env_vars = parse_vals(cfg,module_name,'Setup-Env-Vars')
+@@ -1397,25 +1377,18 @@ RULES_MAIN = """\
+ %(binary_target_lines)s
+ """
+ 
+-RULES_OVERRIDE_CLEAN_TARGET_PY2 = "        python setup.py clean -a"
+-RULES_OVERRIDE_CLEAN_TARGET_PY3 = "        python3 setup.py clean -a"
+ RULES_OVERRIDE_CLEAN_TARGET = """
+ override_dh_auto_clean:
+ %(rules_override_clean_target_pythons)s
+         find . -name \*.pyc -exec rm {} \;
+ """
+ 
+-RULES_OVERRIDE_BUILD_TARGET_PY2 = "        python setup.py build --force"
+-RULES_OVERRIDE_BUILD_TARGET_PY3 = "        python3 setup.py build --force"
++
+ RULES_OVERRIDE_BUILD_TARGET = """
+ override_dh_auto_build:
+ %(rules_override_build_target_pythons)s
+ """
+ 
+-RULES_OVERRIDE_INSTALL_TARGET_PY2 = "        python setup.py install --force --root=debian/%(package)s --no-compile -O0 --install-layout=deb %(install_prefix)s %(no_python2_scripts_cli_args)s"
+-
+-RULES_OVERRIDE_INSTALL_TARGET_PY3 = "        python3 setup.py install --force --root=debian/%(package3)s --no-compile -O0 --install-layout=deb %(install_prefix)s %(no_python3_scripts_cli_args)s"
+-
+ RULES_OVERRIDE_INSTALL_TARGET = """
+ override_dh_auto_install:
+ %(rules_override_install_target_pythons)s

More information about the Python-modules-commits mailing list