Hello community,
here is the log from the commit of package python-stdeb for openSUSE:Factory
checked in at 2020-03-26 23:35:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-stdeb (Old)
and /work/SRC/openSUSE:Factory/.python-stdeb.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-stdeb"
Thu Mar 26 23:35:09 2020 rev:5 rq:788592 version:0.9.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-stdeb/python-stdeb.changes
2019-04-22 12:25:53.124973621 +0200
+++ /work/SRC/openSUSE:Factory/.python-stdeb.new.3160/python-stdeb.changes
2020-03-26 23:35:26.538822013 +0100
@@ -1,0 +2,11 @@
+Thu Mar 26 15:08:41 UTC 2020 - Marketa Calabkova <mcalabk...@suse.com>
+
+- update to version 0.9.0
+ * fix applying patch files under Python 3
+ * add --sign-results to sdist_dsc and bdist_deb command
+ * add --debian-version to CLI program options
+ * support zip files in pypi-install
+ * remove deprecated dh_desktop call
+- Reapplied patches
+
+-------------------------------------------------------------------
Old:
----
stdeb-0.8.5.tar.gz
New:
----
stdeb-0.9.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-stdeb.spec ++++++
--- /var/tmp/diff_new_pack.mNTgqI/_old 2020-03-26 23:35:29.222822983 +0100
+++ /var/tmp/diff_new_pack.mNTgqI/_new 2020-03-26 23:35:29.222822983 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-stdeb
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-stdeb
-Version: 0.8.5
+Version: 0.9.0
Release: 0
Summary: Python to Debian source package conversion utility
License: MIT
++++++ ignore-unmet-deps.patch ++++++
--- /var/tmp/diff_new_pack.mNTgqI/_old 2020-03-26 23:35:29.242822990 +0100
+++ /var/tmp/diff_new_pack.mNTgqI/_new 2020-03-26 23:35:29.242822990 +0100
@@ -1,33 +1,34 @@
-Index: stdeb-0.8.5/stdeb/command/bdist_deb.py
+Index: stdeb-0.9.0/stdeb/command/bdist_deb.py
===================================================================
---- stdeb-0.8.5.orig/stdeb/command/bdist_deb.py
-+++ stdeb-0.8.5/stdeb/command/bdist_deb.py
-@@ -43,7 +43,7 @@ class bdist_deb(Command):
+--- stdeb-0.9.0.orig/stdeb/command/bdist_deb.py
++++ stdeb-0.9.0/stdeb/command/bdist_deb.py
+@@ -48,7 +48,7 @@ class bdist_deb(Command):
raise ValueError('could not find debian source directory')
# define system command to execute (gen .deb binary pkg)
-- syscmd = ['dpkg-buildpackage','-rfakeroot','-uc','-b']
-+ syscmd = ['dpkg-buildpackage','-d','-rfakeroot','-uc','-b']
+- syscmd = ['dpkg-buildpackage','-rfakeroot','-b']
++ syscmd = ['dpkg-buildpackage','-d','-rfakeroot','-b']
- util.process_command(syscmd,cwd=target_dirs[0])
-
-Index: stdeb-0.8.5/stdeb/util.py
+ if not self.sign_results:
+ syscmd.append('-uc')
+Index: stdeb-0.9.0/stdeb/util.py
===================================================================
---- stdeb-0.8.5.orig/stdeb/util.py
-+++ stdeb-0.8.5/stdeb/util.py
-@@ -530,6 +530,7 @@ def dpkg_source(b_or_x,arg1,cwd=None):
- def dpkg_genchanges(cwd=None):
- args = ['/usr/bin/dpkg-buildpackage',
- '-rfakeroot',
-+ '-d', # ignore unmet dependencies
- '-uc', # unsigned changes
- '-us', # unsigned source
- '-S', # source package
-Index: stdeb-0.8.5/test.sh
+--- stdeb-0.9.0.orig/stdeb/util.py
++++ stdeb-0.9.0/stdeb/util.py
+@@ -1408,7 +1408,7 @@ def build_dsc(debinfo,
+ if sign_dsc:
+ args = ()
+ else:
+- args = ('-uc','-us')
++ args = ('-d','-uc','-us')
+
+ dpkg_buildpackage('-S','-sa',*args,cwd=fullpath_repackaged_dirname)
+
+Index: stdeb-0.9.0/test.sh
===================================================================
---- stdeb-0.8.5.orig/test.sh
-+++ stdeb-0.8.5/test.sh
-@@ -72,7 +72,7 @@ fi
+--- stdeb-0.9.0.orig/test.sh
++++ stdeb-0.9.0/test.sh
+@@ -74,7 +74,7 @@ export DEB_BUILD_OPTIONS=nocheck # psyco
${PY2DSC} $SOURCE_TARBALL
cd deb_dist/$DEBSOURCE
@@ -36,7 +37,7 @@
cd ../..
for DEBFILE in deb_dist/*.deb; do
echo "contents of $DEBFILE from $SOURCE_TARBALL in case 1:"
-@@ -96,7 +96,7 @@ cd $SOURCE_TARBALL_DIR
+@@ -98,7 +98,7 @@ cd $SOURCE_TARBALL_DIR
$PYEXE -c "import sys; print('sys.version',sys.version)"
$PYEXE setup.py --command-packages=stdeb.command sdist_dsc
cd deb_dist/$DEBSOURCE
++++++ stdeb-0.8.5.tar.gz -> stdeb-0.9.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stdeb-0.8.5/.travis.yml new/stdeb-0.9.0/.travis.yml
--- old/stdeb-0.8.5/.travis.yml 2015-02-19 00:30:12.000000000 +0100
+++ new/stdeb-0.9.0/.travis.yml 2019-12-04 02:22:13.000000000 +0100
@@ -2,10 +2,10 @@
language: python
python:
- "2.7_with_system_site_packages"
- - "3.2_with_system_site_packages"
+ - "3.5_with_system_site_packages"
before_install:
- sudo apt-get update
- - sudo apt-get install python-all-dev python3-all-dev debhelper
python-setuptools python3-setuptools apt-file python-requests
+ - sudo apt-get install fakeroot python-all-dev python3-all-dev debhelper
python-setuptools python3-setuptools apt-file python-requests
- wget
http://debs.strawlab.org/precise/python3-requests_2.3.0-0ads1_all.deb -O
python3-requests_2.3.0-0ads1_all.deb
- sudo dpkg -i python3-requests_2.3.0-0ads1_all.deb
install:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stdeb-0.8.5/PKG-INFO new/stdeb-0.9.0/PKG-INFO
--- old/stdeb-0.8.5/PKG-INFO 2015-02-19 00:31:55.000000000 +0100
+++ new/stdeb-0.9.0/PKG-INFO 2019-12-09 22:35:27.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: stdeb
-Version: 0.8.5
+Version: 0.9.0
Summary: Python to Debian source package conversion utility
Home-page: http://github.com/astraw/stdeb
Author: Andrew Straw
@@ -12,6 +12,8 @@
stdeb - Python to Debian source package conversion utility
==========================================================
+ **Looking for maintainers.** See discussion `here
<https://github.com/astraw/stdeb/issues/125>`_.
+
`stdeb <http://github.com/astraw/stdeb>`_ produces Debian source
packages from Python packages via a new distutils command,
``sdist_dsc``. Automatic defaults are provided for the Debian package,
@@ -60,6 +62,25 @@
News
----
+ * 2019-12-09: **Version 0.9.0**. See the `download page
+ <https://pypi.python.org/pypi/stdeb/0.9.0>`__.
+
+ * Bugfixes:
+
+ * fix applying patch files under Python 3
+
+ * Improvements:
+
+ * add ``--sign-results`` to sdist_dsc and bdist_deb command
+ * add ``--debian-version`` to CLI program options
+ * add support for ``Breaks`` / ``Breaks3`` in debian/control
+ * add support for ``Suite3`` option
+ * support zip files in pypi-install
+
+ * Breaking changes:
+
+ * remove deprecated ``dh_desktop`` call
+
* 2015-02-18: **Version 0.8.5**. See the `download page
<https://pypi.python.org/pypi/stdeb/0.8.5>`__. Bugfixes: reverted
change that installed into virtualenv when built in
@@ -448,7 +469,7 @@
::
- STDEB_VERSION="0.8.5"
+ STDEB_VERSION="0.9.0"
# Download stdeb
wget
http://pypi.python.org/packages/source/s/stdeb/stdeb-$STDEB_VERSION.tar.gz
@@ -566,6 +587,8 @@
version
--allow-virtualenv-install-location Allow installing into
/some/random/virtualenv-path
+ --sign-results Use gpg to sign the resulting
.dsc and
+ .changes file
--dist-dir (-d) directory to put final built
distributions in
(default='deb_dist')
--patch-already-applied (-a) patch was already applied (used
when
@@ -650,7 +673,7 @@
You may write config files of the format understood by `ConfigParser
<http://docs.python.org/lib/module-ConfigParser.html>`_. When building
- each package, stdeb looks for the existance of a ``stdeb.cfg`` in the
+ each package, stdeb looks for the existence of a ``stdeb.cfg`` in the
directory with ``setup.py``. You may specify an additional config file
with the command-line option --extra-cfg-file. The section should
should either be [DEFAULT] or [package_name], which package_name is
@@ -670,8 +693,13 @@
<source-debianized-setup-name>)
Package debian/control Package:
(Default:
python-<debianized-setup-name>)
+ Package3 debian/control Package: for
python3
+ (Default:
+ python3-<debianized-setup-name>)
Suite suite (e.g. stable, lucid) in
changelog
(Default: unstable)
+ Suite3 suite (e.g. stable, lucid) for
python3
+ (Default: uses value of Suite
option)
Maintainer debian/control Maintainer:
(Default:
<setup-maintainer-or-author>)
Debian-Version debian version (Default: 1)
@@ -699,6 +727,8 @@
Dpkg-Shlibdeps-Params parameters passed to
dpkg-shlibdeps
Conflicts debian/control Conflicts:
Conflicts3 debian/control Conflicts: for
python3
+ Breaks debian/control Breaks:
+ Breaks3 debian/control Breaks: for
python3
Provides debian/control Provides:
Provides3 debian/control Provides: for
python3
Replaces debian/control Replaces:
@@ -806,6 +836,11 @@
.. _python-hosting: http://python-hosting.com/
.. _TravisCI: http://travis-ci.org/
+
+ .. image:: https://badges.gitter.im/Join%20Chat.svg
+ :alt: Join the chat at https://gitter.im/astraw/stdeb
+ :target:
https://gitter.im/astraw/stdeb?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Intended Audience :: Developers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stdeb-0.8.5/README.rst new/stdeb-0.9.0/README.rst
--- old/stdeb-0.8.5/README.rst 2015-02-19 00:30:12.000000000 +0100
+++ new/stdeb-0.9.0/README.rst 2019-12-09 22:03:47.000000000 +0100
@@ -4,6 +4,8 @@
stdeb - Python to Debian source package conversion utility
==========================================================
+**Looking for maintainers.** See discussion `here
<https://github.com/astraw/stdeb/issues/125>`_.
+
`stdeb <http://github.com/astraw/stdeb>`_ produces Debian source
packages from Python packages via a new distutils command,
``sdist_dsc``. Automatic defaults are provided for the Debian package,
@@ -52,6 +54,25 @@
News
----
+ * 2019-12-09: **Version 0.9.0**. See the `download page
+ <https://pypi.python.org/pypi/stdeb/0.9.0>`__.
+
+ * Bugfixes:
+
+ * fix applying patch files under Python 3
+
+ * Improvements:
+
+ * add ``--sign-results`` to sdist_dsc and bdist_deb command
+ * add ``--debian-version`` to CLI program options
+ * add support for ``Breaks`` / ``Breaks3`` in debian/control
+ * add support for ``Suite3`` option
+ * support zip files in pypi-install
+
+ * Breaking changes:
+
+ * remove deprecated ``dh_desktop`` call
+
* 2015-02-18: **Version 0.8.5**. See the `download page
<https://pypi.python.org/pypi/stdeb/0.8.5>`__. Bugfixes: reverted
change that installed into virtualenv when built in
@@ -440,7 +461,7 @@
::
- STDEB_VERSION="0.8.5"
+ STDEB_VERSION="0.9.0"
# Download stdeb
wget
http://pypi.python.org/packages/source/s/stdeb/stdeb-$STDEB_VERSION.tar.gz
@@ -558,6 +579,8 @@
version
--allow-virtualenv-install-location Allow installing into
/some/random/virtualenv-path
+ --sign-results Use gpg to sign the resulting .dsc and
+ .changes file
--dist-dir (-d) directory to put final built
distributions in (default='deb_dist')
--patch-already-applied (-a) patch was already applied (used when
@@ -642,7 +665,7 @@
You may write config files of the format understood by `ConfigParser
<http://docs.python.org/lib/module-ConfigParser.html>`_. When building
-each package, stdeb looks for the existance of a ``stdeb.cfg`` in the
+each package, stdeb looks for the existence of a ``stdeb.cfg`` in the
directory with ``setup.py``. You may specify an additional config file
with the command-line option --extra-cfg-file. The section should
should either be [DEFAULT] or [package_name], which package_name is
@@ -662,8 +685,13 @@
<source-debianized-setup-name>)
Package debian/control Package: (Default:
python-<debianized-setup-name>)
+ Package3 debian/control Package: for python3
+ (Default:
+ python3-<debianized-setup-name>)
Suite suite (e.g. stable, lucid) in changelog
(Default: unstable)
+ Suite3 suite (e.g. stable, lucid) for python3
+ (Default: uses value of Suite option)
Maintainer debian/control Maintainer: (Default:
<setup-maintainer-or-author>)
Debian-Version debian version (Default: 1)
@@ -691,6 +719,8 @@
Dpkg-Shlibdeps-Params parameters passed to dpkg-shlibdeps
Conflicts debian/control Conflicts:
Conflicts3 debian/control Conflicts: for python3
+ Breaks debian/control Breaks:
+ Breaks3 debian/control Breaks: for python3
Provides debian/control Provides:
Provides3 debian/control Provides: for python3
Replaces debian/control Replaces:
@@ -797,3 +827,8 @@
.. _WebFaction: http://webfaction.com/
.. _python-hosting: http://python-hosting.com/
.. _TravisCI: http://travis-ci.org/
+
+
+.. image:: https://badges.gitter.im/Join%20Chat.svg
+ :alt: Join the chat at https://gitter.im/astraw/stdeb
+ :target:
https://gitter.im/astraw/stdeb?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stdeb-0.8.5/RELEASE_NOTES.txt
new/stdeb-0.9.0/RELEASE_NOTES.txt
--- old/stdeb-0.8.5/RELEASE_NOTES.txt 2015-02-19 00:30:12.000000000 +0100
+++ new/stdeb-0.9.0/RELEASE_NOTES.txt 2019-12-09 22:03:47.000000000 +0100
@@ -1,3 +1,12 @@
+See the News section in the README for more details.
+
+Release 0.9.0
+=============
+
+The following backwards incompatible changes were made:
+
+* The deprecated call dh_desktop has been removed.
+
Release 0.8.5
=============
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stdeb-0.8.5/setup.py new/stdeb-0.9.0/setup.py
--- old/stdeb-0.8.5/setup.py 2015-02-19 00:30:12.000000000 +0100
+++ new/stdeb-0.9.0/setup.py 2019-12-09 22:03:47.000000000 +0100
@@ -7,7 +7,7 @@
setup(name='stdeb',
# Keep version in sync with stdeb/__init__.py and install section
# of README.rst.
- version='0.8.5',
+ version='0.9.0',
author='Andrew Straw',
author_email='straw...@astraw.com',
description='Python to Debian source package conversion utility',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stdeb-0.8.5/stdeb/__init__.py
new/stdeb-0.9.0/stdeb/__init__.py
--- old/stdeb-0.8.5/stdeb/__init__.py 2015-02-19 00:30:12.000000000 +0100
+++ new/stdeb-0.9.0/stdeb/__init__.py 2019-12-09 22:03:47.000000000 +0100
@@ -1,5 +1,5 @@
import logging
-__version__ = '0.8.5' # keep in sync with ../setup.py
+__version__ = '0.9.0' # keep in sync with ../setup.py
log = logging.getLogger('stdeb')
log.setLevel(logging.INFO)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stdeb-0.8.5/stdeb/command/bdist_deb.py
new/stdeb-0.9.0/stdeb/command/bdist_deb.py
--- old/stdeb-0.8.5/stdeb/command/bdist_deb.py 2015-02-19 00:30:12.000000000
+0100
+++ new/stdeb-0.9.0/stdeb/command/bdist_deb.py 2019-12-01 01:19:36.000000000
+0100
@@ -8,14 +8,19 @@
class bdist_deb(Command):
description = 'distutils command to create debian binary package'
- user_options = []
- boolean_options = []
+ user_options = [
+ ('sign-results',None,
+ 'Use gpg to sign the resulting .dsc and .changes file'),
+ ]
+ boolean_options = [
+ 'sign-results',
+ ]
def initialize_options (self):
- pass
+ self.sign_results = False
def finalize_options (self):
- pass
+ self.sign_results = bool(self.sign_results)
def run(self):
# generate .dsc source pkg
@@ -43,7 +48,10 @@
raise ValueError('could not find debian source directory')
# define system command to execute (gen .deb binary pkg)
- syscmd = ['dpkg-buildpackage','-rfakeroot','-uc','-b']
+ syscmd = ['dpkg-buildpackage','-rfakeroot','-b']
+
+ if not self.sign_results:
+ syscmd.append('-uc')
util.process_command(syscmd,cwd=target_dirs[0])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stdeb-0.8.5/stdeb/command/common.py
new/stdeb-0.9.0/stdeb/command/common.py
--- old/stdeb-0.8.5/stdeb/command/common.py 2015-02-19 00:30:12.000000000
+0100
+++ new/stdeb-0.9.0/stdeb/command/common.py 2019-12-01 01:19:36.000000000
+0100
@@ -31,6 +31,7 @@
self.no_python3_scripts = 'False'
self.force_x_python3_version = False
self.allow_virtualenv_install_location = False
+ self.sign_results = False
# deprecated options
self.default_distribution = None
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stdeb-0.8.5/stdeb/command/sdist_dsc.py
new/stdeb-0.9.0/stdeb/command/sdist_dsc.py
--- old/stdeb-0.8.5/stdeb/command/sdist_dsc.py 2015-02-19 00:30:12.000000000
+0100
+++ new/stdeb-0.9.0/stdeb/command/sdist_dsc.py 2019-12-01 01:19:36.000000000
+0100
@@ -138,6 +138,7 @@
orig_sdist=source_tarball,
patch_posix = self.patch_posix,
remove_expanded_source_dir=self.remove_expanded_source_dir,
+ sign_dsc=self.sign_results,
)
for rmdir in cleanup_dirs:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stdeb-0.8.5/stdeb/downloader.py
new/stdeb-0.9.0/stdeb/downloader.py
--- old/stdeb-0.8.5/stdeb/downloader.py 2015-02-19 00:30:12.000000000 +0100
+++ new/stdeb-0.9.0/stdeb/downloader.py 2019-12-04 02:22:13.000000000 +0100
@@ -17,7 +17,7 @@
USER_AGENT = 'pypi-install/%s ( https://github.com/astraw/stdeb
)'%stdeb.__version__
-def find_tar_gz(package_name, pypi_url = 'https://pypi.python.org/pypi',
+def find_tar_gz(package_name, pypi_url = 'https://pypi.org',
verbose=0, release=None):
transport = RequestsTransport()
transport.user_agent = USER_AGENT
@@ -59,7 +59,7 @@
for url in urls:
if url['packagetype']=='sdist':
assert url['python_version']=='source', 'how can an sdist not be a
source?'
- if url['url'].endswith('.tar.gz'):
+ if url['url'].endswith(('.tar.gz', '.zip')):
download_url = url['url']
if 'md5_digest' in url:
expected_md5_digest = url['md5_digest']
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stdeb-0.8.5/stdeb/util.py
new/stdeb-0.9.0/stdeb/util.py
--- old/stdeb-0.8.5/stdeb/util.py 2015-02-19 00:30:12.000000000 +0100
+++ new/stdeb-0.9.0/stdeb/util.py 2019-12-09 18:08:33.000000000 +0100
@@ -67,6 +67,7 @@
('maintainer=', 'm',
'maintainer name and email to use if not specified in .cfg '
'(default from setup.py)'),
+ ('debian-version=',None,'debian version (Default: 1)'),
('extra-cfg-file=','x',
'additional .cfg file (in addition to stdeb.cfg if present)'),
('patch-file=','p',
@@ -106,6 +107,8 @@
'x-python3-version'),
('allow-virtualenv-install-location',None,
'Allow installing into /some/random/virtualenv-path'),
+ ('sign-results',None,
+ 'Use gpg to sign the resulting .dsc and .changes file'),
]
# old entries from stdeb.cfg:
@@ -127,6 +130,8 @@
'debian/control Package: (Default: python3-<debianized-setup-name>)'),
('suite=',None,
'suite (e.g. stable, lucid) in changelog (Default: unstable)'),
+ ('suite3=',None,
+ 'suite3 Suites used when building with python3 only (Default:
<same-as-suite>)'),
('maintainer=',None,
'debian/control Maintainer: (Default: <setup-maintainer-or-author>)'),
('debian-version=',None,'debian version (Default: 1)'),
@@ -154,6 +159,8 @@
('dpkg-shlibdeps-params=',None,'parameters passed to dpkg-shlibdeps'),
('conflicts=',None,'debian/control Conflicts:'),
('conflicts3=',None,'debian/control Conflicts:'),
+ ('breaks=',None,'debian/control Breaks:'),
+ ('breaks3=',None,'debian/control Breaks:'),
('provides=',None,'debian/control Provides:'),
('provides3=',None,'debian/control Provides3:'),
('replaces=',None,'debian/control Replaces:'),
@@ -173,6 +180,7 @@
'no-backwards-compatibility',
'force-x-python3-version',
'allow-virtualenv-install-location',
+ 'sign-results',
]
class NotGiven: pass
@@ -521,22 +529,20 @@
make_tarball(repacked_sdist_file,debianized_dirname,cwd=working_dir)
shutil.rmtree(working_dir)
+def dpkg_buildpackage(*args,**kwargs):
+ cwd=kwargs.pop('cwd',None)
+ if len(kwargs)!=0:
+ raise ValueError('only kwarg can be "cwd"')
+ "call dpkg-buildpackage [arg1] [...] [argN]"
+ args = ['/usr/bin/dpkg-buildpackage']+list(args)
+ process_command(args, cwd=cwd)
+
def dpkg_source(b_or_x,arg1,cwd=None):
"call dpkg-source -b|x arg1 [arg2]"
assert b_or_x in ['-b','-x']
args = ['/usr/bin/dpkg-source',b_or_x,arg1]
process_command(args, cwd=cwd)
-def dpkg_genchanges(cwd=None):
- args = ['/usr/bin/dpkg-buildpackage',
- '-rfakeroot',
- '-uc', # unsigned changes
- '-us', # unsigned source
- '-S', # source package
- '-sa', # with original source archive
- ]
- process_command(args,cwd=cwd)
-
def apply_patch(patchfile,cwd=None,posix=False,level=0):
"""call 'patch -p[level] [--posix] < arg1'
@@ -562,6 +568,7 @@
stdin=fd,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
+ universal_newlines=True
)
returncode=None
while returncode is None:
@@ -786,6 +793,7 @@
self.upstream_version,
self.packaging_version)
self.distname = parse_val(cfg,module_name,'Suite')
+ self.distname3 = parse_val(cfg,module_name,'Suite3')
self.maintainer = ', '.join(parse_vals(cfg,module_name,'Maintainer'))
self.uploaders = parse_vals(cfg,module_name,'Uploaders')
self.date822 = get_date_822()
@@ -838,9 +846,6 @@
mime_desktop_files = parse_vals(cfg,module_name,'MIME-Desktop-Files')
if len(mime_desktop_files):
need_custom_binary_target = True
- self.dh_desktop_indep_line = '\tdh_desktop'
- else:
- self.dh_desktop_indep_line = ''
# E. any mime .desktop files
self.install_file_lines = []
@@ -937,6 +942,8 @@
conflicts = parse_vals(cfg,module_name,'Conflicts')
conflicts3 = parse_vals(cfg,module_name,'Conflicts3')
+ breaks = parse_vals(cfg,module_name,'Breaks')
+ breaks3 = parse_vals(cfg,module_name,'Breaks3')
provides = parse_vals(cfg,module_name,'Provides')
provides3 = parse_vals(cfg,module_name,'Provides3')
replaces = parse_vals(cfg,module_name,'Replaces')
@@ -999,6 +1006,12 @@
self.package_stanza_extras3 += ('Conflicts: '+
', '.join( conflicts3 )+'\n')
+ if len(breaks):
+ self.package_stanza_extras += ('Breaks: '+
+ ', '.join( breaks )+'\n')
+ if len(breaks3):
+ self.package_stanza_extras3 += ('Breaks: '+
+ ', '.join( breaks3 )+'\n')
if len(provides):
self.package_stanza_extras += ('Provides: '+
', '.join( provides )+'\n')
@@ -1139,6 +1152,7 @@
else:
self.binary_target_lines = ''
+ self.changelog_distname = CHANGELOG_PY2_DISTNAME%self.__dict__
if with_python2:
self.control_py2_stanza = CONTROL_PY2_STANZA%self.__dict__
else:
@@ -1146,6 +1160,10 @@
if with_python3:
self.control_py3_stanza = CONTROL_PY3_STANZA%self.__dict__
+ if self.distname3 and self.distname3 != self.distname:
+ if with_python2 :
+ raise ValueError("Suites are shared between versions. To
use a different value for Suite3 run --with-python3 true --with-python2 false
only.")
+ self.changelog_distname = CHANGELOG_PY3_DISTNAME%self.__dict__
else:
self.control_py3_stanza = ''
@@ -1184,6 +1202,10 @@
elif value == '<setup-maintainer-or-author>':
assert key=='maintainer'
value = guess_maintainer
+ elif value == '<same-as-suite>':
+ assert key=='suite3'
+ # Set to empty string so value of suite is used.
+ value = ''
if key=='suite':
if default_distribution is not None:
value = default_distribution
@@ -1203,6 +1225,7 @@
patch_posix=0,
remove_expanded_source_dir=0,
debian_dir_only=False,
+ sign_dsc=False,
):
"""make debian source package"""
# A. Find new dirname and delete any pre-existing contents
@@ -1409,16 +1432,13 @@
# Re-generate tarball using best practices see
#
http://www.debian.org/doc/developers-reference/ch-best-pkging-practices.en.html
- # call "dpkg-source -b new_dirname orig_dirname"
- log.info('CALLING dpkg-source -b %s %s (in dir %s)'%(
- repackaged_dirname,
- repackaged_orig_tarball,
- dist_dir))
- dpkg_source('-b',repackaged_dirname,
- cwd=dist_dir)
+ if sign_dsc:
+ args = ()
+ else:
+ args = ('-uc','-us')
- dpkg_genchanges(cwd=fullpath_repackaged_dirname)
+ dpkg_buildpackage('-S','-sa',*args,cwd=fullpath_repackaged_dirname)
if 1:
shutil.rmtree(fullpath_repackaged_dirname)
@@ -1429,8 +1449,10 @@
dpkg_source('-x',dsc_name,
cwd=dist_dir)
+CHANGELOG_PY2_DISTNAME = '%(distname)s'
+CHANGELOG_PY3_DISTNAME = '%(distname3)s'
CHANGELOG_FILE = """\
-%(source)s (%(full_version)s) %(distname)s; urgency=low
+%(source)s (%(full_version)s) %(changelog_distname)s; urgency=low
* source package automatically created by stdeb %(stdeb_version)s
@@ -1537,5 +1559,4 @@
binary-indep: build
%(dh_binary_indep_lines)s
%(dh_installmime_indep_line)s
-%(dh_desktop_indep_line)s
"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stdeb-0.8.5/test.sh new/stdeb-0.9.0/test.sh
--- old/stdeb-0.8.5/test.sh 2015-02-19 00:30:12.000000000 +0100
+++ new/stdeb-0.9.0/test.sh 2019-12-04 02:22:13.000000000 +0100
@@ -42,7 +42,7 @@
for i in `seq 1 3`; do
if [ $i -eq "1" ]; then
SOURCE_PACKAGE=requests
-SOURCE_RELEASE=2.2.1
+SOURCE_RELEASE=2.6.0
SOURCE_TARBALL_DIR=${SOURCE_PACKAGE}-${SOURCE_RELEASE}
SOURCE_TARBALL=${SOURCE_TARBALL_DIR}.tar.gz
DEBSOURCE=${SOURCE_TARBALL_DIR}
@@ -54,7 +54,7 @@
DEBSOURCE=reindent-${SOURCE_RELEASE}
elif [ $i -eq "3" ]; then
SOURCE_PACKAGE=psycopg2
-SOURCE_RELEASE=2.5
+SOURCE_RELEASE=2.7
SOURCE_TARBALL_DIR=${SOURCE_PACKAGE}-${SOURCE_RELEASE}
SOURCE_TARBALL=${SOURCE_TARBALL_DIR}.tar.gz
DEBSOURCE=${SOURCE_TARBALL_DIR}
@@ -63,6 +63,8 @@
exit 1
fi
+export DEB_BUILD_OPTIONS=nocheck # psycopg2 tests fail
+
# get a file to work with
# ==============================================================
${PYPI_DOWNLOAD} ${SOURCE_PACKAGE} --release ${SOURCE_RELEASE}
++++++ tests-use-tablib.patch ++++++
--- /var/tmp/diff_new_pack.mNTgqI/_old 2020-03-26 23:35:29.350823029 +0100
+++ /var/tmp/diff_new_pack.mNTgqI/_new 2020-03-26 23:35:29.350823029 +0100
@@ -1,7 +1,7 @@
-Index: stdeb-0.8.5/test.sh
+Index: stdeb-0.9.0/test.sh
===================================================================
---- stdeb-0.8.5.orig/test.sh
-+++ stdeb-0.8.5/test.sh
+--- stdeb-0.9.0.orig/test.sh
++++ stdeb-0.9.0/test.sh
@@ -9,7 +9,7 @@ rm -rf deb_dist
# setup paths
@@ -19,13 +19,13 @@
+for i in `seq 1`; do
if [ $i -eq "1" ]; then
-SOURCE_PACKAGE=requests
--SOURCE_RELEASE=2.2.1
+-SOURCE_RELEASE=2.6.0
+SOURCE_PACKAGE=tablib
+SOURCE_RELEASE=0.13.0
SOURCE_TARBALL_DIR=${SOURCE_PACKAGE}-${SOURCE_RELEASE}
SOURCE_TARBALL=${SOURCE_TARBALL_DIR}.tar.gz
DEBSOURCE=${SOURCE_TARBALL_DIR}
-@@ -65,7 +65,7 @@ fi
+@@ -67,7 +67,7 @@ export DEB_BUILD_OPTIONS=nocheck # psyco
# get a file to work with
# ==============================================================
@@ -34,7 +34,7 @@
# case 1: build from pre-existing source tarball with py2dsc
# ==============================================================
-@@ -93,9 +93,8 @@ rm -rf deb_dist
+@@ -95,9 +95,8 @@ rm -rf deb_dist
# ==============================================================
tar xzf $SOURCE_TARBALL
cd $SOURCE_TARBALL_DIR
@@ -46,7 +46,7 @@
cd deb_dist/$DEBSOURCE
dpkg-buildpackage -rfakeroot -uc -us
cd ../..
-@@ -137,8 +136,7 @@ fi
+@@ -139,8 +138,7 @@ fi
rm -rf deb_dist
