Dear maintainer,
Here is the NMU diff according to DevRef 5.11.1[1][2] for RC bug: #560488.
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:
a/debian/changelog
a/debian/control
b/debian/patches/10-gcc-4.4-const-char.patch
b/debian/patches/series
a/debian/rules
debian/changelog | 14 ++++++++++++++
debian/control | 2 +-
debian/patches/10-gcc-4.4-const-char.patch | 26 ++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 6 ++++--
5 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 38f8afb..908d2e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+kwavecontrol (0.4.2-2.2) unstable; urgency=low
+
+ [Jari Aalto]
+ * Non-maintainer upload.
+ * debian/control:
+ - (Build-Depends): Add quilt due to patch.
+ * debian/patches
+ - (number 10): Fix Gcc 4.4 error: invalid conversion from
+ const char* to char* (RC bug FTBFS; Closes: #560488).
+ * debian/rules:
+ - Add quilt.
+
+ -- Jari Aalto <jari.aa...@cante.net> Fri, 08 Jan 2010 21:37:22 +0200
+
kwavecontrol (0.4.2-2.1) unstable; urgency=medium
* Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 4c8a034..5c5d87f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
Priority: optional
Maintainer: Morten Hustveit <mor...@debian.org>
Standards-Version: 3.7.2.0
-Build-Depends: kdelibs4-dev, libqt3-mt-dev, debhelper (>= 5.0.0)
+Build-Depends: kdelibs4-dev, libqt3-mt-dev, debhelper (>= 5.0.0), quilt
Package: kwavecontrol
Architecture: any
diff --git a/debian/patches/10-gcc-4.4-const-char.patch b/debian/patches/10-gcc-4.4-const-char.patch
new file mode 100644
index 0000000..229303d
--- /dev/null
+++ b/debian/patches/10-gcc-4.4-const-char.patch
@@ -0,0 +1,26 @@
+From a9f144b8d0f12c301f68d133874b97e7ffa694b2 Mon Sep 17 00:00:00 2001
+From: Jari Aalto <jari.aa...@cante.net>
+Date: Fri, 8 Jan 2010 23:21:18 +0200
+Subject: [PATCH] src/kencryptiongroup.cpp: Fix Gcc 4.4 error: invalid conversion from const char* to char*
+
+Signed-off-by: Jari Aalto <jari.aa...@cante.net>
+---
+ src/kencryptiongroup.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/kencryptiongroup.cpp b/src/kencryptiongroup.cpp
+index bbec4b5..ba071fb 100644
+--- a/src/kencryptiongroup.cpp
++++ b/src/kencryptiongroup.cpp
+@@ -177,7 +177,7 @@ void KEncryptionGroup::editSlot()
+ case LOGIN:
+ key = (unsigned char*)keyDialog->getKey().ascii();
+ keyLength = keyDialog->getKey().length();
+- char* p = strchr( (const char*)key, ':' );
++ char* p = strchr( (char *)key, ':' );
+ if( p == NULL )
+ {
+ KMessageBox::error( this, "Invalid login format", "Error" );
+--
+1.6.5
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6c010ef
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+10-gcc-4.4-const-char.patch
diff --git a/debian/rules b/debian/rules
index 0eecc17..e70f816 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,9 @@
#!/usr/bin/make -f
+include /usr/share/quilt/quilt.make
+
build: build-stamp
-build-stamp:
+build-stamp: patch
dh_testdir
find -name Makefile.am | xargs touch && \
find -name Makefile.in | xargs touch && \
@@ -14,7 +16,7 @@ build-stamp:
$(MAKE) CFLAGS="-O2 -g -Wall"
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp
