[Pkg-mozext-commits] [SCM] icedove-dispmua Debian packaging branch, master, updated. debian/1.6.8-1-5-ge7d36af

[Christoph Goehre]

The following commit has been merged in the master branch:
commit 4b53ff7a12ab0947d6f4419a195fcaed850ccff1
Author: Christoph Goehre <chris at sigxcpu.org>
Date:   Sun Aug 19 18:57:49 2012 +0200

    rebuild patch queue from patch-queue branch
    
    modified patches:
    display-correct-symbol-for-Icedove.patch
    
    obsolete patches (fixed upstream):
    0002-support-Icedove-8.patch

diff --git a/debian/patches/0001-display-correct-symbol-for-Icedove.patch b/debian/patches/0001-display-correct-symbol-for-Icedove.patch
deleted file mode 100644
index bd0e507..0000000
--- a/debian/patches/0001-display-correct-symbol-for-Icedove.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: display correct symbol for Icedove
-Author: Christoph Goehre <chris at sigxcpu.org>
-Bug-Debian: http://bugs.debian.org/614154
-Last-Update: 2011-10-04
-
---- a/chrome/chrome.jar!/content/data-presearch.js
-+++ b/chrome/chrome.jar!/content/data-presearch.js
-@@ -9,4 +9,5 @@
-   "netscape/" : [ "netscape.png" , "http://mailnews.netscape.com/releases" ] ,
-   "firefox/" : [ "firefox.png" , "http://www.mozilla.com/firefox/" ] ,
-   "eudora/" : [ "eudora.png" , "http://www.eudora.com/" ] ,
-+  "icedove/" : [ "icedove.png" , "http://packages.debian.org/stable/mail/icedove" ] ,
- }
diff --git a/debian/patches/0002-support-Icedove-8.patch b/debian/patches/0002-support-Icedove-8.patch
deleted file mode 100644
index bef106a..0000000
--- a/debian/patches/0002-support-Icedove-8.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: support Icedove 8.0
-Author: Christoph Goehre <chris at sigxcpu.org>
-Last-Update: 2012-01-08
-
---- a/install.rdf
-+++ b/install.rdf
-@@ -67,7 +67,7 @@
- 			<Description
- 				em:id="{3550f703-e582-4d05-9a08-453d09bdfdc6}"
- 				em:minVersion="2.0"
--				em:maxVersion="6.*"/>
-+				em:maxVersion="8.*"/>
- 		</em:targetApplication>
- 		<em:targetApplication>
- 		<!-- Seamonkey -->
diff --git a/debian/patches/display-correct-symbol-for-Icedove.patch b/debian/patches/display-correct-symbol-for-Icedove.patch
new file mode 100644
index 0000000..150b419
--- /dev/null
+++ b/debian/patches/display-correct-symbol-for-Icedove.patch
@@ -0,0 +1,19 @@
+From: Christoph Goehre <chris at sigxcpu.org>
+Date: Sun, 19 Aug 2012 18:55:38 +0200
+Subject: display correct symbol for Icedove
+
+Closes: #614154
+---
+ chrome/chrome.jar!/content/data-presearch.js |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/chrome/chrome.jar!/content/data-presearch.js b/chrome/chrome.jar!/content/data-presearch.js
+index b4188e4..5e8836b 100644
+--- a/chrome/chrome.jar!/content/data-presearch.js
++++ b/chrome/chrome.jar!/content/data-presearch.js
+@@ -9,4 +9,5 @@ dispMUA.arDispMUAAllocation["presearch"] =
+   "netscape/" : [ "netscape.png" , "http://mailnews.netscape.com/releases" ] ,
+   "firefox/" : [ "firefox.png" , "http://www.mozilla.com/firefox/" ] ,
+   "eudora/" : [ "eudora.png" , "http://www.eudora.com/" ] ,
++  "icedove/" : [ "icedove.png" , "http://packages.debian.org/stable/mail/icedove" ] ,
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 9de906b..3113971 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-display-correct-symbol-for-Icedove.patch
-0002-support-Icedove-8.patch
+display-correct-symbol-for-Icedove.patch

-- 
icedove-dispmua Debian packaging