[Pkg-mozext-commits] [firetray] 31/33: Refresh patches

David Prévot taffit at moszumanska.debian.org
Fri Oct 23 21:35:12 UTC 2015


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

taffit pushed a commit to branch master
in repository firetray.

commit 4b6d1b21ed7a38f5ced68bf4b57d78aab38fe7b7
Author: David Prévot <david at tilapin.org>
Date:   Fri Oct 23 17:14:42 2015 -0400

    Refresh patches
    
    Git-Dch: Ignore
---
 debian/patches/0001-Remove-extra-license-file.patch        |  4 ++--
 ...2-Do-not-display-release-notes-after-installation.patch |  4 ++--
 debian/patches/0003-Do-not-ship-useless-winnt-files.patch  | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/debian/patches/0001-Remove-extra-license-file.patch b/debian/patches/0001-Remove-extra-license-file.patch
index 0c24988..c2a98b6 100644
--- a/debian/patches/0001-Remove-extra-license-file.patch
+++ b/debian/patches/0001-Remove-extra-license-file.patch
@@ -8,10 +8,10 @@ Subject: Remove extra license file
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/Makefile b/src/Makefile
-index eaa7f7d..fac5c3f 100755
+index b1989bf..512f2f7 100755
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -122,7 +122,7 @@ components_sources := $(wildcard $(components_dir)/*.js)
+@@ -123,7 +123,7 @@ components_sources := $(wildcard $(components_dir)/*.js)
  
  # The sources for the XPI file. Uses variables defined in the included
  # Makefiles.
diff --git a/debian/patches/0002-Do-not-display-release-notes-after-installation.patch b/debian/patches/0002-Do-not-display-release-notes-after-installation.patch
index db28590..ce2d2e5 100644
--- a/debian/patches/0002-Do-not-display-release-notes-after-installation.patch
+++ b/debian/patches/0002-Do-not-display-release-notes-after-installation.patch
@@ -7,10 +7,10 @@ Subject: Do not display release notes after installation
  1 file changed, 1 deletion(-)
 
 diff --git a/src/modules/FiretrayHandler.jsm b/src/modules/FiretrayHandler.jsm
-index 78edf1c..38015e0 100644
+index 1a15bf8..638efea 100644
 --- a/src/modules/FiretrayHandler.jsm
 +++ b/src/modules/FiretrayHandler.jsm
-@@ -670,7 +670,6 @@ firetray.MailChatPrefListener = new PrefListener(
+@@ -681,7 +681,6 @@ firetray.MailChatPrefListener = new PrefListener(
  firetray.VersionChangeHandler = {
  
    showReleaseNotes: function() {
diff --git a/debian/patches/0003-Do-not-ship-useless-winnt-files.patch b/debian/patches/0003-Do-not-ship-useless-winnt-files.patch
index 64bcf49..1a95200 100644
--- a/debian/patches/0003-Do-not-ship-useless-winnt-files.patch
+++ b/debian/patches/0003-Do-not-ship-useless-winnt-files.patch
@@ -7,7 +7,7 @@ Subject: Do not ship useless winnt files
  1 file changed, 1 insertion(+), 5 deletions(-)
 
 diff --git a/src/Makefile b/src/Makefile
-index fac5c3f..f254994 100755
+index 512f2f7..ff81aed 100755
 --- a/src/Makefile
 +++ b/src/Makefile
 @@ -97,8 +97,6 @@ chrome_sources := $(chrome_sources_js)								\
@@ -19,12 +19,12 @@ index fac5c3f..f254994 100755
                 $(wildcard $(chrome_source_root)/locale/*/*.dtd)					\
                 $(wildcard $(chrome_source_root)/locale/*/*.properties)
  
-@@ -110,9 +108,7 @@ modules_sources := $(wildcard $(modules_dir)/*.js)		\
- 		$(wildcard $(modules_dir)/*.jsm)		\
- 		$(wildcard $(modules_dir)/ctypes/*.jsm)		\
- 		$(wildcard $(modules_dir)/ctypes/linux/*.jsm)	\
--		$(wildcard $(modules_dir)/ctypes/winnt/*.jsm)	\
--		$(wildcard $(modules_dir)/linux/*.jsm)		\
+@@ -111,9 +109,7 @@ modules_sources := $(wildcard $(modules_dir)/*.js)			\
+ 		$(wildcard $(modules_dir)/ctypes/*.jsm)			\
+ 		$(wildcard $(modules_dir)/ctypes/linux/*.jsm)		\
+ 		$(wildcard $(modules_dir)/ctypes/linux/gtk?/*.jsm)	\
+-		$(wildcard $(modules_dir)/ctypes/winnt/*.jsm)		\
+-		$(wildcard $(modules_dir)/linux/*.jsm)			\
 -		$(wildcard $(modules_dir)/winnt/*.jsm)
 +		$(wildcard $(modules_dir)/linux/*.jsm)
  

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



More information about the Pkg-mozext-commits mailing list