Ubufox Extension

Merge lp:~bdrung/ubufox/m-d-0.21 into lp:~ubuntu-core-dev/ubufox/ubuntu

  1. m-d-0.21
  2. Merge into ubuntu
Proposed by Benjamin Drung
Status: Merged
Merged at revision: not available
Proposed branch: lp:~bdrung/ubufox/m-d-0.21
Merge into: lp:~ubuntu-core-dev/ubufox/ubuntu
Diff against target: 208 lines (+96/-40)
7 files modified
debian/changelog (+20/-2)
debian/control (+18/-5)
debian/copyright (+1/-1)
debian/postinst (+23/-0)
debian/preinst (+33/-11)
debian/rules (+0/-21)
debian/source/format (+1/-0)
To merge this branch: bzr merge lp:~bdrung/ubufox/m-d-0.21
Reviewer Review Type Date Requested Status
Alexander Sack Pending
Review via email: mp+22973@code.launchpad.net

Description of the change

I want you to review the changes before merging it into the ~ubuntu-core-dev branch.

To post a comment you must log in.
lp:~bdrung/ubufox/m-d-0.21 updated
120. By Benjamin Drung

Merge 0.9~rc2-0ubuntu1 release.

121. By Benjamin Drung

Update Breaks and Replaces version.

122. By Benjamin Drung

Move configuration file from /etc/firefox-3.0/pref/ubufox.js to
/etc/xul-ext/ubufox.

123. By Benjamin Drung

Remove unused patch system.

124. By Benjamin Drung

Switch to dpkg-source 3.0 (quilt) format.

Revision history for this message
Benjamin Drung (bdrung) wrote :

Please review the changes. I have tested the configuration file movement.

Merge revision 123 if you don't want to migrate to dpkg-source 3.0 (quilt) format.

lp:~bdrung/ubufox/m-d-0.21 updated
125. By Benjamin Drung

Add Launchpad reference.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2010-04-09 13:30:56 +0000
+++ debian/changelog 2010-04-12 11:57:26 +0000
@@ -1,4 +1,22 @@
1ubufox (0.9~rc2-0ubuntu1) UNRELEASED; urgency=low1ubufox (0.9~rc2-0ubuntu2) UNRELEASED; urgency=low
2
3 * Bump Standards-Version to 3.8.4.
4 * Drop XS- prefix from Vcs-Bzr.
5 * Drop zip from Build-Depends.
6 * Use new features of mozilla-devscripts 0.16.
7 * Simplify debian/rules.
8 * Refer to versioned license file.
9 * Add Homepage field.
10 * Add set -e and debhelper token to preinst script.
11 * Rename binary package from ubufox to xul-ext-ubufox according to new policy.
12 * Move configuration file from /etc/firefox-3.0/pref/ubufox.js to
13 /etc/xul-ext/ubufox (LP: #493805).
14 * Remove unused patch system.
15 * Switch to dpkg-source 3.0 (quilt) format.
16
17 -- Benjamin Drung <bdrung@ubuntu.com> Sun, 11 Apr 2010 22:14:27 +0200
18
19ubufox (0.9~rc2-0ubuntu1) lucid; urgency=low
220
3 New upstream release 0.9rc2:21 New upstream release 0.9rc2:
4 * fix online/offline detection by using nsIIOService rather than browser.offline pref22 * fix online/offline detection by using nsIIOService rather than browser.offline pref
@@ -19,7 +37,7 @@
19 (merge lp:~csaba-kertesz/ubufox/lp509536)37 (merge lp:~csaba-kertesz/ubufox/lp509536)
20 * fix LP: #509536 - add dutch translation38 * fix LP: #509536 - add dutch translation
2139
22 -- Alexander Sack <asac@ubuntu.com> Fri, 09 Apr 2010 15:29:04 +020040 -- Alexander Sack <asac@ubuntu.com> Fri, 09 Apr 2010 15:31:08 +0200
2341
24ubufox (0.9~rc1-0ubuntu1) lucid; urgency=low42ubufox (0.9~rc1-0ubuntu1) lucid; urgency=low
2543
2644
=== modified file 'debian/control'
--- debian/control 2009-09-02 07:25:55 +0000
+++ debian/control 2010-04-12 11:57:26 +0000
@@ -2,13 +2,19 @@
2Section: web2Section: web
3Priority: optional3Priority: optional
4Maintainer: Alexander Sack <asac@ubuntu.com>4Maintainer: Alexander Sack <asac@ubuntu.com>
5Build-Depends: debhelper (>= 5), cdbs, quilt, mozilla-devscripts, zip5Build-Depends: debhelper (>= 5), cdbs, mozilla-devscripts (>= 0.22~)
6XS-Vcs-Bzr: https://code.launchpad.net/~ubuntu-core-dev/ubufox/ubuntu/6Vcs-Bzr: https://code.launchpad.net/~ubuntu-core-dev/ubufox/ubuntu/
7Standards-Version: 3.7.2.17Standards-Version: 3.8.4
8Homepage: https://launchpad.net/ubufox
89
9Package: ubufox10Package: xul-ext-ubufox
10Architecture: all11Architecture: all
11Depends: firefox | abrowser | firefox-3.0 | firefox-2, apturl (>= 0.1.2ubuntu1) | apturl-kde12Depends: apturl (>= 0.1.2ubuntu1) | apturl-kde, ${misc:Depends}
13Recommends: ${xpi:Recommends}
14Provides: ${xpi:Provides}
15Enhances: ${xpi:Enhances}
16Replaces: ubufox (<< 0.9~rc2-0ubuntu2)
17Breaks: ubufox (<< 0.9~rc2-0ubuntu2)
12Description: Ubuntu Firefox specific configuration defaults and apt support18Description: Ubuntu Firefox specific configuration defaults and apt support
13 Extension package for Firefox provides ubuntu specific configuration defaults19 Extension package for Firefox provides ubuntu specific configuration defaults
14 as well as apt support for firefox plugins/extensions.20 as well as apt support for firefox plugins/extensions.
@@ -16,3 +22,10 @@
16 You can uninstall this package if you prefer to use a pristine firefox22 You can uninstall this package if you prefer to use a pristine firefox
17 install.23 install.
1824
25Package: ubufox
26Architecture: all
27Depends: xul-ext-ubufox, ${misc:Depends}
28Description: transitional dummy package
29 This is a transitional dummy package to ease the migration
30 from the ubufox to the new xul-ext-ubufox package.
31 You can remove it safely.
1932
=== modified file 'debian/copyright'
--- debian/copyright 2007-06-21 10:25:29 +0000
+++ debian/copyright 2010-04-12 11:57:26 +0000
@@ -13,5 +13,5 @@
13GNU GENERAL PUBLIC LICENSE Version 2, June 1991 or any later13GNU GENERAL PUBLIC LICENSE Version 2, June 1991 or any later
1414
15The full text can be found at:15The full text can be found at:
16 /usr/share/common-licenses/GPL or http://www.gnu.org/licenses/gpl.txt16 /usr/share/common-licenses/GPL-2 or http://www.gnu.org/licenses/gpl.txt
1717
1818
=== removed directory 'debian/patches'
=== removed file 'debian/patches/series'
=== added file 'debian/postinst'
--- debian/postinst 1970-01-01 00:00:00 +0000
+++ debian/postinst 2010-04-12 11:57:26 +0000
@@ -0,0 +1,23 @@
1#!/bin/sh
2set -e
3
4# Move a conffile without triggering a dpkg question
5mv_conffile() {
6 local OLDCONFFILE="$1"
7 local NEWCONFFILE="$2"
8
9 [ -e "$OLDCONFFILE" ] || return 0
10
11 echo "Preserving user changes to $NEWCONFFILE ..."
12 mv -f "$NEWCONFFILE" "$NEWCONFFILE".dpkg-new
13 mv -f "$OLDCONFFILE" "$NEWCONFFILE"
14}
15
16case "$1" in
17configure)
18 if dpkg --compare-versions "$2" le "0.9~rc2-0ubuntu1"; then
19 mv_conffile /etc/firefox-3.0/pref/ubufox.js /etc/xul-ext/ubufox.js
20 fi
21esac
22
23#DEBHELPER#
024
=== modified file 'debian/preinst'
--- debian/preinst 2008-03-13 16:05:26 +0000
+++ debian/preinst 2010-04-12 11:57:26 +0000
@@ -1,12 +1,34 @@
1#!/bin/sh1#!/bin/sh
22set -e
3if test "$1" = "upgrade" -o "$1" = "install"; then 3
4 if test -d /usr/lib/firefox/extensions/ubufox@ubuntu.com; then4# Prepare to move a conffile without triggering a dpkg question
5 rm -rf /usr/lib/firefox/extensions/ubufox@ubuntu.com5prep_mv_conffile() {
6 fi6 local PKGNAME="$1"
77 local CONFFILE="$2"
8 if test -d /usr/lib/firefox-addons/extensions/ubufox@ubuntu.com; then8
9 rm -rf /usr/lib/firefox-addons/extensions/ubufox@ubuntu.com9 [ -e "$CONFFILE" ] || return 0
10 fi10
11fi11 local md5sum="$(md5sum $CONFFILE | sed -e 's/ .*//')"
1212 local old_md5sum="$(dpkg-query -W -f='${Conffiles}' $PKGNAME | \
13 sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")"
14 if [ "$md5sum" = "$old_md5sum" ]; then
15 rm -f "$CONFFILE"
16 fi
17}
18
19case "$1" in
20install|upgrade)
21 if test -d /usr/lib/firefox/extensions/ubufox@ubuntu.com; then
22 rm -rf /usr/lib/firefox/extensions/ubufox@ubuntu.com
23 fi
24
25 if test -d /usr/lib/firefox-addons/extensions/ubufox@ubuntu.com; then
26 rm -rf /usr/lib/firefox-addons/extensions/ubufox@ubuntu.com
27 fi
28
29 if dpkg --compare-versions "$2" le "0.9~rc2-0ubuntu1"; then
30 prep_mv_conffile mypackage /etc/firefox-3.0/pref/ubufox.js
31 fi
32esac
33
34#DEBHELPER#
1335
=== modified file 'debian/rules'
--- debian/rules 2008-10-21 12:08:07 +0000
+++ debian/rules 2010-04-12 11:57:26 +0000
@@ -1,27 +1,6 @@
1#!/usr/bin/make -f1#!/usr/bin/make -f
22
3# name the package (as in debian/control) that will ship the extension
4MOZ_EXTENSION_PKG := ubufox
5#
6# xpi.mk will auto detect the .xpi in your package. if you want to do it
7# explicit, use this variable
8#MOZ_XPI_FILE := yourextension.xpi
9#
10# xpi.mk tries to auto detect the extension manager id (em:id) from the .xpis
11# install.rdf file. There might be cases where this doesn't work. use the following
12# variable to explicitly define an extension ID and disable auto detection
13#MOZ_EM_ID := {xxxxxxx-xxxx-xxxx}
14#
15# xpi.mk will run a build command before packaging an .xpi file. you can use this
16# to produce an .xpi. if you define this, the clean rule will remove any .xpi file
17# found in the top level directory
18MOZ_XPI_BUILD_COMMAND = sh build.sh3MOZ_XPI_BUILD_COMMAND = sh build.sh
194
20include /usr/share/cdbs/1/rules/debhelper.mk5include /usr/share/cdbs/1/rules/debhelper.mk
21include /usr/share/cdbs/1/rules/patchsys-quilt.mk
22include /usr/share/mozilla-devscripts/xpi.mk6include /usr/share/mozilla-devscripts/xpi.mk
23
24common-install-indep::
25 dh_install -pubufox debian/ubufox.js etc/firefox-3.0/pref/
26 dh_link -pubufox /etc/firefox-3.0/pref/ubufox.js /usr/share/ubufox/defaults/preferences/000system.js
27
287
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format 1970-01-01 00:00:00 +0000
+++ debian/source/format 2010-04-12 11:57:26 +0000
@@ -0,0 +1,1 @@
13.0 (quilt)
02
=== renamed file 'debian/ubufox.js' => 'debian/xul-ext-ubufox.js'

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: