Package: mozilla-firefox-adblock Version: 0.5.3.043-0.1 Severity: normal Tags: patch
due to orphaned nature of this package, I proceeded with fresh upstream release and also reorganized installation so it confirms recent changes in iceweasel installation. Please see attached patch for changes. I am uploading .deb into delayed queue -- System Information: Debian Release: 4.0 APT prefers unstable APT policy: (990, 'unstable') Architecture: i386 (i686) Shell: /bin/sh linked to /bin/bash Kernel: Linux 2.6.18-1-686 Locale: LANG=ru_RU.KOI8-R, LC_CTYPE=ru_RU.KOI8-R (charmap=KOI8-R) Versions of packages mozilla-firefox-adblock depends on: ii firefox 2.0.0.1+dfsg-1 Transition package for iceweasel r ii iceweasel 2.0.0.1+dfsg-1 lightweight web browser based on M mozilla-firefox-adblock recommends no packages. -- no debconf information
diff -Naur mozilla-firefox-adblock-0.5.2.039/debian/changelog mozilla-firefox-adblock-0.5.3.043/debian/changelog --- mozilla-firefox-adblock-0.5.2.039/debian/changelog 2007-01-25 12:54:18.000000000 -0500 +++ mozilla-firefox-adblock-0.5.3.043/debian/changelog 2007-01-25 13:02:18.000000000 -0500 @@ -1,3 +1,16 @@ +mozilla-firefox-adblock (0.5.3.043-0.1) unstable; urgency=low + + * Non-maintainer upload (NMU) + * New upstream release (due to neglect over this package, I've decided to + proceed further with NMU and provide the latest stable release) + * Adjusted maxVersion in install.rdf to correspond iceweasel versioning + * Proper installation of the extension with symlinks under + /usr/lib/iceweasel/extension (Closes: #381337,385761) + * Added debian/watch and debian/dh_wraporig script to provide trouble-less + upgrades to new releases, as well as QA monitoring for fresh upstream + + -- Yaroslav Halchenko <[EMAIL PROTECTED]> Thu, 25 Jan 2007 12:40:26 -0500 + mozilla-firefox-adblock (0.5.2.039-4.1) unstable; urgency=low * Non-maintainer upload diff -Naur mozilla-firefox-adblock-0.5.2.039/debian/control mozilla-firefox-adblock-0.5.3.043/debian/control --- mozilla-firefox-adblock-0.5.2.039/debian/control 2007-01-25 12:54:18.000000000 -0500 +++ mozilla-firefox-adblock-0.5.3.043/debian/control 2007-01-25 13:02:18.000000000 -0500 @@ -4,13 +4,13 @@ Maintainer: Jacek Politowski <[EMAIL PROTECTED]> Build-Depends: debhelper (>= 4.0.0) Build-Depends-Indep: unzip -Standards-Version: 3.6.2 +Standards-Version: 3.7.2 Package: mozilla-firefox-adblock Architecture: all -Depends: firefox (>= 1.0.6) -Description: AdBlock extension for the Firefox web browser - The AdBlock extension adds to Firefox browser an ability to filter +Depends: iceweasel | firefox (>= 1.0.6) +Description: AdBlock extension for the IceWeasel web browser + The AdBlock extension adds to IceWeasel browser an ability to filter unwanted objects on webpages. Filters can be specified using wildcards in order to block e.g. all images or JavaScript files from specific servers or directories. diff -Naur mozilla-firefox-adblock-0.5.2.039/debian/dh_wraporig mozilla-firefox-adblock-0.5.3.043/debian/dh_wraporig --- mozilla-firefox-adblock-0.5.2.039/debian/dh_wraporig 1969-12-31 19:00:00.000000000 -0500 +++ mozilla-firefox-adblock-0.5.3.043/debian/dh_wraporig 2007-01-25 13:02:18.000000000 -0500 @@ -0,0 +1,114 @@ +#!/bin/bash +#-------------------------- =+- Shell script -+= -------------------------- +# +# @file dh_wraporig +# @date Tue Apr 25 17:09:12 2006 +# @brief +# +# CVS version control block - do not edit manually +# $RCSfile: dh_wraporig,v $ +# $Source: /home/cvs/yoh/soft/dh_wraporig,v $ +# +# Created: Tue Apr 25 17:09:12 2006 +# Commited: $Date: 2007/01/25 16:56:40 $ +# Revision: $Revision: 1.3 $ +# +# Yaroslav Halchenko [EMAIL PROTECTED], [EMAIL PROTECTED] +# web: http://www.onerussian.com & [EMAIL PROTECTED] +# e-mail: [EMAIL PROTECTED] ICQ#: 60653192 +# +# DESCRIPTION (NOTES): +# +# A very simple script to wrap provided files into a tarball. +# Can be used to be called by uscan whenever new .xpi for a mozilla +# extension is available from the upstream. Also it can be used to checkout +# upstream source from SVN, given the version to get and the path. Or to +# repackage .zip files into .tar.gz +# +# COPYRIGHT: Yaroslav Halchenko 2006 +# +# LICENSE: +# +# 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; either version 2 of the License, or +# (at your option) any later version. +# +# 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 St, Fifth Floor, Boston, +# MA 02110-1301, USA. +# +# On Debian system see /usr/share/common-licenses/GPL for the full license. +# +#-----------------\____________________________________/------------------ +set -e + +uversion= +sname= +call=svn-upgrade +ddir="../tarballs" + +[ -f debian/dh_wraporig.local ] && source debian/dh_wraporig.local + +while [ $# -ge 0 ] + do + case $1 in + --upstream-version) uversion=$2; shift; shift + ;; + --source-name) sname=$2; shift; shift + ;; + --call) call=$2; shift; shift + ;; + *) + break; + ;; + esac +done + +if [ -z "$uversion" ]; then + echo "Please provide upstream version, so I didn't have to guess" + exit 1; +fi + +if [ -z "$sname" ]; then + echo "Source name wasn't given -- trying to guess" + sname=`grep -h ^Source: debian/control control 2>/dev/null | awk '{print $2;}'` + if [ -z $sname ]; then + echo "Couldn't guess -- must be no {debian/,}control file" + exit 1 + fi + echo "Source name: $sname" +fi + +wdir="${sname}-${uversion}.orig" +ofile="$wdir.tar.gz" + +# remove if such exists -- must be leftovers... +rm -rf "$wdir" +if [ ! -z "$source" ]; then + # handle different sources. 1st it is just SVN checkout + if [[ "$source" =~ "svn export.*" ]]; then + rm -rf $* + eval $source ${wdir} + else + echo "Do not know how to handle source $source" + exit 1 + fi +else + mkdir "$wdir" + mv $* $wdir +fi + +tar -cf- "$wdir" | gzip -9 > "$ofile" +rm -rf "$wdir" +mv "$ofile" "$ddir" + +[ ! -z "$call" ] && $call --upstream-version $uversion "$ddir/$ofile" + +#"$ofile" diff -Naur mozilla-firefox-adblock-0.5.2.039/debian/dh_wraporig.local mozilla-firefox-adblock-0.5.3.043/debian/dh_wraporig.local --- mozilla-firefox-adblock-0.5.2.039/debian/dh_wraporig.local 1969-12-31 19:00:00.000000000 -0500 +++ mozilla-firefox-adblock-0.5.3.043/debian/dh_wraporig.local 2007-01-25 13:02:18.000000000 -0500 @@ -0,0 +1,2 @@ +call=uupdate +ddir=../ diff -Naur mozilla-firefox-adblock-0.5.2.039/debian/dirs mozilla-firefox-adblock-0.5.3.043/debian/dirs --- mozilla-firefox-adblock-0.5.2.039/debian/dirs 1969-12-31 19:00:00.000000000 -0500 +++ mozilla-firefox-adblock-0.5.3.043/debian/dirs 2007-01-25 13:02:18.000000000 -0500 @@ -0,0 +1,4 @@ +/etc/mozilla-extensions +usr/share/mozilla-extensions/adblock/chrome +usr/share/mozilla-extensions/adblock/components +usr/share/mozilla-extensions/adblock/uninstall diff -Naur mozilla-firefox-adblock-0.5.2.039/debian/links mozilla-firefox-adblock-0.5.3.043/debian/links --- mozilla-firefox-adblock-0.5.2.039/debian/links 1969-12-31 19:00:00.000000000 -0500 +++ mozilla-firefox-adblock-0.5.3.043/debian/links 2007-01-25 13:02:18.000000000 -0500 @@ -0,0 +1,3 @@ +etc/mozilla-extensions/adblock.js usr/share/mozilla-extensions/adblock/defaults/preferences/adblock.js +usr/share/mozilla-extensions/adblock usr/lib/iceweasel/extensions/{34274bf4-1d97-a289-e984-17e546307e4f} +usr/share/mozilla-extensions/adblock usr/lib/firefox/extensions/{34274bf4-1d97-a289-e984-17e546307e4f} diff -Naur mozilla-firefox-adblock-0.5.2.039/debian/patch/install_rdf.patch mozilla-firefox-adblock-0.5.3.043/debian/patch/install_rdf.patch --- mozilla-firefox-adblock-0.5.2.039/debian/patch/install_rdf.patch 2007-01-25 12:54:18.000000000 -0500 +++ mozilla-firefox-adblock-0.5.3.043/debian/patch/install_rdf.patch 2007-01-25 13:02:18.000000000 -0500 @@ -1,15 +1,11 @@ ---- install.rdf 2005-09-23 19:10:18.610940604 +0200 -+++ install.rdf-new 2004-09-02 11:07:20.000000000 +0200 -@@ -18,10 +18,10 @@ - <em:targetApplication> +--- install.rdf.orig 2007-01-25 12:48:26.000000000 -0500 ++++ install.rdf 2007-01-25 12:48:34.000000000 -0500 +@@ -16,7 +16,7 @@ <Description> - <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> <!-- FireFox GUID --> -- <em:minVersion>0.7+</em:minVersion> <!-- How low should this be? We can install before 0.9, -+ <em:minVersion>0.9</em:minVersion> <!-- How low should this be? We can install before 0.9, - but this file won't be parsed on anything before 0.9. --> - -- <em:maxVersion>.10+</em:maxVersion> <!-- similarly, how high does this go? [It can't exceed the highest browser-release; foolish way to keep users sandboxed, eh? ] --> -+ <em:maxVersion>1.0.10</em:maxVersion> <!-- similarly, how high does this go? [It can't exceed the highest browser-release; foolish way to keep users sandboxed, eh? ] --> - + <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> + <em:minVersion>0.7</em:minVersion> +- <em:maxVersion>2.0a3</em:maxVersion> ++ <em:maxVersion>2.0.0.*</em:maxVersion> </Description> </em:targetApplication> + diff -Naur mozilla-firefox-adblock-0.5.2.039/debian/rules mozilla-firefox-adblock-0.5.3.043/debian/rules --- mozilla-firefox-adblock-0.5.2.039/debian/rules 2007-01-25 12:54:18.000000000 -0500 +++ mozilla-firefox-adblock-0.5.3.043/debian/rules 2007-01-25 13:02:18.000000000 -0500 @@ -1,6 +1,10 @@ #!/usr/bin/make -f -DEB_DESTDIR := debian/mozilla-firefox-adblock +EXT_NAME=adblock +DEB_DESTDIR := debian/mozilla-firefox-$(EXT_NAME) +EXT_DIR=usr/share/mozilla-extensions/$(EXT_NAME) + +export DH_OPTIONS binary: binary-indep binary-arch @@ -17,29 +21,29 @@ dh_clean rm -f id build-stamp - -id: build + +patch: patch -p0 debian/tmp/install.rdf < debian/patch/install_rdf.patch - sed '/<em:targetApplication>/,/<\/em:targetApplication>/d;/em:id/!d;s/.*{/{/;s/}.*/}/' debian/tmp/install.rdf > id -install: build id +install: build patch dh_testdir dh_testroot + dh_installdirs + + install -m 644 debian/tmp/install.rdf debian/tmp/chrome.manifest $(DEB_DESTDIR)/$(EXT_DIR)/ + install -m 644 debian/tmp/chrome/adblock.jar $(DEB_DESTDIR)/$(EXT_DIR)/chrome/ + install -m 644 debian/tmp/components/nsAdblock.js $(DEB_DESTDIR)/$(EXT_DIR)/components/ + install -m 644 debian/tmp/defaults/preferences/adblock.js $(DEB_DESTDIR)/etc/mozilla-extensions/adblock.js - install -d $(DEB_DESTDIR)/usr/lib/mozilla-firefox/extensions/$(shell cat id)/chrome/ - install -d $(DEB_DESTDIR)/usr/lib/mozilla-firefox/extensions/$(shell cat id)/uninstall/ - install -m 644 debian/tmp/install.rdf $(DEB_DESTDIR)/usr/lib/mozilla-firefox/extensions/$(shell cat id)/ - install -m 644 debian/tmp/chrome/adblock.jar $(DEB_DESTDIR)/usr/lib/mozilla-firefox/extensions/$(shell cat id)/chrome/ - install -m 644 debian/Uninstall $(DEB_DESTDIR)/usr/lib/mozilla-firefox/extensions/$(shell cat id)/uninstall/ - install -d $(DEB_DESTDIR)/var/lib/mozilla-firefox/extensions.d/ - echo "extension,$(shell cat id)" > $(DEB_DESTDIR)/var/lib/mozilla-firefox/extensions.d/50adblock.ext + install -m 644 debian/Uninstall $(DEB_DESTDIR)/$(EXT_DIR)/uninstall/ # Build architecture-independent files here. binary-indep: build install dh_testdir dh_testroot dh_installdocs - dh_installchangelogs + dh_installchangelogs + dh_link dh_compress dh_fixperms dh_installdeb diff -Naur mozilla-firefox-adblock-0.5.2.039/debian/watch mozilla-firefox-adblock-0.5.3.043/debian/watch --- mozilla-firefox-adblock-0.5.2.039/debian/watch 1969-12-31 19:00:00.000000000 -0500 +++ mozilla-firefox-adblock-0.5.3.043/debian/watch 2007-01-25 13:02:18.000000000 -0500 @@ -0,0 +1,7 @@ +# watch control file for uscan +# Run the "uscan" command to check for upstream updates and more. +# Site Directory Pattern Version Script +version=3 + +http://releases.mozilla.org/pub/mozilla.org/extensions/adblock/adblock-([0-9.]*)-.*\.xpi \ + debian debian/dh_wraporig
