[Python-modules-commits] r30362 - in packages/stdeb/trunk/debian (2 files)

[piotr at users.alioth.debian.org]

    Date: Saturday, August 30, 2014 @ 16:04:12
  Author: piotr
Revision: 30362

update use_pybuild_buildsystem patch

Modified:
  packages/stdeb/trunk/debian/changelog
  packages/stdeb/trunk/debian/patches/use_pybuild_buildsystem.patch

Modified: packages/stdeb/trunk/debian/changelog
===================================================================
--- packages/stdeb/trunk/debian/changelog	2014-08-30 02:54:07 UTC (rev 30361)
+++ packages/stdeb/trunk/debian/changelog	2014-08-30 16:04:12 UTC (rev 30362)
@@ -1,11 +1,11 @@
-stdeb (0.8.2-2) UNRELEASED; urgency=medium
+stdeb (0.8.2-2) unstable; urgency=medium
 
   * 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
+ -- Piotr Ożarowski <piotr at debian.org>  Sat, 30 Aug 2014 09:03:18 -0700
 
 stdeb (0.8.2-1) unstable; urgency=medium
 

Modified: packages/stdeb/trunk/debian/patches/use_pybuild_buildsystem.patch
===================================================================
--- packages/stdeb/trunk/debian/patches/use_pybuild_buildsystem.patch	2014-08-30 02:54:07 UTC (rev 30361)
+++ packages/stdeb/trunk/debian/patches/use_pybuild_buildsystem.patch	2014-08-30 16:04:12 UTC (rev 30362)
@@ -2,10 +2,13 @@
 ===================================================================
 --- 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 = []
+@@ -999,38 +999,12 @@ class DebianInfo:
+             workaround_virtualenv_distutils = False
+             self.install_prefix = ''
+ 
+-        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__
@@ -26,42 +29,86 @@
 -            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__
+-        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)
+-
+-        self.override_dh_auto_clean = RULES_OVERRIDE_CLEAN_TARGET%self.__dict__
+-        self.override_dh_auto_build = RULES_OVERRIDE_BUILD_TARGET%self.__dict__
+-        self.override_dh_auto_install = RULES_OVERRIDE_INSTALL_TARGET%self.__dict__
++        if self.scripts_cleanup:
++            self.override_dh_auto_install = RULES_OVERRIDE_INSTALL_TARGET%self.__dict__
++        else:
++            self.override_dh_auto_install = ''
          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 = """\
+@@ -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,
+     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
+ 
+@@ -1388,37 +1360,14 @@ RULES_MAIN = """\
+ %(percent_symbol)s:
+         dh $@ %(sequencer_options)s
+ 
+-%(override_dh_auto_clean)s
+-
+-%(override_dh_auto_build)s
+-
+ %(override_dh_auto_install)s
+ 
  %(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_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_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
+-%(rules_override_install_target_pythons)s
++	dh_auto_install
+ %(scripts_cleanup)s
+ """
+