Bug#771926: unblock: debmake/4.1.7-2
Hi, On Thu, Dec 04, 2014 at 03:49:57PM +, Adam D. Barratt wrote: On 2014-12-04 15:14, Osamu Aoki wrote: ... ++td class=contentDue to a href=https://bugs.debian.org/606542;Bug #606542/a, you need to manually install strongEXTRAPACKAGES/strong into the chroot. See a href=#chroot[chroo t]/a./td Is that not meant to be a list of packages? ... This sentence: | Note | Due to Bug #606542, you need to manually install EXTRAPACKAGES into the | chroot. See [chroot]. sounds odd. One cannot install EXTRAPACKAGES. I assumed that it was meant to say install foo, bar and baz instead. From looking at the bug, I now assume that it's intended to mean you need to manually install the packages listed in EXTRAPACKAGES in your pbuilder configuration. Which makes more sense, but at least wasn't obvious to me out of context. I now see where you are coming from. It does look strange in the plain text quoted out of context. This is a Note part in the pbuilder section and there is ~/.pbuilderrc which defines EXTRASPACKAGES right before this Note. EXTRAPACKAGE is in strong to indicate that it is not a regular word. I don't have time to look at the rest of the diff right now, so will have to come back to it later. Sure. I have the full generated HTML at: https://people.debian.org/~osamu/maint-guide.html The corresponding part for the above case is: https://people.debian.org/~osamu/maint-guide.html#pbuilder-setup This HTML file should make it easier to see the context for HTML diffs. Regards, Osamu -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/20141205132909.GA8056@goofy.local
Bug#771926: unblock: debmake/4.1.7-2
Hi On Wed, Dec 03, 2014 at 08:42:11PM +, Adam D. Barratt wrote: Control: tags -1 + moreinfo On Thu, 2014-12-04 at 00:14 +0900, Osamu Aoki wrote: 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 ^^ This should have been #765579 ++td class=contentDue to a href=https://bugs.debian.org/606542;Bug #606542/a, you need to manually install strongEXTRAPACKAGES/strong into the chroot. See a href=#chroot[chroo t]/a./td Is that not meant to be a list of packages? Hmmm... I do not quite understand the question ... but No. 4 Note items and only the second item has a package mentioned. There is no list of packages. | Note | Due to Bug #606542, you need to manually install EXTRAPACKAGES into the | chroot. See [chroot]. | Note | The above requires to install eatmydata (=82-2) inside and outside of | the chroot. | Note | A symlink from /root/.pbuilderrc to /home/user/.pbuilderrc may help | for the consistent experience. | Note | The parallel make may fail for some existing packages and may make the | build log difficult to read, The Bug #606542 is referenced as https://bugs.debian.org/606542 and it is redirected to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=606542 --create fails to respect existing --extrapackages/EXTRAPACKAGES I hope this is acceptable for unblock despite shortcoming of s/#769392/#765579/ Regards, Osamu -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/20141204151415.GB4320@goofy.local
Bug#771926: unblock: debmake/4.1.7-2
On 2014-12-04 15:14, Osamu Aoki wrote: Hi On Wed, Dec 03, 2014 at 08:42:11PM +, Adam D. Barratt wrote: Control: tags -1 + moreinfo On Thu, 2014-12-04 at 00:14 +0900, Osamu Aoki wrote: 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 ^^ This should have been #765579 ++td class=contentDue to a href=https://bugs.debian.org/606542;Bug #606542/a, you need to manually install strongEXTRAPACKAGES/strong into the chroot. See a href=#chroot[chroo t]/a./td Is that not meant to be a list of packages? Hmmm... I do not quite understand the question ... but No. 4 Note items and only the second item has a package mentioned. There is no list of packages. Okay, let me try and explain differently then. This sentence: | Note | Due to Bug #606542, you need to manually install EXTRAPACKAGES into the | chroot. See [chroot]. sounds odd. One cannot install EXTRAPACKAGES. I assumed that it was meant to say install foo, bar and baz instead. From looking at the bug, I now assume that it's intended to mean you need to manually install the packages listed in EXTRAPACKAGES in your pbuilder configuration. Which makes more sense, but at least wasn't obvious to me out of context. I don't have time to look at the rest of the diff right now, so will have to come back to it later. Regards, Adam -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/5c63bad600ffaccc235385bcbf8a1...@mail.adsl.funky-badger.org
Bug#771926: unblock: debmake/4.1.7-2
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
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.0 +0900
+++ debmake-4.1.7/debian/changelog 2014-12-04 00:01:09.0 +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 os...@debian.org 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.0 +0900
+++ debmake-4.1.7/debian/patches/0001-Sanity-check-for-copyright-lines.patch
2014-12-03 23:59:29.0 +0900
@@ -0,0 +1,45 @@
+From: Osamu Aoki os...@debian.org
+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.0 +0900
+++ debmake-4.1.7/debian/patches/0002-Update-template-for-autogen.sh.patch
2014-12-03 23:59:29.0 +0900
@@ -0,0 +1,20 @@
+From: Osamu Aoki os...@debian.org
+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:
+-
Bug#771926: unblock: debmake/4.1.7-2
Control: tags -1 + moreinfo On Thu, 2014-12-04 at 00:14 +0900, Osamu Aoki wrote: 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 ++td class=contentDue to a href=https://bugs.debian.org/606542;Bug #606542/a, you need to manually install strongEXTRAPACKAGES/strong into the chroot. See a href=#chroot[chroo t]/a./td Is that not meant to be a list of packages? Regards, Adam -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/1417639331.10998.10.ca...@adam-barratt.org.uk
Processed: Re: Bug#771926: unblock: debmake/4.1.7-2
Processing control commands: tags -1 + moreinfo Bug #771926 [release.debian.org] unblock: debmake/4.1.7-2 Added tag(s) moreinfo. -- 771926: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=771926 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/handler.s.b771926.141763933923043.transcr...@bugs.debian.org
