* Add patch const-correctness.patch to fix an error that is triggered by

  modern gcc versions; thanks to for the bug report and the patch
  (closes: #583507).
* Convert to source format 3.0 (quilt).

diff --git a/debian/changelog b/debian/changelog
index 201b54f9a587351219ffd31a5ee17795e7669311..754f2c32263cbcf396363e04321d1b88eaac4950 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mimetic (0.9.6-2) UNRELEASED; urgency=low
+
+  * Add patch const-correctness.patch to fix an error that is triggered by
+    modern gcc versions; thanks to for the bug report and the patch
+    (closes: #583507).
+  * Convert to source format 3.0 (quilt).
+
+ -- gregor herrmann <gregoa@debian.org>  Sat, 29 May 2010 15:31:05 +0200
+
 mimetic (0.9.6-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/debian/patches/const-correctness.patch b/debian/patches/const-correctness.patch
new file mode 100644 (file)
index 0000000..e42c8f0
--- /dev/null
+++ b/debian/patches/const-correctness.patch
@@ -0,0 +1,26 @@
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/583507
+Forwarded: yes
+Author: Berthold Stoeger <bs@bdf-net.com>
+Reviewed-by: gregor herrmann <gregoa@debian.org>
+Last-Update: 2010-05-29
+Description:
+ Due to an error in the header file /usr/include/mimetic/body.h modern gcc versions (>=4.3)
+ refuse to compile perfectly valid programs using an encoder of libmimetic.
+ .
+ A less serious side effect of the bug is suboptimal performance.
+ .
+ The problem is fixed by the following patch which changes the code to the
+ version obviously intended by the author:
+
+--- a/mimetic/body.h
++++ b/mimetic/body.h
+@@ -137,7 +137,7 @@
+     if(codec.codeSizeMultiplier() > 1.0)
+         coded.reserve((size_type)::ceil(size() * codec.codeSizeMultiplier()));
+ 
+-    mimetic::code(begin(), end(), cc, back_inserter(coded) );
++    mimetic::code(begin(), end(), codec, back_inserter(coded) );
+     this->assign(coded);
+     return true;
+ }

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..0ee5099
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+const-correctness.patch

diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)