[mutt] 01/04: + upstream/749483-conststrings.patch: removed, already upstream, albeit in a different way

[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 93d15fb238070a2bacc15bb55c7aeeec2c45e94c
Author: Antonio Radici <antonio at debian.org>
Date:   Tue Nov 21 21:52:58 2017 +0000

    + upstream/749483-conststrings.patch: removed, already upstream, albeit in a different way
---
 debian/changelog                                  |  8 ++++++++
 debian/patches/series                             |  1 -
 debian/patches/upstream/749483-conststrings.patch | 15 ---------------
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 98928c9..64af5dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mutt (1.9.1-2) UNRELEASED; urgency=medium
+
+  * debian/patches:
+    + upstream/749483-conststrings.patch: removed, already upstream, albeit in
+      a different way
+
+ -- Antonio Radici <antonio at debian.org>  Tue, 21 Nov 2017 21:51:31 +0000
+
 mutt (1.9.1-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/series b/debian/patches/series
index aedfc1f..1921239 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,4 +10,3 @@ misc/gpg.rc-paths.patch
 misc/smime.rc.patch
 upstream/528233-readonly-open.patch
 upstream/383769-score-match.patch
-upstream/749483-conststrings.patch
diff --git a/debian/patches/upstream/749483-conststrings.patch b/debian/patches/upstream/749483-conststrings.patch
deleted file mode 100644
index d453384..0000000
--- a/debian/patches/upstream/749483-conststrings.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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