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
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-04-09 13:30:56 +0000
3+++ debian/changelog 2010-04-12 11:57:26 +0000
4@@ -1,4 +1,22 @@
5-ubufox (0.9~rc2-0ubuntu1) UNRELEASED; urgency=low
6+ubufox (0.9~rc2-0ubuntu2) UNRELEASED; urgency=low
7+
8+ * Bump Standards-Version to 3.8.4.
9+ * Drop XS- prefix from Vcs-Bzr.
10+ * Drop zip from Build-Depends.
11+ * Use new features of mozilla-devscripts 0.16.
12+ * Simplify debian/rules.
13+ * Refer to versioned license file.
14+ * Add Homepage field.
15+ * Add set -e and debhelper token to preinst script.
16+ * Rename binary package from ubufox to xul-ext-ubufox according to new policy.
17+ * Move configuration file from /etc/firefox-3.0/pref/ubufox.js to
18+ /etc/xul-ext/ubufox (LP: #493805).
19+ * Remove unused patch system.
20+ * Switch to dpkg-source 3.0 (quilt) format.
21+
22+ -- Benjamin Drung <bdrung@ubuntu.com> Sun, 11 Apr 2010 22:14:27 +0200
23+
24+ubufox (0.9~rc2-0ubuntu1) lucid; urgency=low
25
26 New upstream release 0.9rc2:
27 * fix online/offline detection by using nsIIOService rather than browser.offline pref
28@@ -19,7 +37,7 @@
29 (merge lp:~csaba-kertesz/ubufox/lp509536)
30 * fix LP: #509536 - add dutch translation
31
32- -- Alexander Sack <asac@ubuntu.com> Fri, 09 Apr 2010 15:29:04 +0200
33+ -- Alexander Sack <asac@ubuntu.com> Fri, 09 Apr 2010 15:31:08 +0200
34
35 ubufox (0.9~rc1-0ubuntu1) lucid; urgency=low
36
37
38=== modified file 'debian/control'
39--- debian/control 2009-09-02 07:25:55 +0000
40+++ debian/control 2010-04-12 11:57:26 +0000
41@@ -2,13 +2,19 @@
42 Section: web
43 Priority: optional
44 Maintainer: Alexander Sack <asac@ubuntu.com>
45-Build-Depends: debhelper (>= 5), cdbs, quilt, mozilla-devscripts, zip
46-XS-Vcs-Bzr: https://code.launchpad.net/~ubuntu-core-dev/ubufox/ubuntu/
47-Standards-Version: 3.7.2.1
48+Build-Depends: debhelper (>= 5), cdbs, mozilla-devscripts (>= 0.22~)
49+Vcs-Bzr: https://code.launchpad.net/~ubuntu-core-dev/ubufox/ubuntu/
50+Standards-Version: 3.8.4
51+Homepage: https://launchpad.net/ubufox
52
53-Package: ubufox
54+Package: xul-ext-ubufox
55 Architecture: all
56-Depends: firefox | abrowser | firefox-3.0 | firefox-2, apturl (>= 0.1.2ubuntu1) | apturl-kde
57+Depends: apturl (>= 0.1.2ubuntu1) | apturl-kde, ${misc:Depends}
58+Recommends: ${xpi:Recommends}
59+Provides: ${xpi:Provides}
60+Enhances: ${xpi:Enhances}
61+Replaces: ubufox (<< 0.9~rc2-0ubuntu2)
62+Breaks: ubufox (<< 0.9~rc2-0ubuntu2)
63 Description: Ubuntu Firefox specific configuration defaults and apt support
64 Extension package for Firefox provides ubuntu specific configuration defaults
65 as well as apt support for firefox plugins/extensions.
66@@ -16,3 +22,10 @@
67 You can uninstall this package if you prefer to use a pristine firefox
68 install.
69
70+Package: ubufox
71+Architecture: all
72+Depends: xul-ext-ubufox, ${misc:Depends}
73+Description: transitional dummy package
74+ This is a transitional dummy package to ease the migration
75+ from the ubufox to the new xul-ext-ubufox package.
76+ You can remove it safely.
77
78=== modified file 'debian/copyright'
79--- debian/copyright 2007-06-21 10:25:29 +0000
80+++ debian/copyright 2010-04-12 11:57:26 +0000
81@@ -13,5 +13,5 @@
82 GNU GENERAL PUBLIC LICENSE Version 2, June 1991 or any later
83
84 The full text can be found at:
85- /usr/share/common-licenses/GPL or http://www.gnu.org/licenses/gpl.txt
86+ /usr/share/common-licenses/GPL-2 or http://www.gnu.org/licenses/gpl.txt
87
88
89=== removed directory 'debian/patches'
90=== removed file 'debian/patches/series'
91=== added file 'debian/postinst'
92--- debian/postinst 1970-01-01 00:00:00 +0000
93+++ debian/postinst 2010-04-12 11:57:26 +0000
94@@ -0,0 +1,23 @@
95+#!/bin/sh
96+set -e
97+
98+# Move a conffile without triggering a dpkg question
99+mv_conffile() {
100+ local OLDCONFFILE="$1"
101+ local NEWCONFFILE="$2"
102+
103+ [ -e "$OLDCONFFILE" ] || return 0
104+
105+ echo "Preserving user changes to $NEWCONFFILE ..."
106+ mv -f "$NEWCONFFILE" "$NEWCONFFILE".dpkg-new
107+ mv -f "$OLDCONFFILE" "$NEWCONFFILE"
108+}
109+
110+case "$1" in
111+configure)
112+ if dpkg --compare-versions "$2" le "0.9~rc2-0ubuntu1"; then
113+ mv_conffile /etc/firefox-3.0/pref/ubufox.js /etc/xul-ext/ubufox.js
114+ fi
115+esac
116+
117+#DEBHELPER#
118
119=== modified file 'debian/preinst'
120--- debian/preinst 2008-03-13 16:05:26 +0000
121+++ debian/preinst 2010-04-12 11:57:26 +0000
122@@ -1,12 +1,34 @@
123 #!/bin/sh
124-
125-if test "$1" = "upgrade" -o "$1" = "install"; then
126- if test -d /usr/lib/firefox/extensions/ubufox@ubuntu.com; then
127- rm -rf /usr/lib/firefox/extensions/ubufox@ubuntu.com
128- fi
129-
130- if test -d /usr/lib/firefox-addons/extensions/ubufox@ubuntu.com; then
131- rm -rf /usr/lib/firefox-addons/extensions/ubufox@ubuntu.com
132- fi
133-fi
134-
135+set -e
136+
137+# Prepare to move a conffile without triggering a dpkg question
138+prep_mv_conffile() {
139+ local PKGNAME="$1"
140+ local CONFFILE="$2"
141+
142+ [ -e "$CONFFILE" ] || return 0
143+
144+ local md5sum="$(md5sum $CONFFILE | sed -e 's/ .*//')"
145+ local old_md5sum="$(dpkg-query -W -f='${Conffiles}' $PKGNAME | \
146+ sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")"
147+ if [ "$md5sum" = "$old_md5sum" ]; then
148+ rm -f "$CONFFILE"
149+ fi
150+}
151+
152+case "$1" in
153+install|upgrade)
154+ if test -d /usr/lib/firefox/extensions/ubufox@ubuntu.com; then
155+ rm -rf /usr/lib/firefox/extensions/ubufox@ubuntu.com
156+ fi
157+
158+ if test -d /usr/lib/firefox-addons/extensions/ubufox@ubuntu.com; then
159+ rm -rf /usr/lib/firefox-addons/extensions/ubufox@ubuntu.com
160+ fi
161+
162+ if dpkg --compare-versions "$2" le "0.9~rc2-0ubuntu1"; then
163+ prep_mv_conffile mypackage /etc/firefox-3.0/pref/ubufox.js
164+ fi
165+esac
166+
167+#DEBHELPER#
168
169=== modified file 'debian/rules'
170--- debian/rules 2008-10-21 12:08:07 +0000
171+++ debian/rules 2010-04-12 11:57:26 +0000
172@@ -1,27 +1,6 @@
173 #!/usr/bin/make -f
174
175-# name the package (as in debian/control) that will ship the extension
176-MOZ_EXTENSION_PKG := ubufox
177-#
178-# xpi.mk will auto detect the .xpi in your package. if you want to do it
179-# explicit, use this variable
180-#MOZ_XPI_FILE := yourextension.xpi
181-#
182-# xpi.mk tries to auto detect the extension manager id (em:id) from the .xpis
183-# install.rdf file. There might be cases where this doesn't work. use the following
184-# variable to explicitly define an extension ID and disable auto detection
185-#MOZ_EM_ID := {xxxxxxx-xxxx-xxxx}
186-#
187-# xpi.mk will run a build command before packaging an .xpi file. you can use this
188-# to produce an .xpi. if you define this, the clean rule will remove any .xpi file
189-# found in the top level directory
190 MOZ_XPI_BUILD_COMMAND = sh build.sh
191
192 include /usr/share/cdbs/1/rules/debhelper.mk
193-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
194 include /usr/share/mozilla-devscripts/xpi.mk
195-
196-common-install-indep::
197- dh_install -pubufox debian/ubufox.js etc/firefox-3.0/pref/
198- dh_link -pubufox /etc/firefox-3.0/pref/ubufox.js /usr/share/ubufox/defaults/preferences/000system.js
199-
200
201=== added directory 'debian/source'
202=== added file 'debian/source/format'
203--- debian/source/format 1970-01-01 00:00:00 +0000
204+++ debian/source/format 2010-04-12 11:57:26 +0000
205@@ -0,0 +1,1 @@
206+3.0 (quilt)
207
208=== 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: