Package: release.debian.org Severity: normal User: [email protected] Usertags: unblock
Please unblock package debmake Fix important bug and documentation fixes. * Add sanity check for copyright lines. Closes: #767666 * Update template for autogen.sh. Closes: #771920 * Work around os.getlogin. Closes: #769392 * Update documentstion. Closes: #769392 attached the debdiff against the package in testing unblock debmake/4.1.7-2 -- System Information: Debian Release: jessie/sid APT prefers testing-updates APT policy: (500, 'testing-updates'), (500, 'testing') Architecture: amd64 (x86_64) Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores) Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -Nru debmake-4.1.7/debian/changelog debmake-4.1.7/debian/changelog --- debmake-4.1.7/debian/changelog 2014-10-14 00:26:27.000000000 +0900 +++ debmake-4.1.7/debian/changelog 2014-12-04 00:01:09.000000000 +0900 @@ -1,3 +1,12 @@ +debmake (4.1.7-2) unstable; urgency=medium + + * Add sanity check for copyright lines. Closes: #767666 + * Update template for autogen.sh. Closes: #771920 + * Work around os.getlogin. Closes: #769392 + * Update documentstion. Closes: #769392 + + -- Osamu Aoki <[email protected]> Thu, 04 Dec 2014 00:01:00 +0900 + debmake (4.1.7-1) unstable; urgency=medium * Minor adjustment to debian/rules template etc. for diff -Nru debmake-4.1.7/debian/patches/0001-Sanity-check-for-copyright-lines.patch debmake-4.1.7/debian/patches/0001-Sanity-check-for-copyright-lines.patch --- debmake-4.1.7/debian/patches/0001-Sanity-check-for-copyright-lines.patch 1970-01-01 09:00:00.000000000 +0900 +++ debmake-4.1.7/debian/patches/0001-Sanity-check-for-copyright-lines.patch 2014-12-03 23:59:29.000000000 +0900 @@ -0,0 +1,45 @@ +From: Osamu Aoki <[email protected]> +Date: Sun, 9 Nov 2014 00:34:10 +0900 +Subject: Sanity check for copyright lines + +Closes: #767666 +--- + debmake/copyright.py | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +diff --git a/debmake/copyright.py b/debmake/copyright.py +index bc4caf5..4e56703 100755 +--- a/debmake/copyright.py ++++ b/debmake/copyright.py +@@ -33,6 +33,11 @@ import sys + import debmake.debug + import debmake.lc + ################################################################### ++# Constants for sanity ++################################################################### ++MAX_COPYRIGHT_LINES = 256 ++MAX_COPYRIGHT_LENGTH = 2048 ++################################################################### + # Parse year within a copyright line + ################################################################### + re_year_1900 = re.compile(r''' +@@ -673,6 +678,19 @@ def check_lines(lines): + debmake.debug.debug('De: *end* format={}->{}, content={}->{}, copyright={}, license={}: "{}"'.format(fs[xformat_state], fs[format_state], cs[xcontent_state], cs[content_state], copyright_found, license_found, line), type='e') + ########################################################################## + # main loop for lines (end) ++ # sanitize copyright_lines ++ ########################################################################## ++ if len(copyright_lines) > MAX_COPYRIGHT_LINES: ++ print('W: !!!!! too many copyright lines !!!!!', file=sys.stderr) ++ print('W: starting with {}'.format(copyright_lines[0]), file=sys.stderr) ++ copyright_lines = copyright_lines[:MAX_COPYRIGHT_LINES] ++ for (i, line) in enumerate(copyright_lines): ++ if len(line) > MAX_COPYRIGHT_LENGTH: ++ copyright_lines[i] = line[:MAX_COPYRIGHT_LENGTH] ++ print('W: !!!!! too long copyright line !!!!!', file=sys.stderr) ++ print('W: starting with {}'.format(copyright_lines[i]), file=sys.stderr) ++ ########################################################################## ++ # analyze copyright + ########################################################################## + copyright_data = analyze_copyright(copyright_lines) + license_lines = clean_license(license_lines) diff -Nru debmake-4.1.7/debian/patches/0002-Update-template-for-autogen.sh.patch debmake-4.1.7/debian/patches/0002-Update-template-for-autogen.sh.patch --- debmake-4.1.7/debian/patches/0002-Update-template-for-autogen.sh.patch 1970-01-01 09:00:00.000000000 +0900 +++ debmake-4.1.7/debian/patches/0002-Update-template-for-autogen.sh.patch 2014-12-03 23:59:29.000000000 +0900 @@ -0,0 +1,20 @@ +From: Osamu Aoki <[email protected]> +Date: Sat, 25 Oct 2014 21:41:59 +0900 +Subject: Update template for autogen.sh + +--- + extra0override/autogen | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/extra0override/autogen b/extra0override/autogen +index 60b9a59..24f59f6 100644 +--- a/extra0override/autogen ++++ b/extra0override/autogen +@@ -1,6 +1,6 @@ + ### Initialize source with autogen.sh found in the upstream + override_dh_autoreconf: +- dh_autoreconf -- autogen.sh ++ dh_autoreconf -- ./autogen.sh + ### Alternatively + ### support for -Wl,--as-needed to ltmain.sh with autoreconf -f -i + ###override_dh_autoreconf: diff -Nru debmake-4.1.7/debian/patches/0003-Work-around-os.getlogin-769392.patch debmake-4.1.7/debian/patches/0003-Work-around-os.getlogin-769392.patch --- debmake-4.1.7/debian/patches/0003-Work-around-os.getlogin-769392.patch 1970-01-01 09:00:00.000000000 +0900 +++ debmake-4.1.7/debian/patches/0003-Work-around-os.getlogin-769392.patch 2014-12-03 23:59:29.000000000 +0900 @@ -0,0 +1,23 @@ +From: Osamu Aoki <[email protected]> +Date: Mon, 24 Nov 2014 15:15:40 +0900 +Subject: Work around os.getlogin: #769392 + +--- + debmake/para.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/debmake/para.py b/debmake/para.py +index 6dbecda..60269a8 100755 +--- a/debmake/para.py ++++ b/debmake/para.py +@@ -44,7 +44,9 @@ def para(para): + debmail = os.getlogin() + '@localhost' + debfullname = env('DEBFULLNAME') + if not debfullname: +- debfullname = pwd.getpwnam(os.getlogin())[4].split(',')[0] ++ # os.getlogin may not work well: #769392 ++ #debfullname = pwd.getpwnam(os.getlogin())[4].split(',')[0] ++ debfullname = pwd.getpwuid(os.getuid())[4].split(',')[0] + + ####################################################################### + # command line setting diff -Nru debmake-4.1.7/debian/patches/0004-Doc-updates-765579.patch debmake-4.1.7/debian/patches/0004-Doc-updates-765579.patch --- debmake-4.1.7/debian/patches/0004-Doc-updates-765579.patch 1970-01-01 09:00:00.000000000 +0900 +++ debmake-4.1.7/debian/patches/0004-Doc-updates-765579.patch 2014-12-03 23:59:29.000000000 +0900 @@ -0,0 +1,123 @@ +From: Osamu Aoki <[email protected]> +Date: Wed, 3 Dec 2014 23:58:13 +0900 +Subject: Doc updates: #765579 + +--- + doc/maint-guide.html | 48 ++++++++++++++++++++++++++++++++++++++++-------- + 1 file changed, 40 insertions(+), 8 deletions(-) + +diff --git a/doc/maint-guide.html b/doc/maint-guide.html +index 7113a25..1a819d4 100644 +--- a/doc/maint-guide.html ++++ b/doc/maint-guide.html +@@ -1838,7 +1838,31 @@ DEBBUILDOPTS=-j8</code></pre> + <td class="icon"> + <div class="title">Note</div> + </td> +-<td class="content">The parallel <strong>make</strong> may fail for some existing packages.</td> ++<td class="content">Due to <a href="https://bugs.debian.org/606542";>Bug #606542</a>, you need to manually install <strong>EXTRAPACKAGES</strong> into the chroot. See <a href="#chroot">[chroot]</a>.</td> ++</tr></table> ++</div> ++<div class="admonitionblock"> ++<table><tr> ++<td class="icon"> ++<div class="title">Note</div> ++</td> ++<td class="content">The above requires to install <strong>eatmydata</strong> (>=82-2) inside and outside of the chroot.</td> ++</tr></table> ++</div> ++<div class="admonitionblock"> ++<table><tr> ++<td class="icon"> ++<div class="title">Note</div> ++</td> ++<td class="content">A symlink from <strong>/root/.pbuilderrc</strong> to <strong>/home/<user>/.pbuilderrc</strong> may help for the consistent experience.</td> ++</tr></table> ++</div> ++<div class="admonitionblock"> ++<table><tr> ++<td class="icon"> ++<div class="title">Note</div> ++</td> ++<td class="content">The parallel <strong>make</strong> may fail for some existing packages and may make the build log difficult to read,</td> + </tr></table> + </div> + <div class="paragraph"><p>Let’s create a hook scripts as follows.</p></div> +@@ -5025,7 +5049,7 @@ The command to update the <strong>sid</strong> chroot + </li> + <li> + <p> +-<strong>git-pbuilder --update</strong> ++<strong>git-pbuilder update</strong> + </p> + </li> + </ul></div> +@@ -5037,7 +5061,7 @@ The command to login to the <strong>sid</strong> chroot to modify it + <div class="ulist"><ul> + <li> + <p> +-<strong>git-pbuilder --login --save-after-login</strong> ++<strong>git-pbuilder login --save-after-login</strong> + </p> + </li> + </ul></div> +@@ -5108,7 +5132,7 @@ The command to update the <em>dist</em> chroot + </li> + <li> + <p> +-<strong>DIST=</strong><em>dist</em> <strong>git-pbuilder --update</strong> ++<strong>DIST=</strong><em>dist</em> <strong>git-pbuilder update</strong> + </p> + </li> + </ul></div> +@@ -5125,7 +5149,7 @@ The command to login to the <strong>sid</strong> chroot to modify it + </li> + <li> + <p> +-<strong>DIST=</strong><em>dist</em> <strong>git-pbuilder --login --save-after-login</strong> ++<strong>DIST=</strong><em>dist</em> <strong>git-pbuilder login --save-after-login</strong> + </p> + </li> + </ul></div> +@@ -5136,7 +5160,7 @@ The command to login to the <strong>sid</strong> chroot to modify it + <td class="icon"> + <div class="title">Tip</div> + </td> +-<td class="content">A custom environment with some pre-loaded packages needed for the new experimental packages, this <strong>git-pbuilder --login --save-after-login</strong> command is quite handy.</td> ++<td class="content">A custom environment with some pre-loaded packages needed for the new experimental packages, this <strong>git-pbuilder login --save-after-login</strong> command is quite handy.</td> + </tr></table> + </div> + <div class="admonitionblock"> +@@ -5144,7 +5168,7 @@ The command to login to the <strong>sid</strong> chroot to modify it + <td class="icon"> + <div class="title">Tip</div> + </td> +-<td class="content">If your old chroot is missing packages such as <strong>eatmydata</strong>, <strong>ccache</strong>, and <strong>lintian</strong>, you may want to install these with the <strong>git-pbuilder --login --save-after-login</strong> command.</td> ++<td class="content">If your old chroot is missing packages such as <strong>eatmydata</strong>, <strong>ccache</strong>, and <strong>lintian</strong>, you may want to install these with the <strong>git-pbuilder login --save-after-login</strong> command.</td> + </tr></table> + </div> + <div class="admonitionblock"> +@@ -5492,7 +5516,7 @@ If you have a <strong>1.0</strong> source package without the <strong>foo.diff.g + <td class="content">“The <strong>CDBS</strong> magically does the job for me with less typing” nor “I don’t understand the new <strong>dh</strong> syntax” cannot be the excuse to keep using the <strong>CDBS</strong> system.</td> + </tr></table> + </div> +-<div class="paragraph"><p>For some complicated packages such as GNOME related ones, the <strong>CDBS</strong> is used with reasons and offers some value to the packagers. If this is the case, please do not bother converting from the <strong>CDBS</strong> to the <strong>dh</strong> syntax.</p></div> ++<div class="paragraph"><p>For some complicated packages such as GNOME related ones, the <strong>CDBS</strong> is leveraged to automate their uniform packaging by the current maintainers with reasons. If this is the case, please do not bother converting from the <strong>CDBS</strong> to the <strong>dh</strong> syntax.</p></div> + <div class="admonitionblock"> + <table><tr> + <td class="icon"> +@@ -5855,6 +5879,14 @@ hello-c-0.9/ + hello-c-0.9/Makefile + hello-c-0.9/hello.c</code></pre> + </div></div> ++<div class="admonitionblock"> ++<table><tr> ++<td class="icon"> ++<div class="title">Tip</div> ++</td> ++<td class="content">Use of the <strong>gbp pq</strong> command provides the equivalent functionality of the patch set management without using <strong>dquilt</strong>.</td> ++</tr></table> ++</div> + </div> + </div> + <div class="sect2"> diff -Nru debmake-4.1.7/debian/patches/series debmake-4.1.7/debian/patches/series --- debmake-4.1.7/debian/patches/series 2014-10-13 23:50:39.000000000 +0900 +++ debmake-4.1.7/debian/patches/series 2014-12-03 23:59:29.000000000 +0900 @@ -0,0 +1,4 @@ +0001-Sanity-check-for-copyright-lines.patch +0002-Update-template-for-autogen.sh.patch +0003-Work-around-os.getlogin-769392.patch +0004-Doc-updates-765579.patch
