Bug#596681: cdrkit: NMU diff for 9:1.1.10-1.1

2010-10-15 Thread jari . aalto

Dear maintainer,

Here is the NMU diff according to DevRef 5.11.1[1][2] for bug: #596681.
See the debian/patches directory for the important fixes.

Please let me know if it is okay to proceed with NMU. Feel free to
contact if you have any questions.

Thank you for maintaining the package, 
Jari Aalto

[1] http://www.debian.org/doc/developers-reference/pkgs.html#nmu
[2] http://dep.debian.net/deps/dep1.html

lsdiff(1) of changes:

cdrkit-1.1.10/debian/changelog
cdrkit-1.1.10/debian/patches/10-fix-checksum.patch
cdrkit-1.1.10/debian/source/format

diffstat for cdrkit-1.1.10 cdrkit-1.1.10

 changelog |   12 
 patches/10-fix-checksum.patch |   30 ++
 source/format |1 +
 3 files changed, 43 insertions(+)

diff -Nru cdrkit-1.1.10/debian/changelog cdrkit-1.1.10/debian/changelog
--- cdrkit-1.1.10/debian/changelog	2010-10-15 11:48:03.0 +0300
+++ cdrkit-1.1.10/debian/changelog	2010-10-15 11:45:13.0 +0300
@@ -1,3 +1,15 @@
+cdrkit (9:1.1.10-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+- Move to packaging format 3.0 (quilt) due to patch.
+  * debian/patches
+- (10): New. Fix checksum. Patch thanks to olin Watson cjwat...@ubuntu.com.
+  (serious; Closes: #596681).
+  * debian/source/format
+- New file.
+
+ -- Jari Aalto jari.aa...@cante.net  Fri, 15 Oct 2010 11:45:13 +0300
+
 cdrkit (9:1.1.10-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru cdrkit-1.1.10/debian/patches/10-fix-checksum.patch cdrkit-1.1.10/debian/patches/10-fix-checksum.patch
--- cdrkit-1.1.10/debian/patches/10-fix-checksum.patch	1970-01-01 02:00:00.0 +0200
+++ cdrkit-1.1.10/debian/patches/10-fix-checksum.patch	2010-10-15 11:42:29.0 +0300
@@ -0,0 +1,30 @@
+From c7e65d9ddd804a3c25fc724c5479f3865cd83b53 Mon Sep 17 00:00:00 2001
+From: Jari Aalto jari.aa...@cante.net
+Date: Fri, 15 Oct 2010 11:42:23 +0300
+Subject: [PATCH] genisoimage/jte.c: Fix Checksum by Colin Watson cjwat...@ubuntu.com
+Organization: Private
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+
+Signed-off-by: Jari Aalto jari.aa...@cante.net
+---
+ genisoimage/jte.c |2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/genisoimage/jte.c b/genisoimage/jte.c
+index ed232cf..9fdde5c 100644
+--- a/genisoimage/jte.c
 b/genisoimage/jte.c
+@@ -753,7 +753,7 @@ static void write_template_desc_entries(off_t image_len)
+ 
+ jimage.type = 5;
+ write_le48(image_len, jimage.imageLen[0]);
+-memcpy(jimage.imageMD5, checksum_hex(iso_context, CHECK_MD5), sizeof(jimage.imageMD5));
++checksum_copy(jimage.imageMD5, iso_context, CHECK_MD5);
+ write_le32(MIN_JIGDO_FILE_SIZE, jimage.blockLen[0]);
+ template_fwrite(jimage, sizeof(jimage), 1, t_file);
+ template_fwrite(out_len, sizeof(out_len), 1, t_file);
+-- 
+1.7.1
+
diff -Nru cdrkit-1.1.10/debian/source/format cdrkit-1.1.10/debian/source/format
--- cdrkit-1.1.10/debian/source/format	1970-01-01 02:00:00.0 +0200
+++ cdrkit-1.1.10/debian/source/format	2010-10-15 11:44:55.0 +0300
@@ -0,0 +1 @@
+3.0 (quilt)


Bug#596681: cdrkit: NMU diff for 9:1.1.10-1.1

2010-10-15 Thread Mehdi Dogguy
On 10/15/2010 10:49 AM, jari.aa...@cante.net wrote:
 
 Dear maintainer,
 
 Here is the NMU diff according to DevRef 5.11.1[1][2] for bug:
 #596681. See the debian/patches directory for the important fixes.
 
 Please let me know if it is okay to proceed with NMU. Feel free to 
 contact if you have any questions.
 

I don't think it's appropriate to switch to source format 3.0 for the
NMU. That should be the maintainer's decision and is a discouraged
change during the freeze.

Besides, the file debian/patches/series is missing.

Cheers,

-- 
Mehdi Dogguy مهدي الدڤي
http://dogguy.org/



--
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#596681: cdrkit: NMU diff for 9:1.1.10-1.1

2010-10-15 Thread Julien Cristau
On Fri, Oct 15, 2010 at 11:49:10 +0300, jari.aa...@cante.net wrote:

 
 Dear maintainer,
 
 Here is the NMU diff according to DevRef 5.11.1[1][2] for bug: #596681.
 See the debian/patches directory for the important fixes.
 
 Please let me know if it is okay to proceed with NMU. Feel free to
 contact if you have any questions.
 
I asked the maintainers yesterday:
14:04  Sledge jcristau: it's already fixed in svn
14:04  Sledge just haven't done the upload yet
14:05  Sledge I have plans for a lot of Debian work this w/e

Please wait until next week, or upload to delayed.  Also as Mehdi says
changing the source format in a NMU is wrong, don't do that.  And
Colin's name is not 'olin'. ;)

Cheers,
Julien


signature.asc
Description: Digital signature


Bug#596681: cdrkit: NMU diff for 9:1.1.10-1.1

2010-10-15 Thread Steve McIntyre
On Fri, Oct 15, 2010 at 11:49:10AM +0300, jari.aa...@cante.net wrote:

Dear maintainer,

Here is the NMU diff according to DevRef 5.11.1[1][2] for bug: #596681.
See the debian/patches directory for the important fixes.

Please let me know if it is okay to proceed with NMU. Feel free to
contact if you have any questions.

Thank you for maintaining the package, 
Jari Aalto

[1] http://www.debian.org/doc/developers-reference/pkgs.html#nmu
[2] http://dep.debian.net/deps/dep1.html

lsdiff(1) of changes:

cdrkit-1.1.10/debian/changelog
cdrkit-1.1.10/debian/patches/10-fix-checksum.patch
cdrkit-1.1.10/debian/source/format

Thanks for the effort, but NACK. The fix is already in svn ready to
go, and I have an upload just about prepared and ready for some
testing this weekend. Especially: please don't change packaging format
in an NMU...

-- 
Steve McIntyre, Cambridge, UK.st...@einval.com
It's actually quite entertaining to watch ag129 prop his foot up on
 the desk so he can get a better aim.  [ seen in ucam.chat ]




-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#596681: cdrkit: NMU diff for 9:1.1.10-1.1

2010-10-15 Thread Jari Aalto
Julien Cristau jcris...@debian.org writes:
 changing the source format in a NMU is wrong, don't do that.

Mehdi Dogguy me...@dogguy.org writes:
 I don't think it's appropriate to switch to source format 3.0 for the

  * Non-maintainer upload.
- Move to packaging format 3.0 (quilt) due to patch.
 =

Is it better to add an extra quilt dependency? The new 3.0 does not
require any new dependencies and extra changes in debian/rules.

Jari



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#596681: cdrkit: NMU diff for 9:1.1.10-1.1

2010-10-15 Thread Julien Cristau
On Fri, Oct 15, 2010 at 13:23:30 +0300, Jari Aalto wrote:

 Julien Cristau jcris...@debian.org writes:
  changing the source format in a NMU is wrong, don't do that.
 
 Mehdi Dogguy me...@dogguy.org writes:
  I don't think it's appropriate to switch to source format 3.0 for the
 
   * Non-maintainer upload.
 - Move to packaging format 3.0 (quilt) due to patch.
  =
 
 Is it better to add an extra quilt dependency? The new 3.0 does not
 require any new dependencies and extra changes in debian/rules.
 
No, that would be just as wrong.  Don't introduce any patch system,
leave the packaging and debian/rules alone.

Cheers,
Julien


signature.asc
Description: Digital signature