[Python-modules-commits] [cssutils] 03/04: Prepare 1.0.2-1.
Hugo Lefeuvre
hle at moszumanska.debian.org
Sat Sep 23 12:57:30 UTC 2017
This is an automated email from the git hooks/post-receive script.
hle pushed a commit to branch master
in repository cssutils.
commit 3b6a6851198ae5589846da9d5a7baaec7946f48f
Author: Hugo Lefeuvre <hle at debian.org>
Date: Sat Sep 23 14:26:39 2017 +0200
Prepare 1.0.2-1.
---
debian/changelog | 15 +++++++++++++++
debian/compat | 2 +-
debian/control | 7 +++----
debian/copyright | 4 ++--
debian/patches/01_setup_fix.patch | 11 +++++------
debian/patches/02_fix_octal_escape.patch | 18 ------------------
debian/patches/series | 1 -
7 files changed, 26 insertions(+), 32 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c7e7b20..ec18ec2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+cssutils (1.0.2-1) unstable; urgency=medium
+
+ * Acknowledge NMU. Thanks Christopher !
+ * New upstream release (Closes: #852994).
+ - Remove 02_fix_octal_escape.patch, applied upstream.
+ * Bump compat from 9 to 10.
+ * debian/control:
+ - Depend on debhelper >= 10 instead of >= 9.
+ - Remove Charlie Smotherman from the Uploaders list (Closes: #866910).
+ - Bump Standards-Version to 4.0.0.
+ - Update Vcs-* fields to use secured protocols.
+ * Bump copyright years.
+
+ -- Hugo Lefeuvre <hle at debian.org> Sat, 23 Sep 2017 14:16:43 +0200
+
cssutils (1.0-4.1) unstable; urgency=medium
* Non-maintainer upload.
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index a2bfd99..4f9092b 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,8 @@ Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Loïc Minier <lool at debian.org>,
Martin Pitt <mpitt at debian.org>,
- Charlie Smotherman <cjsmo at cableone.net>,
Hugo Lefeuvre <hle at debian.org>
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 10),
python-all (>= 2.6.6-3~),
python-setuptools,
python-nose (>= 1.1.2-2),
@@ -16,11 +15,11 @@ Build-Depends: debhelper (>= 9),
python3-nose (>= 1.1.2-2),
python3-mock,
dh-python
-Standards-Version: 3.9.6
+Standards-Version: 4.0.0
Homepage: http://cthedot.de/cssutils/
X-Python-Version: >= 2.5
X-Python3-Version: >= 3.0
-Vcs-Git: git://anonscm.debian.org/python-modules/packages/cssutils.git
+Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/cssutils.git
Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/cssutils.git
Package: python-cssutils
diff --git a/debian/copyright b/debian/copyright
index b8d3606..f31cf99 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,7 @@ Upstream-Contact: Christof Hoeke
Source: http://cthedot.de/cssutils/
Files: *
-Copyright: 2004-2013 Christof Hoeke
+Copyright: 2004-2017 Christof Hoeke
2004-2012 Walter Doerwald
License: LGPL-3+
encutils is free software: you can redistribute it and/or modify it under the
@@ -36,7 +36,7 @@ Copyright: 2008 Bernd Zeimetz <bzed at debian.org>
2008 Damien Churchill <damoxc at gmail.com>
2008 Loïc Minier <lool at dooz.org>
2011-2013 Charlie Smotherman <cjsmo at cableone.net>
- 2014-2015 Hugo Lefeuvre <hle at debian.org>
+ 2014-2017 Hugo Lefeuvre <hle at debian.org>
License: LGPL-2.1
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as published by the Free
diff --git a/debian/patches/01_setup_fix.patch b/debian/patches/01_setup_fix.patch
index 6f983b0..c2786a1 100644
--- a/debian/patches/01_setup_fix.patch
+++ b/debian/patches/01_setup_fix.patch
@@ -1,6 +1,7 @@
From 75cebc0e02732f109feb8ea202eb8fdebcf26512 Mon Sep 17 00:00:00 2001
From: Charlie Smotherman <cjsmo at cableone.net>
Date: Thu, 8 Oct 2015 08:46:22 -0700
+Last-Update: Sat, 23 Sep 2017 14:35:23 +0200
Subject: Create our py2 and py3 executables to use with
update-alternatives, this way we can have py2 and py3 packages installed at
@@ -11,12 +12,10 @@ Patch-Name: 01_setup_fix.patch
setup.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
-diff --git a/setup.py b/setup.py
-index 694ea62..41accd6 100644
---- a/setup.py
-+++ b/setup.py
-@@ -53,9 +53,12 @@ setup(
- tests_require='mock',
+--- a/setup.py 2017-09-23 14:33:43.343210929 +0200
++++ b/setup.py 2017-09-23 14:33:43.343210929 +0200
+@@ -65,9 +65,12 @@
+ tests_require=['mock', 'pbr < 1.7.0'],
entry_points={
'console_scripts': [
- 'csscapture = cssutils.scripts.csscapture:main',
diff --git a/debian/patches/02_fix_octal_escape.patch b/debian/patches/02_fix_octal_escape.patch
deleted file mode 100644
index a2b3ea7..0000000
--- a/debian/patches/02_fix_octal_escape.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Fix octal escape on Python 3.5
-Origin: https://bitbucket.org/cthedot/cssutils/commits/866a29f7e03447199ba22fb114d42a7aab027db9/raw/
-Author: Daniel <kingdread at gmx.de>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=798023
-Bug-Upstream: https://bugs.python.org/issue22362
-Last-Updated: 2016-01-21
-
---- a/src/cssutils/profiles.py
-+++ b/src/cssutils/profiles.py
-@@ -102,7 +102,7 @@
- 'nmstart': r'[_a-z]|{nonascii}|{escape}',
- 'nonascii': r'[^\0-\177]',
- 'unicode': r'\\[0-9a-f]{1,6}(\r\n|[ \n\r\t\f])?',
-- 'escape': r'{unicode}|\\[ -~\200-\777]',
-+ 'escape': r'{unicode}|\\[ -~\u0080-\u01ff]',
- # 'escape': r'{unicode}|\\[ -~\200-\4177777]',
- 'int': r'[-]?\d+',
- 'nmchar': r'[\w-]|{nonascii}|{escape}',
diff --git a/debian/patches/series b/debian/patches/series
index 707fbcb..648a0a5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
01_setup_fix.patch
-02_fix_octal_escape.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/cssutils.git
More information about the Python-modules-commits
mailing list