[mutt] 01/01: upstream/749483-conststrings.patch fixes a conflicting declaration (Closes: 749483)

[Antonio Radici]

This is an automated email from the git hooks/post-receive script.

antonio pushed a commit to branch master
in repository mutt.

commit 91477965fc9f829b3d0e6ebce3d72436a8af0d7f
Author: Antonio Radici <antonio at debian.org>
Date:   Mon Aug 29 05:47:35 2016 +0100

    upstream/749483-conststrings.patch fixes a conflicting declaration (Closes: 749483)
---
 debian/changelog                                  |  8 +++++---
 debian/patches/series                             |  1 +
 debian/patches/upstream/749483-conststrings.patch | 15 +++++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fcd6d17..6d448ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,14 +6,16 @@ mutt (1.7.0-1) UNRELEASED; urgency=medium
       upstream).
   * debian/patches:
     + some patches refreshed.
-    + restored 611410-no-implicit_autoview-for-text-html.patch which was
+    + debian-specific/document_debian_defaults.patch updated to remove an
+      incorrect reference to a default variable (Closes: 741166).
+    + upstream/611410-no-implicit_autoview-for-text-html.patch restored, it was
       incorrectly dropped (Closes: 823971).
     + upstream/835421-pop-digest-md5.patch to incorrectly handle pop DIGEST-MD5
       auth (Closes: 835421).
     + upstream/693993-manpage-corrections.patch with some fixes to the manpage
       (Closes: 693993).
-    + debian-specific/document_debian_defaults.patch updated to remove an
-      incorrect reference to a default variable (Closes: 741166).
+    + upstream/749483-conststrings.patch fixes a conflicting declaration
+      (Closes: 749483)
 
  -- Antonio Radici <antonio at debian.org>  Sun, 28 Aug 2016 15:10:08 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 087eaed..a738209 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,3 +17,4 @@ upstream/771125-CVE-2014-9116-jessie.patch
 upstream/611410-no-implicit_autoview-for-text-html.patch
 upstream/835421-pop-digest-md5.patch
 upstream/693993-manpage-corrections.patch
+upstream/749483-conststrings.patch
diff --git a/debian/patches/upstream/749483-conststrings.patch b/debian/patches/upstream/749483-conststrings.patch
new file mode 100644
index 0000000..d453384
--- /dev/null
+++ b/debian/patches/upstream/749483-conststrings.patch
@@ -0,0 +1,15 @@
+Fixing a conflicted type for a generated variable.
+
+This problem was initially reported in http://bugs.debian.org/749483
+
+--- a/txt2c.sh
++++ b/txt2c.sh
+@@ -4,7 +4,7 @@
+ 	# consumes stdin
+ 
+ 	# declaration
+-	echo "unsigned char $1[] = "
++	echo "const char $1[] = "
+ 
+ 	# initializer - filter out unwanted characters, then convert problematic
+ 	# or odd-looking sequences.  The result is a sequence of quote-bounded

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mutt/mutt.git