[Pkg-mozext-commits] [SCM] mozilla noscript extension branch, master, updated. debian/2.6.4.3-1

[Jérémy Bobbio]

The following commit has been merged in the master branch:
commit 16a3187046511ff414315d44c23d49f8afaf843a
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Sat Jan 12 14:50:00 2013 +0100

    Use debhelper 8 and recent mozilla-devscripts logic

diff --git a/debian/compat b/debian/compat
index 7ed6ff8..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+8
diff --git a/debian/control b/debian/control
index 7861fec..e3f1da6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: web
 Priority: optional
 Maintainer: Debian Mozilla Extension Maintainers <pkg-mozext-maintainers at lists.alioth.debian.org>
 Uploaders: Damyan Ivanov <dmn at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), mozilla-devscripts (>= 0.19~)
+Build-Depends: debhelper (>= 8), mozilla-devscripts (>= 0.19~)
 Standards-Version: 3.9.3
 Homepage: http://noscript.net/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-mozext/noscript.git
diff --git a/debian/rules b/debian/rules
index 774c97c..e841df5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,36 +1,9 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-srcver=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(\([0-9]\+\):\)\?\(.*\)-.*/\3/p')
-
-# create .orig.tar.gz file from .xpi file
-get-orig-source: ../noscript-$(srcver).xpi
-	TARGET=`mktemp -d`/mozilla-noscript-$(srcver); \
-	mkdir $${TARGET} && \
-	unzip -a $< -d $${TARGET} && \
-	unzip -a $${TARGET}/chrome/noscript.jar -d $${TARGET}/chrome && \
-	rm -f $${TARGET}/chrome/noscript.jar && \
-	tar -czf $@ --transform "s,$${TARGET#/},mozilla-noscript-$(srcver)," $${TARGET}
-
-refresh-patches: 
-	rm -rf debian/patches
-	mkdir debian/patches
-	git format-patch upstream..upstream+patches -o debian/patches
-	TMP=`mktemp`; \
-	ls debian/patches > $${TMP}; \
-	mv $${TMP} debian/patches/series
-
 %:
-	dh --with xul-ext $@	
-
-override_dh_auto_build:
-	xpi-pack $(CURDIR) noscript.xpi
-
-override_dh_auto_install:
-	install-xpi --remove-license-files -x NoScript_License.txt -x chrome/content/noscript/NoScript_License.txt noscript.xpi
+	dh $@ --with xul-ext --buildsystem=xul_ext --parallel
 
-override_dh_auto_clean:
-	rm -f noscript.xpi
+override_dh_install:
+	rm -f debian/xul-ext-noscript/usr/share/xul-ext/noscript/NoScript_License.txt
+	rm -f debian/xul-ext-noscript/usr/share/xul-ext/noscript/GPL.txt

-- 
mozilla noscript extension