Dear maintainer,
Here is the NMU diff according to DevRef 5.11.1[1][2] for RC bug: #560473.
See the debian/patches directory for the important fixes. 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:
jlint-3.0/debian/changelog
jlint-3.0/debian/rules
jlint-3.0/debian/control
jlint-3.0/debian/compat
jlint-3.0/debian/clean
jlint-3.0/debian/patches/10-gcc-4.4-const-char.patch
jlint-3.0/debian/patches/series
diffstat for jlint_3.0-4.2 jlint_3.0-4.3
debian/clean | 11 +++++++++++
debian/compat | 1 +
debian/patches/10-gcc-4.4-const-char.patch | 26 ++++++++++++++++++++++++++
debian/patches/series | 1 +
jlint-3.0/debian/changelog | 24 ++++++++++++++++++++++++
jlint-3.0/debian/control | 2 +-
jlint-3.0/debian/rules | 11 ++++++-----
7 files changed, 70 insertions(+), 6 deletions(-)
diff -u jlint-3.0/debian/changelog jlint-3.0/debian/changelog
--- jlint-3.0/debian/changelog
+++ jlint-3.0/debian/changelog
@@ -1,3 +1,27 @@
+jlint (3.0-4.3) unstable; urgency=low
+
+ [Jari Aalto]
+ * Non-maintainer upload.
+ * debian/clean
+ - New file. Clean traces of build.
+ * debian/compat
+ - New file. Set to 7.
+ * debian/control
+ - (Build-Depends): Change obsolete tetex-extra to texlive (E: lintian).
+ Add quilt for patches. Update debhelper from not supported 3 to 7.
+ * debian/patches
+ - (number 10): New patch to fix gcc 4.4
+ error: invalid conversion from const char* to char*.
+ (FTBFS RC bug serious; Closes: #560473).
+ * debian/rules
+ - Add quilt for patch management.
+ - (top level): Remove non-supported level DH_COMPAT=3.
+ - (binary-indep, binary-indep.stamp): Added workaround to
+ save and restore manual.pdf to avoid "binary contents
+ changed" error. The PDF file is during the build.
+
+ -- Jari Aalto <jari.aa...@cante.net> Sat, 09 Jan 2010 15:00:59 +0200
+
jlint (3.0-4.2) unstable; urgency=medium
* Non-maintainer upload.
diff -u jlint-3.0/debian/rules jlint-3.0/debian/rules
--- jlint-3.0/debian/rules
+++ jlint-3.0/debian/rules
@@ -1,10 +1,9 @@
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
+# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=3
+include /usr/share/quilt/quilt.make
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CFLAGS += -g
@@ -26,12 +25,13 @@
build-indep-stamp:
dh_testdir
+ [ -f manual.pdf.original ] || cp -v manual.pdf manual.pdf.original
$(MAKE) doc
touch build-indep-stamp
-build: build-arch build-indep
+build: patch build-arch build-indep
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-*-stamp configure-stamp
@@ -53,6 +53,7 @@
# Build architecture-independent files here.
# Pass -i to all debhelper commands in this target to reduce clutter.
binary-indep: build install
+ [ ! -f manual.pdf.original ] || mv -v manual.pdf.original manual.pdf
dh_testdir -i
dh_testroot -i
dh_installdocs -i
diff -u jlint-3.0/debian/control jlint-3.0/debian/control
--- jlint-3.0/debian/control
+++ jlint-3.0/debian/control
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: Ganesan Rajagopal <rgane...@debian.org>
-Build-Depends: debhelper (>> 3.0.0), texi2html, tetex-extra, zlib1g-dev, texinfo
+Build-Depends: debhelper (>= 7), texi2html, texlive, zlib1g-dev, texinfo, quilt
Standards-Version: 3.6.2
Package: jlint
only in patch2:
unchanged:
--- jlint-3.0.orig/debian/compat
+++ jlint-3.0/debian/compat
@@ -0,0 +1 @@
+7
only in patch2:
unchanged:
--- jlint-3.0.orig/debian/clean
+++ jlint-3.0/debian/clean
@@ -0,0 +1,11 @@
+manual.aux
+manual.cp
+manual.fn
+manual.html
+manual.ky
+manual.log
+manual.pg
+manual.toc
+manual.tp
+manual.vr
+debian/debhelper.log
only in patch2:
unchanged:
--- jlint-3.0.orig/debian/patches/10-gcc-4.4-const-char.patch
+++ jlint-3.0/debian/patches/10-gcc-4.4-const-char.patch
@@ -0,0 +1,26 @@
+From 5bea07ae23c850818c8339f27f5286bc12dc05bf Mon Sep 17 00:00:00 2001
+From: Jari Aalto <jari.aa...@cante.net>
+Date: Fri, 8 Jan 2010 14:12:30 +0200
+Subject: [PATCH] Fix Gcc 4.4 error: invalid conversion from const char* to char*
+
+Signed-off-by: Jari Aalto <jari.aa...@cante.net>
+---
+ jlint.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/jlint.cc b/jlint.cc
+index 0da1781..a136592 100644
+--- a/jlint.cc
++++ b/jlint.cc
+@@ -296,7 +296,7 @@ void set_class_source_path(class_desc* cls)
+ if (source_file_path_len != 0) {
+ const char* class_file_name = cls->source_file.as_asciz();
+ if (!source_path_redefined) {
+- char* dirend = strrchr(class_file_name, '/');
++ const char* dirend = strrchr(class_file_name, '/');
+ if (dirend != NULL) {
+ int dirlen = dirend - class_file_name;
+ if (dirlen <= source_file_path_len
+--
+1.6.5
+
only in patch2:
unchanged:
--- jlint-3.0.orig/debian/patches/series
+++ jlint-3.0/debian/patches/series
@@ -0,0 +1 @@
+10-gcc-4.4-const-char.patch
