[Pkg-mozext-commits] [SCM] system tray extension for thunderbird/firefox alike apps branch, master, updated. debian/0.3.6-2-10-g2fb0b2c

[David Prévot]

The following commit has been merged in the master branch:
commit e29c94475c565c7d4d5b781dddf64e6cb96d1cef
Author: David Prévot <taffit at debian.org>
Date:   Tue Jul 9 20:13:49 2013 -0400

    Update remove-extra-license-file patch

diff --git a/debian/patches/remove-extra-license-file.patch b/debian/patches/remove-extra-license-file.patch
index 9317e72..650fb9d 100644
--- a/debian/patches/remove-extra-license-file.patch
+++ b/debian/patches/remove-extra-license-file.patch
@@ -1,22 +1,16 @@
 From: Debian Mozilla Extension Maintainers <pkg-mozext-maintainers at lists.alioth.debian.org>
 Date: Sun, 24 Jul 2011 17:44:41 +0200
 Subject: remove extra license file
-
----
- SConstruct |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index 50845fd..1157181 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -28,8 +28,6 @@ r = env.Install('dist', 'chrome.manifest')
- objs.append(r)
- r = env.Install('dist', 'install.rdf')
- objs.append(r)
--r = env.Install('dist', 'License.txt')
--objs.append(r)
+Reviewed-by: David Prévot <taffit at debian.org>
+Last-Update: 2013-07-09
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -121,7 +121,7 @@
  
- r = env.Install('dist/defaults/preferences', 'defaults/preferences/prefs.js')
- objs.append(r)
--- 
+ # The sources for the XPI file. Uses variables defined in the included
+ # Makefiles.
+-xpi_includes := $(license) \
++xpi_includes := \
+              $(install_rdf) \
+              $(chrome_manifest) \
+              $(preferences_dir)/prefs.js \

-- 
system tray extension for thunderbird/firefox alike apps