Package: release.debian.org
Severity: normal
Tags: wheezy
User: release.debian....@packages.debian.org
Usertags: pu

Hi,

As reported in #746235, the nostalgy version currently in stable does
not work properly with icedove 24 from stable-security. I’d like you
to consider accepting the (rebuilt in Wheezy) version currently
available in Jessie and Sid, known to work with icedove 10 to 24.

For once, the debdiff is attached since the compatibility fix is almost
the only change since the previous version, but I’ve made some packaging
changes (back then, I wasn’t aware we might have to deal with stable
update anyway). I’d like you to consider accepting those packaging
changes because 1) I don’t speak CDBS, 2) I’m sure this version works,
3) I’ll be able to deal more efficiently with other changes (e.g.,
security related) if needed. If you don’t feel comfortable with that,
I’ll cook you a minimal change based on the version currently in Wheezy.

Thanks in advance for considering, I’ll follow up with the second (and
hopefully last) request of this kind for icedove compatibility.

Regards

David
diff --git a/CHANGES b/CHANGES
index 7311cbb..6d2358b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+0.2.31
+  - Fix for TB >= 20 (thanks to Aaron Solochek)
+  - Add hot keys for "Move up/down" in the rule edition popup (thanks to Michael vann Rooyen)
+
 0.2.30
   - Fix scrolling messages with Ctrl Up/Down.
   - Integrate patch from Gilles Orsini to avoid problem with 'Tasks & mails' extension.
diff --git a/content/edit_prefs.js b/content/edit_prefs.js
index 133fb22..f4830d5 100644
--- a/content/edit_prefs.js
+++ b/content/edit_prefs.js
@@ -321,6 +321,9 @@ function onNostalgyLoad() {
 }
 
 function onNostalgyKeyPress(ev) {
+  // We don't want to act on Meta.  Necessary from thunderbird 18 on.
+  if (ev.keyCode == KeyEvent.DOM_VK_META) return; 
+
   if (!nostalgy_wait_key && ((ev.keyCode == 46) || (ev.keyCode == 8))) NostalgyDoDelete();
   // should only to that in the relevant tab
 
diff --git a/content/edit_prefs.xul b/content/edit_prefs.xul
index bf4b087..3618269 100644
--- a/content/edit_prefs.xul
+++ b/content/edit_prefs.xul
@@ -57,8 +57,8 @@ shortcuts to move/copy the message to this folder.</label>
   <button label="Delete" accesskey="D" oncommand="NostalgyDoDelete();"/>
   <button label="New" accesskey="N" oncommand="NostalgyDoNewRule();"/>
   <separator orient="vertical"/>
-  <button label="Move up" oncommand="NostalgyDoMoveUp();"/>
-  <button label="Move down" oncommand="NostalgyDoMoveDown();"/>
+  <button label="Move up" accesskey="U" oncommand="NostalgyDoMoveUp();"/>
+  <button label="Move down" accesskey="W" oncommand="NostalgyDoMoveDown();"/>
   <separator orient="vertical"/>
   <button label="Export rules" oncommand="NostalgyExportRules();"/>
   <button label="Import rules" oncommand="NostalgyImportRules();"/>
diff --git a/content/folders.js b/content/folders.js
index 9e84cea..f438d7e 100644
--- a/content/folders.js
+++ b/content/folders.js
@@ -415,18 +415,28 @@ function NostalgyIterateFoldersAllServers(f) {
  var servers= amService.allServers;
  var seen = { };
  var i;
-
- for (i = 0; i < servers.Count(); i++) {
-  var server = servers.GetElementAt(i).
-               QueryInterface(Components.interfaces.nsIMsgIncomingServer);
-  var root = server.rootMsgFolder;
-  var n = root.prettyName;
-  if (seen[n]) {
-    // Prevent duplicate folders in case of locally stored POP3 accounts
-  } else {
-    seen[n] = true;
-    NostalgyIterateSubfolders(root,f);
-  }
+ var nservers;
+
+ if (servers.length) nservers = servers.length;  /* TB >= 20 */
+ else if (servers.Count) nservers = servers.Count();  /* TB < 20 */
+ else alert("NOSTALGY: cannot determine server count");
+
+ for (i = 0; i < nservers; i++) {
+     var server;
+     if (servers.GetElementAt) /* TB < 20 */
+         server = servers.GetElementAt(i).QueryInterface(Components.interfaces.nsIMsgIncomingServer);
+     else if (servers.queryElementAt) /* TB >= 20 */
+         server = servers.queryElementAt(i,Components.interfaces.nsIMsgIncomingServer);
+     else alert("NOSTALGY: cannot access server");
+
+     var root = server.rootMsgFolder;
+     var n = root.prettyName;
+     if (seen[n]) {
+         // Prevent duplicate folders in case of locally stored POP3 accounts
+     } else {
+         seen[n] = true;
+         NostalgyIterateSubfolders(root,f);
+     }
  }
 }
 
diff --git a/content/nostalgy.js b/content/nostalgy.js
index 1749737..8417b3e 100644
--- a/content/nostalgy.js
+++ b/content/nostalgy.js
@@ -678,7 +678,7 @@ function NostalgySearchSenderQuickFilter() {
 
     var values = { sender: sender, subject: subject, recipients: recipient };
     if (NostalgyCurrentFolder().displayRecipients)
-        fields = [ "recipients", "subject" ];
+        fields = [ "recipients", "sender", "subject" ];
     else
         fields = [ "sender", "subject" ];
 
diff --git a/debian/changelog b/debian/changelog
index 01f6271..927685f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+nostalgy (0.2.31-1~deb7u1) wheezy; urgency=medium
+
+  * Team upload
+  * Upload compatible version with recent icedove to stable
+    (Closes: #746235)
+
+ -- David Prévot <taf...@debian.org>  Mon, 05 May 2014 12:53:36 -0400
+
+nostalgy (0.2.31-1) unstable; urgency=low
+
+  * Team upload
+  * New upstream version
+  * Convert to dh short rules (Closes: #638499)
+  * Convert to format 3.0 (quilt)
+  * Fix RDF syntax
+  * debian/control:
+    - Bump standards version to 3.9.4
+    - Update Vcs to canonical URI
+    - Drop icedove-nostalgy references
+    - Use mozilla-devscripts automatic dependencies
+  * Make copyright Format 1.0 compliant
+  * Add watch
+
+ -- David Prévot <taf...@debian.org>  Tue, 08 Oct 2013 15:40:45 -0400
+
 nostalgy (0.2.30+svn219-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 49d121a..1da62c9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,18 +3,20 @@ Section: mail
 Priority: optional
 Maintainer: Debian Mozilla Extension Maintainers <pkg-mozext-maintainers@lists.alioth.debian.org>
 Uploaders: Guido Günther <a...@sigxcpu.org>
-Build-Depends: debhelper (>= 5), quilt, zip, cdbs
-Standards-Version: 3.9.1
-Vcs-Git: git://git.debian.org/pkg-mozext/nostalgy.git
-Vcs-Browser: http://git.debian.org/?p=pkg-mozext/nostalgy.git;a=summary
+Build-Depends: debhelper (>= 9), mozilla-devscripts
+Standards-Version: 3.9.4
+Vcs-Git: git://anonscm.debian.org/pkg-mozext/nostalgy.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-mozext/nostalgy.git
 Homepage: http://alain.frisch.fr/soft_mozilla.html
 
 Package: xul-ext-nostalgy
 Architecture: all
-Provides: icedove-nostalgy
-Depends: ${shlibs:Depends}, ${misc:Depends}, icedove (>= 1.5)
-Replaces: icedove-nostalgy (<< 0.2.22)
-Description: keyboard shortcut extension for icedove
+Depends: ${misc:Depends}, ${xpi:Depends}
+Recommends: ${xpi:Recommends}
+Breaks: ${xpi:Breaks}
+Provides: ${xpi:Provides}
+Enhances: ${xpi:Enhances}
+Description: keyboard shortcut extension for Icedove
  Nostalgy adds keyboard shortcuts to change the current folder, to move/copy
  selected messages into another folder, to add/remove/view tags; the selection
  of the target folder is made through an auto-completion box where you can type
diff --git a/debian/copyright b/debian/copyright
index 149603b..6685262 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,36 +1,32 @@
-This package was debianized by Guido Guenther <a...@sigxcpu.org> on
-Wed, 12 Mar 2008 17:57:51 +0100.
-
-It was downloaded from http://alain.frisch.fr/soft_mozilla.html
-
-Upstream Author: 
-
-    Alain Frisch <al...@frisch.fr>
-
-Copyright: 
-
-    Copyright (C) 2008 Alain Frisch
-
-License:
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Nostalgy
+Source: http://nostalgy.googlecode.com/svn
+Upstream-Contact: Alain Frisch <al...@frisch.fr>
+
+Files: *
+Copyright: 2008, Alain Frisch <al...@frisch.fr>
+License: Nostalgy
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
     1. The origin of this software must not be misrepresented; you must not
     claim that you wrote the original software. If you use this software
     in a product, an acknowledgment in the product documentation would be
     appreciated but is not required.
-
+ .
     2. Altered source versions must be plainly marked as such, and must not be
     misrepresented as being the original software.
-
+ .
     3. This notice may not be removed or altered from any source
     distribution.
 
-The Debian packaging is (C) 2008, Guido Guenther <a...@sigxcpu.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+Files: debian/*
+Copyright: 2008, Guido Guenther <a...@sigxcpu.org>
+License: GPL-2+
+ On Debian systems, the complete text of the GNU General Public
+ License can be found in `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/install b/debian/install
deleted file mode 100644
index 2fe9dc2..0000000
--- a/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-build/* 	/usr/share/mozilla/extensions/common/nostalgy@alain.frisch/
diff --git a/debian/links b/debian/links
deleted file mode 100644
index efa4d15..0000000
--- a/debian/links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/mozilla/extensions/common/nostalgy@alain.frisch usr/lib/icedove/extensions/nostalgy@alain.frisch
diff --git a/debian/patches/0001-Remove-cleanup-from-the-build.patch b/debian/patches/0001-Remove-cleanup-from-the-build.patch
new file mode 100644
index 0000000..e8a8061
--- /dev/null
+++ b/debian/patches/0001-Remove-cleanup-from-the-build.patch
@@ -0,0 +1,29 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <a...@sigxcpu.org>
+Date: Thu, 13 Mar 2008 04:58:56 -0400
+Subject: Remove cleanup from the build
+
+---
+ build.sh | 13 -------------
+ 1 file changed, 13 deletions(-)
+
+diff --git a/build.sh b/build.sh
+index 5fb40ae..370ae15 100755
+--- a/build.sh
++++ b/build.sh
+@@ -117,16 +117,3 @@ zip -r ../$APP_NAME.xpi *
+ 
+ cd "$ROOT_DIR"
+ 
+-echo "Cleanup..."
+-if [ $CLEAN_UP = 0 ]; then
+-  # save the jar file
+-  mv $TMP_DIR/chrome/$APP_NAME.jar .
+-else
+-  rm ./files
+-fi
+-
+-# remove the working files
+-rm -rf $TMP_DIR
+-echo "Done!"
+-
+-$AFTER_BUILD
diff --git a/debian/patches/0002-Fix-RDF-syntax.patch b/debian/patches/0002-Fix-RDF-syntax.patch
new file mode 100644
index 0000000..21226f0
--- /dev/null
+++ b/debian/patches/0002-Fix-RDF-syntax.patch
@@ -0,0 +1,46 @@
+From: =?UTF-8?q?David=20Pr=C3=A9vot?= <taf...@debian.org>
+Date: Mon, 7 Oct 2013 21:40:45 -0400
+Subject: Fix RDF syntax
+
+---
+ install.rdf | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/install.rdf b/install.rdf
+index d254814..a72b2da 100644
+--- a/install.rdf
++++ b/install.rdf
+@@ -14,27 +14,27 @@
+ 
+     <em:targetApplication>
+       <!-- Thunderbird -->
+-      <Description>
++      <RDF:Description>
+         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
+         <em:minVersion>1.5</em:minVersion>
+         <em:maxVersion>20.*</em:maxVersion>
+-      </Description>
++      </RDF:Description>
+     </em:targetApplication>
+     <em:targetApplication>
+       <!-- SeaMonkey -->
+-      <Description>
++      <RDF:Description>
+         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
+         <em:minVersion>1.1</em:minVersion>
+         <em:maxVersion>2.9.*</em:maxVersion>
+-      </Description>
++      </RDF:Description>
+     </em:targetApplication>
+     <em:targetApplication>
+       <!-- Postbox -->
+-      <Description>
++      <RDF:Description>
+         <em:id>post...@postbox-inc.com</em:id>
+         <em:minVersion>1.0b13</em:minVersion>
+         <em:maxVersion>3.*</em:maxVersion>
+-      </Description>
++      </RDF:Description>
+     </em:targetApplication>
+   </RDF:Description>
+ </RDF:RDF>
diff --git a/debian/patches/no-cleanup.diff b/debian/patches/no-cleanup.diff
deleted file mode 100644
index bf2f4c7..0000000
--- a/debian/patches/no-cleanup.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/build.sh b/build.sh
-index 5fb40ae..370ae15 100755
---- a/build.sh
-+++ b/build.sh
-@@ -117,16 +117,3 @@ zip -r ../$APP_NAME.xpi *
- 
- cd "$ROOT_DIR"
- 
--echo "Cleanup..."
--if [ $CLEAN_UP = 0 ]; then
--  # save the jar file
--  mv $TMP_DIR/chrome/$APP_NAME.jar .
--else
--  rm ./files
--fi
--
--# remove the working files
--rm -rf $TMP_DIR
--echo "Done!"
--
--$AFTER_BUILD
diff --git a/debian/patches/series b/debian/patches/series
index 4f2ae4d..b74c78c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-no-cleanup.diff
+0001-Remove-cleanup-from-the-build.patch
+0002-Fix-RDF-syntax.patch
diff --git a/debian/rules b/debian/rules
index 7225b0b..c73db76 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,15 @@
 #!/usr/bin/make -f
+%:                                                                                                                                    
+	dh $@ --with xul-ext --buildsystem=xul_ext
 
-include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+override_dh_auto_build:
+	./build.sh
+	dh_auto_build -O--buildsystem=xul_ext
 
-clean::
-	rm -rf build/
+override_dh_auto_install:
+	install-xpi nostalgy.xpi
+
+override_dh_clean::
+	rm -rf build
+	rm -f nostalgy.xpi
+	dh_clean -O--buildsystem=xul_ext
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..d08036a
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+ftp://ftp.mozilla.org/pub/mozilla.org/addons/2487/nostalgy-([\d\.]*)-[a-z+]+\.xpi
diff --git a/install.rdf b/install.rdf
index b9b6834..d254814 100644
--- a/install.rdf
+++ b/install.rdf
@@ -5,7 +5,7 @@
   <RDF:Description RDF:about="urn:mozilla:install-manifest"
                    em:id="nostalgy@alain.frisch"
                    em:name="Nostalgy"
-                   em:version="0.2.30"
+                   em:version="0.2.31"
                    em:creator="Alain Frisch"
                    em:description="Adds shortcuts to change folder, move message, with folder completion"
                    em:homepageURL="http://alain.frisch.fr/soft_mozilla.html";
@@ -17,7 +17,7 @@
       <Description>
         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
         <em:minVersion>1.5</em:minVersion>
-        <em:maxVersion>12.*</em:maxVersion>
+        <em:maxVersion>20.*</em:maxVersion>
       </Description>
     </em:targetApplication>
     <em:targetApplication>
@@ -33,7 +33,7 @@
       <Description>
         <em:id>post...@postbox-inc.com</em:id>
         <em:minVersion>1.0b13</em:minVersion>
-        <em:maxVersion>1.1.*</em:maxVersion>
+        <em:maxVersion>3.*</em:maxVersion>
       </Description>
     </em:targetApplication>
   </RDF:Description>

Attachment: signature.asc
Description: Digital signature

_______________________________________________
Pkg-mozext-maintainers mailing list
Pkg-mozext-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-mozext-maintainers

Reply via email to