reverted: --- imagezoom-0.3.1/debian/Uninstall +++ imagezoom-0.3.1.orig/debian/Uninstall @@ -1,2 +0,0 @@ -register global package imagezoom -register global locale en-US diff -u imagezoom-0.3.1/debian/copyright imagezoom-0.3.1/debian/copyright --- imagezoom-0.3.1/debian/copyright +++ imagezoom-0.3.1/debian/copyright @@ -1,7 +1,9 @@ This package was Debianized by Yaroslav Halchenko - on Wed, 7 Sep 2005 14:54:48 -1000. + on Wed, 7 Sep 2005 14:54:48 -1000 +and improved to make use od xpi.mk in Ubuntu +by Sasa Bodiroza on Thu, 30 Mar 2008 21:30:00 +0200. -Pre 0.2.5: +Pre 0.2.5, from 0.3.1: It was downloaded from http://imagezoom.yellowgorilla.net/ . The .xpi file there was unpacked using 'unzip' to construct the original source archive. reverted: --- imagezoom-0.3.1/debian/dirs +++ imagezoom-0.3.1.orig/debian/dirs @@ -1,4 +0,0 @@ -/etc/mozilla-extensions -usr/share/mozilla-extensions/imagezoom/chrome -usr/share/mozilla-extensions/imagezoom/uninstall - reverted: --- imagezoom-0.3.1/debian/README.Debian +++ imagezoom-0.3.1.orig/debian/README.Debian @@ -1,10 +0,0 @@ -mozilla-imagezoom - -Debian specific notes: ----------------------- - -If you have any recommendations, please feel free to either file a bug -report if the package gets accepted to Debian, or just email it to me -. - -Enjoy reverted: --- imagezoom-0.3.1/debian/dh_wraporig +++ imagezoom-0.3.1.orig/debian/dh_wraporig @@ -1,114 +0,0 @@ -#!/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: 2006/04/25 21:30:03 $ -# Revision: $Revision: 1.1 $ -# -# Yaroslav Halchenko CS@UNM, CS@NJIT -# web: http://www.onerussian.com & PSYCH@RUTGERS -# e-mail: yoh@onerussian.com 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 - -[ -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" -ddir="../tarballs" - -# 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" reverted: --- imagezoom-0.3.1/debian/extensions.d +++ imagezoom-0.3.1.orig/debian/extensions.d @@ -1 +0,0 @@ -extension,{1A2D0EC4-75F5-4c91-89C4-3656F6E44B68} diff -u imagezoom-0.3.1/debian/rules imagezoom-0.3.1/debian/rules --- imagezoom-0.3.1/debian/rules +++ imagezoom-0.3.1/debian/rules @@ -1,47 +1,31 @@ -#! /usr/bin/make -f +#!/usr/bin/make -f -export DH_OPTIONS +# name the package (as in debian/control) that will ship the extension +MOZ_EXTENSION_PKG := mozilla-imagezoom -dtmp = $(CURDIR)/debian/mozilla-imagezoom -extdir = $(dtmp)/usr/share/mozilla-extensions/imagezoom -uuid = 1A2D0EC4-75F5-4c91-89C4-3656F6E44B68 - -build: - -clean: - dh_testdir - dh_testroot - dh_clean - -install: - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - cd chrome; zip -r $(extdir)/chrome/imagezoom.jar . -x \*/.svn\* ; cd .. - - install -m 644 defaults/preferences/imagezoom-defaults.js $(dtmp)/etc/mozilla-extensions/imagezoom.js - install -m 644 debian/chrome.d debian/extensions.d install.rdf \ - chrome.manifest $(extdir) - install -m 644 debian/Uninstall $(extdir)/uninstall - -binary-arch: - -binary-indep: DH_OPTIONS=-i -binary-indep: install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_link - dh_compress - dh_fixperms - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb +# xpi.mk will auto detect the .xpi in your package. if you want to do it +# explicit, use this variable +#MOZ_XPI_FILE := yourextension.xpi -binary: binary-indep +# xpi.mk tries to auto detect the extension manager id (em:id) from the .xpis +# install.rdf file. There might be cases where this doesn't work. use the following +# variable to explicitly define an extension ID and disable auto detection +#MOZ_EM_ID := {xxxxxxx-xxxx-xxxx} + +# xpi.mk will run a build command before packaging an .xpi file. you can use this +# to produce an .xpi. if you define this, the clean rule will remove any .xpi file +# found in the top level directory +#MOZ_XPI_BUILD_COMMAND = sh build.sh + +build/mozilla-imagezoom:: + cd chrome ; zip -r imagezoom.jar * ; cd .. ; + zip -r imagezoom.xpi . -i chrome/imagezoom.jar defaults/\* * -x debian/\* temp-xpi-\* + +clean:: + if [ -f "imagezoom.xpi" ] ; then rm imagezoom.xpi; fi + if [ -f "chrome/imagezoom.jar" ] ; then rm chrome/imagezoom.jar ; fi + + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/mozilla-devscripts/xpi.mk -.PHONY: clean install binary-indep binary-arch binary build diff -u imagezoom-0.3.1/debian/compat imagezoom-0.3.1/debian/compat --- imagezoom-0.3.1/debian/compat +++ imagezoom-0.3.1/debian/compat @@ -1 +1 @@ -4 +5 diff -u imagezoom-0.3.1/debian/control imagezoom-0.3.1/debian/control --- imagezoom-0.3.1/debian/control +++ imagezoom-0.3.1/debian/control @@ -1,16 +1,16 @@ Source: imagezoom Section: web Priority: optional -Maintainer: Yaroslav Halchenko +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Yaroslav Halchenko +Build-Depends: debhelper (>= 5), cdbs, mozilla-devscripts (>= 0.5~), zip +Vcs-Bzr: https://code.launchpad.net/~ubuntu-dev/firefox-extensions/mozilla-imagezoom.ubuntu/ Standards-Version: 3.7.3 -Build-Depends: debhelper (>= 5.0.0) -Build-Depends-Indep: zip Homepage: http://imagezoom.yellowgorilla.net Package: mozilla-imagezoom Architecture: all -Depends: iceweasel | firefox | mozilla-firefox | iceape-browser | iceape-mailnews | mozilla-browser | mozilla-mailnews | icedove | thunderbird | mozilla-thunderbird -Conflicts: mozilla-firefox (<< 0.99+1.0RC1-3) +Depends: firefox | firefox-3.0 | firefox-2 Description: Mozilla context menu option to zoom current image Easy to use extension that works with Firefox, Mozilla and Thunderbird. . reverted: --- imagezoom-0.3.1/debian/postinst +++ imagezoom-0.3.1.orig/debian/postinst @@ -1,38 +0,0 @@ -#! /bin/sh -set -e - -# A cut-down version of 'which' from debianutils. -searchpath () { - PROGRAM="$1" - IFS_SAVE="$IFS" - IFS=: - RET=1 - for ELEMENT in $PATH; do - if [ -z "$ELEMENT" ]; then - ELEMENT=. - fi - if [ -f "$ELEMENT/$PROGRAM" ] && \ - [ -x "$ELEMENT/$PROGRAM" ]; then - RET=0 - break - fi - done - IFS="$IFS_SAVE" - return "$RET" -} - -if [ "$1" = configure ]; then - for update in update-mozilla-chrome \ - update-iceape-chrome \ - update-mozilla-snapshot-chrome \ - update-mozilla-firefox-chrome \ - update-mozilla-thunderbird-chrome; do - if searchpath "$update"; then - "$update" - fi - done -fi - -#DEBHELPER# - -exit 0 diff -u imagezoom-0.3.1/debian/changelog imagezoom-0.3.1/debian/changelog --- imagezoom-0.3.1/debian/changelog +++ imagezoom-0.3.1/debian/changelog @@ -1,3 +1,14 @@ +imagezoom (0.3.1-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes (LP: #227577): + - Repackaged using XPI.TEMPLATE + - In debian/rules: + - added build/mozilla-imagezoom rule to make a imagezoom.xpi file + - added clean rule to cleanup the imagezoom.xpi file + - Modify Maintainer value to match Debian-Maintainer-Field Spec + + -- Nathan Handler Sat, 07 Jun 2008 16:04:19 -0500 + imagezoom (0.3.1-1) unstable; urgency=low * New upstream release @@ -6,12 +17,53 @@ -- Yaroslav Halchenko Mon, 31 Mar 2008 20:24:30 -0400 +imagezoom (0.3.1-0ubuntu1) hardy; urgency=low + + * New upstream release (LP: #209990) + * Repackaged using XPI.TEMPLATE + * In debian/rules: + - added build/mozilla-imagezoom rule to make a imagezoom.xpi file + - added clean rule to cleanup the imagezoom.xpi file + + -- Sasa Bodiroza Sun, 6 Apr 2008 02:30:00 +0200 + +imagezoom (0.3-1ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - Remove mozilla-browser and mozilla-mailnews from depends. + - Remove the icedove, iceweasel and iceape symlinks in debian/links + - Change the thunderbird symlink from usr/lib/thunderbird to + usr/lib/mozilla-thunderbird in debian/links + - Remove the Depends on iceweasel, iceape-browser, iceape-mailnews, icedove, + mozilla-firefox and thunderbird in debian/control + - Remove update-iceape-chrome from debian/postinst and debian/postrm + * Modify Maintainer value to match Debian-Maintainer-Field Spec + + -- Stephan Hermann Sat, 5 May 2007 20:14:35 +0200 + imagezoom (0.3-1) unstable; urgency=low * New upstream release -- Yaroslav Halchenko Fri, 27 Apr 2007 17:45:47 -0400 +imagezoom (0.2.7-8ubuntu2) feisty; urgency=low + + * Remove mozilla-browser and mozilla-mailnews from depends. + + -- Michael Bienia Wed, 14 Feb 2007 13:53:46 +0100 + +imagezoom (0.2.7-8ubuntu1) feisty; urgency=low + + * Remove the icedove, iceweasel and iceape symlinks in debian/links + * Change the thunderbird symlink from usr/lib/thunderbird to + usr/lib/mozilla-thunderbird in debian/links + * Remove the Depends on iceweasel, iceape-browser, iceape-mailnews, icedove, + mozilla-firefox and thunderbird in debian/control + * Remove update-iceape-chrome from debian/postinst and debian/postrm + + -- Albin Tonnerre Sun, 4 Feb 2007 15:43:23 +0100 + imagezoom (0.2.7-8) unstable; urgency=low * Depends on the choice of iceape-browser | iceape-mailnews | icedove, as @@ -124,0 +177 @@ + reverted: --- imagezoom-0.3.1/debian/chrome.d +++ imagezoom-0.3.1.orig/debian/chrome.d @@ -1,14 +0,0 @@ -content,install,url,jar:resource:/chrome/imagezoom.jar!/content/ -locale,install,url,jar:resource:/chrome/imagezoom.jar!/locale/en-US/ -locale,install,url,jar:resource:/chrome/imagezoom.jar!/locale/fr-FR/ -locale,install,url,jar:resource:/chrome/imagezoom.jar!/locale/sl-SI/ -locale,install,url,jar:resource:/chrome/imagezoom.jar!/locale/zh-TW/ -locale,install,url,jar:resource:/chrome/imagezoom.jar!/locale/ja-JP/ -locale,install,url,jar:resource:/chrome/imagezoom.jar!/locale/de-DE/ -locale,install,url,jar:resource:/chrome/imagezoom.jar!/locale/cs-CZ/ -locale,install,url,jar:resource:/chrome/imagezoom.jar!/locale/hu-HU/ -locale,install,url,jar:resource:/chrome/imagezoom.jar!/locale/ko-KR/ -locale,install,url,jar:resource:/chrome/imagezoom.jar!/locale/es-ES/ -locale,install,url,jar:resource:/chrome/imagezoom.jar!/locale/es-AR/ -locale,install,url,jar:resource:/chrome/imagezoom.jar!/locale/it-IT/ -skin,install,url,jar:resource:/chrome/imagezoom.jar!/skin/classic/imagezoom/ reverted: --- imagezoom-0.3.1/debian/watch +++ imagezoom-0.3.1.orig/debian/watch @@ -1,14 +0,0 @@ -# watch control file for uscan -# Run the "uscan" command to check for upstream updates and more. -# Site Directory Pattern Version Script -version=3 - -# this rule will catch all new releases which even were not announced -- we don't want that -#http://imagezoom.yellowgorilla.net/versions/releases/(\d[\d.]+)/imagezoom_([\d.]+)\.xpi - -# this one looks on what was announced and feeds it to the wrapper to create tarball -#http://imagezoom.yellowgorilla.net versions/releases/(?:\d[\d.]+)/imagezoom_([\d.]+)\.xpi \ -# debian debian/dh_wraporig -# pattern got changed on 07/30/2006 -http://imagezoom.yellowgorilla.net imagezoom_([\d.]+)\.xpi \ - debian debian/dh_wraporig reverted: --- imagezoom-0.3.1/debian/links +++ imagezoom-0.3.1.orig/debian/links @@ -1,11 +0,0 @@ -etc/mozilla-extensions/imagezoom.js usr/share/mozilla-extensions/imagezoom/defaults/preferences/imagezoom-defaults.js -etc/mozilla-extensions/imagezoom.js usr/share/iceape/defaults/pref/imagezoom-defaults.js -etc/mozilla-extensions/imagezoom.js usr/lib/mozilla/defaults/pref/imagezoom-defaults.js -usr/share/mozilla-extensions/imagezoom/chrome.d var/lib/iceape/chrome.d/42imagezoom -usr/share/mozilla-extensions/imagezoom/chrome.d var/lib/mozilla/chrome.d/42imagezoom -usr/share/mozilla-extensions/imagezoom/chrome/imagezoom.jar usr/share/iceape/chrome/imagezoom.jar -usr/share/mozilla-extensions/imagezoom/chrome/imagezoom.jar usr/share/mozilla/chrome/imagezoom.jar -usr/share/mozilla-extensions/imagezoom usr/lib/iceweasel/extensions/{1A2D0EC4-75F5-4c91-89C4-3656F6E44B68} -usr/share/mozilla-extensions/imagezoom usr/lib/firefox/extensions/{1A2D0EC4-75F5-4c91-89C4-3656F6E44B68} -usr/share/mozilla-extensions/imagezoom usr/lib/icedove/extensions/{1A2D0EC4-75F5-4c91-89C4-3656F6E44B68} -usr/share/mozilla-extensions/imagezoom usr/lib/thunderbird/extensions/{1A2D0EC4-75F5-4c91-89C4-3656F6E44B68} reverted: --- imagezoom-0.3.1/debian/postrm +++ imagezoom-0.3.1.orig/debian/postrm @@ -1,38 +0,0 @@ -#! /bin/sh -set -e - -# A cut-down version of 'which' from debianutils. -searchpath () { - PROGRAM="$1" - IFS_SAVE="$IFS" - IFS=: - RET=1 - for ELEMENT in $PATH; do - if [ -z "$ELEMENT" ]; then - ELEMENT=. - fi - if [ -f "$ELEMENT/$PROGRAM" ] && \ - [ -x "$ELEMENT/$PROGRAM" ]; then - RET=0 - break - fi - done - IFS="$IFS_SAVE" - return "$RET" -} - -if [ "$1" = remove ] || [ "$1" = abort-install ]; then - for update in update-mozilla-chrome \ - update-iceape-chrome \ - update-mozilla-snapshot-chrome \ - update-mozilla-firefox-chrome \ - update-mozilla-thunderbird-chrome; do - if searchpath "$update"; then - "$update" - fi - done -fi - -#DEBHELPER# - -exit 0 reverted: --- imagezoom-0.3.1/debian/dh_wraporig.local +++ imagezoom-0.3.1.orig/debian/dh_wraporig.local @@ -1,4 +0,0 @@ -# -# Parameters file for dh_wraporig, so it can be easily reused -# -source='svn export http://imagezoom.yellowgorilla.net/versions/releases/${uversion}/source/'