[Pkg-mozext-commits] [SCM] browser interface based on natural language input branch, master, updated. debian/0.6.1_pre20111123-1-13-g8cd3c74

[Gabriele Giacone]

The following commit has been merged in the master branch:
commit 29e0b4c35542e7912ee5e476f113cf41b277faaf
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Tue Sep 4 00:52:49 2012 +0200

    Remove jquery.js from upstream tarball.

diff --git a/debian/copyright b/debian/copyright
index afc7441..bd80c83 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,14 +25,6 @@ Files: modules/oauth.js
 Copyright: 2008, Netflix Inc.
 License: Apache-2
 
-Files: scripts/jquery.js
-Copyright: 2009-2010, John Resig <jeresig at gmail.com>
-           2009-2010, The Dojo Foundation
-License: MIT or GPL-2 or BSD
- This software is dual licensed under the MIT or GPL-2 licenses.
- It includes Sizzle.js <http://sizzlejs.com> which is licensed under
- the MIT or BSD or GPL-2.
-
 Files: scripts/pixastic.js
 Copyright: 2008 Jacob Seidelin <cupboy at gmail.com>
 License: MIT
@@ -101,23 +93,6 @@ License: LGPL-2.1+
  The complete text of the GNU Lesser General Public License can
  be found in the file `/usr/share/common-licenses/LGPL-2.1'.
 
-License: GPL-2
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; under version 2 of the License.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- .
- The complete text of the GNU General Public License version 2 can be found in
- the file `/usr/share/common-licenses/GPL-2'.
-
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
diff --git a/debian/rules b/debian/rules
index 6ee06ec..0b3a01d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,12 +14,10 @@ override_dh_auto_configure:
 override_dh_auto_install:
 	install-xpi -i /usr/share/xul-ext/$(NAME) $(PKGNAME)
 
-	rm $(USRSHARE)/scripts/jquery.js
 	ln -s /usr/share/javascript/jquery/jquery.js \
 		$(USRSHARE)/scripts/jquery.js
 	rm -v $(USRSHARE)/scripts/gettext/[CR]*
 
-	rm $(USRSHARE)/standard-feeds/scripts/jquery.js
 	ln -s /usr/share/javascript/jquery/jquery.js \
 		$(USRSHARE)/standard-feeds/scripts/jquery.js
 	rm -v $(USRSHARE)/standard-feeds/scripts/gettext/[CR]*
@@ -40,5 +38,6 @@ VER=$(shell sed -n '/<version>/s/^.*>\(.*\)<\/.*/\1/p' install.rdf)~pre$(shell d
 TMPDIR=tmp-ubiquity
 get-orig-source:
 	hg clone https://bitbucket.org/satyr/ubiquity $(TMPDIR)
-	cd $(TMPDIR)/ubiquity && tar Jcf ../../../ubiquity-extension_$(VER).orig.tar.xz .
+	cd $(TMPDIR)/ubiquity && rm scripts/jquery.js && \
+		tar Jcf ../../../ubiquity-extension_$(VER).orig.tar.xz .
 	rm -rf $(TMPDIR) && dch -v $(VER)-1 "Hg snapshot."

-- 
browser interface based on natural language input