diff -Nru python-gflags-1.5.1/debian/changelog python-gflags-1.5.1/debian/changelog --- python-gflags-1.5.1/debian/changelog 2014-08-28 22:13:42.000000000 +0000 +++ python-gflags-1.5.1/debian/changelog 2017-08-02 12:55:13.000000000 +0000 @@ -1,3 +1,20 @@ +python-gflags (1.5.1-3) unstable; urgency=medium + + [ Chris Lamb ] + * If SOURCE_DATE_EPOCH is set, either use that as a source of current dates + or the UTC-version of the file's modification time. (Closes: #836004) + * Don't call update-alternatives --remove in postrm scripts. + * Update debian/watch to point to GitHub. + * Update Homepage and upstream URI in debian/copyright. + * Move to debhelper compatibility level 10. + * Bump Standards-Version to 4.0.0. + * wrap-and-sort -sa. + + [ Ondřej Nový ] + * Fixed VCS URL (https) + + -- Chris Lamb Wed, 02 Aug 2017 08:55:13 -0400 + python-gflags (1.5.1-2) unstable; urgency=medium * Added Python 3 support. diff -Nru python-gflags-1.5.1/debian/compat python-gflags-1.5.1/debian/compat --- python-gflags-1.5.1/debian/compat 2014-08-28 22:04:17.000000000 +0000 +++ python-gflags-1.5.1/debian/compat 2017-08-02 12:55:13.000000000 +0000 @@ -1 +1 @@ -7 +10 diff -Nru python-gflags-1.5.1/debian/control python-gflags-1.5.1/debian/control --- python-gflags-1.5.1/debian/control 2014-08-28 22:13:42.000000000 +0000 +++ python-gflags-1.5.1/debian/control 2017-08-02 12:55:13.000000000 +0000 @@ -2,19 +2,26 @@ Section: python Priority: optional Maintainer: Debian Python Modules Team -Uploaders: Soren Hansen , Thomas Goirand -Build-Depends: debhelper (>= 7.0.50~), - python-all (>= 2.6.6-3~), - python-setuptools (>= 0.6b3), - python3-all, - python3-setuptools -Standards-Version: 3.9.5 -Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-gflags/trunk/ -Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-gflags/trunk/ +Uploaders: + Soren Hansen , + Thomas Goirand , + Chris Lamb , +Build-Depends: + debhelper (>= 10), + python-all (>= 2.6.6-3~), + python-setuptools (>= 0.6b3), + python3-all, + python3-setuptools, +Standards-Version: 4.0.0 +Homepage: https://github.com/google/python-gflags +Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/python-gflags.git +Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/python-gflags.git Package: python-gflags Architecture: all -Depends: ${misc:Depends}, ${python:Depends} +Depends: + ${misc:Depends}, + ${python:Depends}, Description: implementation of the Google command line flags module - Python 2.x GFlags defines a distributed command line system, replacing systems like getopt(), optparse and manual argument processing. Rather than an application @@ -31,7 +38,9 @@ Package: python3-gflags Architecture: all -Depends: ${misc:Depends}, ${python3:Depends} +Depends: + ${misc:Depends}, + ${python3:Depends}, Description: implementation of the Google command line flags module - Python 3.x GFlags defines a distributed command line system, replacing systems like getopt(), optparse and manual argument processing. Rather than an application diff -Nru python-gflags-1.5.1/debian/copyright python-gflags-1.5.1/debian/copyright --- python-gflags-1.5.1/debian/copyright 2014-08-28 22:04:17.000000000 +0000 +++ python-gflags-1.5.1/debian/copyright 2017-08-02 12:55:13.000000000 +0000 @@ -1,7 +1,7 @@ This package was debianized by Soren Hansen on Tue, 06 Jul 2010 22:50:29 +0200 -It was downloaded from http://code.google.com/p/google-gflags/downloads/list +It was downloaded from https://github.com/google/python-gflags Copyright: Copyright © 2006-2010, Google Inc. diff -Nru python-gflags-1.5.1/debian/patches/python2.7-testsuite.patch python-gflags-1.5.1/debian/patches/python2.7-testsuite.patch --- python-gflags-1.5.1/debian/patches/python2.7-testsuite.patch 2014-08-28 22:04:39.000000000 +0000 +++ python-gflags-1.5.1/debian/patches/python2.7-testsuite.patch 2017-08-02 12:55:13.000000000 +0000 @@ -1,16 +1,26 @@ -Description: Make test suite pass with Python2.7 +From 10ea9a8a55dc55df0afe3ba80ad1e740103bb697 Mon Sep 17 00:00:00 2001 +From: Soren Hansen +Date: Thu, 8 Oct 2015 12:09:58 -0700 +Subject: Make test suite pass with Python2.7 + Python 2.7's unittest module introduced some new methods that gflags_unittest already had defined. This calls for some special handling to avoid having them step on each other's toes. Forwarded: http://code.google.com/p/python-gflags/issues/detail?id=7 -Author: Soren Hansen Last-Update: 2011-06-14 -Index: python-gflags-1.5.1/gflags_unittest.py -=================================================================== ---- python-gflags-1.5.1.orig/gflags_unittest.py -+++ python-gflags-1.5.1/gflags_unittest.py -@@ -102,22 +102,34 @@ +Patch-Name: python2.7-testsuite.patch +--- + gflags_unittest.py | 40 ++++++++++++++++++++++------------------ + test_module_baz.py | 18 ++++++++++++++++++ + 2 files changed, 40 insertions(+), 18 deletions(-) + create mode 100644 test_module_baz.py + +diff --git a/gflags_unittest.py b/gflags_unittest.py +index 250958f..1ec27f0 100755 +--- a/gflags_unittest.py ++++ b/gflags_unittest.py +@@ -102,22 +102,34 @@ def MultiLineEqual(expected_help, help): return False @@ -21,12 +31,12 @@ + super(_UnitTestClass, self).assertListEqual(Sorted(list1), Sorted(list2)) + else: + self.assertEqual(Sorted(list1), Sorted(list2)) -+ + +-class FlagsUnitTest(unittest.TestCase): + def assertMultiLineEqual(self, expected, actual): + """Could do fancy diffing, but for now, just do a normal compare.""" + self.assert_(MultiLineEqual(expected, actual)) - --class FlagsUnitTest(unittest.TestCase): ++ + def assertRaisesWithRegexpMatch(self, exception, regexp, fn, *args, **kwargs): + try: + fn(*args, **kwargs) @@ -54,7 +64,7 @@ def test_flags(self): ############################################## -@@ -1411,19 +1423,11 @@ +@@ -1411,19 +1423,11 @@ class NonGlobalFlagsTest(unittest.TestCase): self.assertFalse('x5' in flag_values.RegisteredFlags()) @@ -75,10 +85,11 @@ def _GetNamesOfDefinedFlags(self, module, flag_values): """Returns the list of names of flags defined by a module. -Index: python-gflags-1.5.1/test_module_baz.py -=================================================================== +diff --git a/test_module_baz.py b/test_module_baz.py +new file mode 100644 +index 0000000..7abd416 --- /dev/null -+++ python-gflags-1.5.1/test_module_baz.py ++++ b/test_module_baz.py @@ -0,0 +1,18 @@ +#!/usr/bin/python2.4 +# diff -Nru python-gflags-1.5.1/debian/patches/python3-fixes.patch python-gflags-1.5.1/debian/patches/python3-fixes.patch --- python-gflags-1.5.1/debian/patches/python3-fixes.patch 2014-08-28 22:04:39.000000000 +0000 +++ python-gflags-1.5.1/debian/patches/python3-fixes.patch 2017-08-02 12:55:13.000000000 +0000 @@ -1,10 +1,23 @@ -Description: Lots of Python3 fixes. -Author: Thomas Goirand +From 20d17500d235ba3c5829e12db4b1ff5763b7cab6 Mon Sep 17 00:00:00 2001 +From: Thomas Goirand +Date: Thu, 8 Oct 2015 12:09:59 -0700 +Subject: Lots of Python3 fixes. + Forwarded: no Last-Update: 2014-08-29 ---- python-gflags-1.5.1.orig/gflags.py -+++ python-gflags-1.5.1/gflags.py +Patch-Name: python3-fixes.patch +--- + gflags.py | 61 +++++++++++++++++++++----------------------------- + gflags2man.py | 29 ++++++++++++++---------- + gflags_helpxml_test.py | 30 ++++++++++++------------- + gflags_unittest.py | 36 ++++++++++++++--------------- + 4 files changed, 75 insertions(+), 81 deletions(-) + +diff --git a/gflags.py b/gflags.py +index 21cf25c..bb42d4d 100644 +--- a/gflags.py ++++ b/gflags.py @@ -217,12 +217,12 @@ EXAMPLE USAGE: try: argv = FLAGS(argv) # parse flags @@ -22,7 +35,7 @@ if __name__ == '__main__': main(sys.argv) -@@ -386,6 +386,8 @@ a list of values, separated by a special +@@ -386,6 +386,8 @@ a list of values, separated by a special token). 6. We do not provide any example here: please use --helpxml instead. """ @@ -172,8 +185,10 @@ sys.exit(1) # ---- python-gflags-1.5.1.orig/gflags2man.py -+++ python-gflags-1.5.1/gflags2man.py +diff --git a/gflags2man.py b/gflags2man.py +index f346564..6725f38 100755 +--- a/gflags2man.py ++++ b/gflags2man.py @@ -45,6 +45,8 @@ Usage: # extended to other document formats. # Inspired by help2man. @@ -191,7 +206,7 @@ import gflags -@@ -79,12 +82,12 @@ _MIN_VALID_USAGE_MSG = 9 # if fe +@@ -79,12 +82,12 @@ _MIN_VALID_USAGE_MSG = 9 # if fewer lines than this, help is suspect class Logging: """A super-simple logging class""" @@ -249,8 +264,10 @@ return 1 for arg in argv[1:]: ---- python-gflags-1.5.1.orig/gflags_helpxml_test.py -+++ python-gflags-1.5.1/gflags_helpxml_test.py +diff --git a/gflags_helpxml_test.py b/gflags_helpxml_test.py +index 06fcd76..40df583 100755 +--- a/gflags_helpxml_test.py ++++ b/gflags_helpxml_test.py @@ -55,10 +55,10 @@ def MultiLineEqual(expected_help, help): if help == expected_help: return True @@ -306,8 +323,10 @@ return False ---- python-gflags-1.5.1.orig/gflags_unittest.py -+++ python-gflags-1.5.1/gflags_unittest.py +diff --git a/gflags_unittest.py b/gflags_unittest.py +index 1ec27f0..a45ea23 100755 +--- a/gflags_unittest.py ++++ b/gflags_unittest.py @@ -65,10 +65,10 @@ def MultiLineEqual(expected_help, help): if help == expected_help: return True @@ -363,7 +382,7 @@ return False -@@ -845,8 +845,8 @@ class LoadFromFlagFileTest(unittest.Test +@@ -845,8 +845,8 @@ class LoadFromFlagFileTest(unittest.TestCase): tmp_flag_file_2 = open((tmp_path + '/UnitTestFile2.tst'), 'w') tmp_flag_file_3 = open((tmp_path + '/UnitTestFile3.tst'), 'w') except IOError, e_msg: @@ -374,7 +393,7 @@ sys.exit(1) # put some dummy flags in our test files -@@ -885,7 +885,7 @@ class LoadFromFlagFileTest(unittest.Test +@@ -885,7 +885,7 @@ class LoadFromFlagFileTest(unittest.TestCase): try: os.remove(file_name) except OSError, e_msg: diff -Nru python-gflags-1.5.1/debian/patches/reproducible-build.patch python-gflags-1.5.1/debian/patches/reproducible-build.patch --- python-gflags-1.5.1/debian/patches/reproducible-build.patch 1970-01-01 00:00:00.000000000 +0000 +++ python-gflags-1.5.1/debian/patches/reproducible-build.patch 2017-08-02 12:55:13.000000000 +0000 @@ -0,0 +1,24 @@ +Description: Make the build reproducible +Author: Chris Lamb +Last-Update: 2016-08-29 + +--- python-gflags-1.5.1.orig/gflags2man.py ++++ python-gflags-1.5.1/gflags2man.py +@@ -174,6 +174,8 @@ class ProgramInfo(object): + self.modules = {} # { section_name(string), [ flags ] } + self.module_list = [] # list of module names in their original order + self.date = time.localtime(time.time()) # default date info ++ if 'SOURCE_DATE_EPOCH' in os.environ: ++ self.date = time.gmtime(int(os.environ['SOURCE_DATE_EPOCH'])) + + def Run(self): + """Run it and collect output. +@@ -188,6 +190,8 @@ class ProgramInfo(object): + + finfo = os.stat(self.executable) + self.date = time.localtime(finfo[stat.ST_MTIME]) ++ if 'SOURCE_DATE_EPOCH' in os.environ: ++ self.date = time.gmtime(finfo[stat.ST_MTIME]) + + logging.info('Running: %s %s &1' + % (self.executable, FLAGS.help_flag)) diff -Nru python-gflags-1.5.1/debian/patches/series python-gflags-1.5.1/debian/patches/series --- python-gflags-1.5.1/debian/patches/series 2014-08-28 22:04:39.000000000 +0000 +++ python-gflags-1.5.1/debian/patches/series 2017-08-02 12:55:13.000000000 +0000 @@ -1,2 +1,3 @@ python2.7-testsuite.patch python3-fixes.patch +reproducible-build.patch diff -Nru python-gflags-1.5.1/debian/python3-gflags.postrm python-gflags-1.5.1/debian/python3-gflags.postrm --- python-gflags-1.5.1/debian/python3-gflags.postrm 2014-08-28 22:21:23.000000000 +0000 +++ python-gflags-1.5.1/debian/python3-gflags.postrm 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = "remove" ] || [ "$1" = "disappear" ]; then - update-alternatives --remove gflags2man /usr/bin/python3-gflags2man -fi - -#DEBHELPER# - -exit 0 diff -Nru python-gflags-1.5.1/debian/python-gflags.postrm python-gflags-1.5.1/debian/python-gflags.postrm --- python-gflags-1.5.1/debian/python-gflags.postrm 2014-08-28 22:20:29.000000000 +0000 +++ python-gflags-1.5.1/debian/python-gflags.postrm 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = "remove" ] || [ "$1" = "disappear" ]; then - update-alternatives --remove gflags2man /usr/bin/python2-gflags2man -fi - -#DEBHELPER# - -exit 0 diff -Nru python-gflags-1.5.1/debian/watch python-gflags-1.5.1/debian/watch --- python-gflags-1.5.1/debian/watch 2014-08-28 22:04:17.000000000 +0000 +++ python-gflags-1.5.1/debian/watch 2017-08-02 12:55:13.000000000 +0000 @@ -1,2 +1,3 @@ version=3 -http://code.google.com/p/python-gflags/ //python-gflags.googlecode.com/files/python-gflags-(.*).tar.gz +https://github.com/google/python-gflags/releases .*/python-gflags-(.*)\.tar\.gz +