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

[Benjamin Drung]

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

[lp:~bdrung/ubufox/m-d-0.21]

120. By Benjamin Drung on 2010-04-11

Merge 0.9~rc2-0ubuntu1 release.

121. By Benjamin Drung on 2010-04-11

Update Breaks and Replaces version.

122. By Benjamin Drung on 2010-04-11

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

123. By Benjamin Drung on 2010-04-11

Remove unused patch system.

124. By Benjamin Drung on 2010-04-11

Switch to dpkg-source 3.0 (quilt) format.

[Benjamin Drung (bdrung)]

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]

125. By Benjamin Drung on 2010-04-12

Add Launchpad reference.

=== 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 @@
-ubufox (0.9~rc2-0ubuntu1) UNRELEASED; urgency=low
+ubufox (0.9~rc2-0ubuntu2) UNRELEASED; urgency=low
+
+  * Bump Standards-Version to 3.8.4.
+  * Drop XS- prefix from Vcs-Bzr.
+  * Drop zip from Build-Depends.
+  * Use new features of mozilla-devscripts 0.16.
+  * Simplify debian/rules.
+  * Refer to versioned license file.
+  * Add Homepage field.
+  * Add set -e and debhelper token to preinst script.
+  * Rename binary package from ubufox to xul-ext-ubufox according to new policy.
+  * Move configuration file from /etc/firefox-3.0/pref/ubufox.js to
+    /etc/xul-ext/ubufox (LP: #493805).
+  * Remove unused patch system.
+  * Switch to dpkg-source 3.0 (quilt) format.
+
+ -- Benjamin Drung <[e-mail]>  Sun, 11 Apr 2010 22:14:27 +0200
+
+ubufox (0.9~rc2-0ubuntu1) lucid; urgency=low
 
   New upstream release 0.9rc2:
   * fix online/offline detection by using nsIIOService rather than browser.offline pref
@@ -19,7 +37,7 @@
   (merge lp:~csaba-kertesz/ubufox/lp509536)
   * fix LP: #509536 - add dutch translation
 
- -- Alexander Sack <[e-mail]>  Fri, 09 Apr 2010 15:29:04 +0200
+ -- Alexander Sack <[e-mail]>  Fri, 09 Apr 2010 15:31:08 +0200
 
 ubufox (0.9~rc1-0ubuntu1) lucid; urgency=low
 

=== 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 @@
 Section: web
 Priority: optional
 Maintainer: Alexander Sack <[e-mail]>
-Build-Depends: debhelper (>= 5), cdbs, quilt, mozilla-devscripts, zip
-XS-Vcs-Bzr: https://code.launchpad.net/~ubuntu-core-dev/ubufox/ubuntu/
-Standards-Version: 3.7.2.1
+Build-Depends: debhelper (>= 5), cdbs, mozilla-devscripts (>= 0.22~)
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-core-dev/ubufox/ubuntu/
+Standards-Version: 3.8.4
+Homepage: https://launchpad.net/ubufox
 
-Package: ubufox
+Package: xul-ext-ubufox
 Architecture: all
-Depends: firefox | abrowser | firefox-3.0 | firefox-2, apturl (>= 0.1.2ubuntu1) | apturl-kde
+Depends: apturl (>= 0.1.2ubuntu1) | apturl-kde, ${misc:Depends}
+Recommends: ${xpi:Recommends}
+Provides: ${xpi:Provides}
+Enhances: ${xpi:Enhances}
+Replaces: ubufox (<< 0.9~rc2-0ubuntu2)
+Breaks: ubufox (<< 0.9~rc2-0ubuntu2)
 Description: Ubuntu Firefox specific configuration defaults and apt support
  Extension package for Firefox provides ubuntu specific configuration defaults
  as well as apt support for firefox plugins/extensions.
@@ -16,3 +22,10 @@
  You can uninstall this package if you prefer to use a pristine firefox
  install.
 
+Package: ubufox
+Architecture: all
+Depends: xul-ext-ubufox, ${misc:Depends}
+Description: transitional dummy package
+ This is a transitional dummy package to ease the migration
+ from the ubufox to the new xul-ext-ubufox package.
+ You can remove it safely.

=== 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 @@
 GNU GENERAL PUBLIC LICENSE Version 2, June 1991 or any later
 
 The full text can be found at:
-  /usr/share/common-licenses/GPL or http://www.gnu.org/licenses/gpl.txt
+  /usr/share/common-licenses/GPL-2 or http://www.gnu.org/licenses/gpl.txt
 

=== 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 @@
+#!/bin/sh
+set -e
+
+# Move a conffile without triggering a dpkg question
+mv_conffile() {
+    local OLDCONFFILE="$1"
+    local NEWCONFFILE="$2"
+
+    [ -e "$OLDCONFFILE" ] || return 0
+
+    echo "Preserving user changes to $NEWCONFFILE ..."
+    mv -f "$NEWCONFFILE" "$NEWCONFFILE".dpkg-new
+    mv -f "$OLDCONFFILE" "$NEWCONFFILE"
+}
+
+case "$1" in
+configure)
+    if dpkg --compare-versions "$2" le "0.9~rc2-0ubuntu1"; then
+        mv_conffile /etc/firefox-3.0/pref/ubufox.js /etc/xul-ext/ubufox.js
+    fi
+esac
+
+#DEBHELPER#

=== 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 @@
 #!/bin/sh
-
-if test "$1" = "upgrade" -o "$1" = "install"; then 
-  if test -d /usr/lib/firefox/extensions/[e-mail]; then
-    rm -rf /usr/lib/firefox/extensions/[e-mail]
-  fi
-
-  if test -d /usr/lib/firefox-addons/extensions/[e-mail]; then
-    rm -rf /usr/lib/firefox-addons/extensions/[e-mail]
-  fi
-fi
-
+set -e
+
+# Prepare to move a conffile without triggering a dpkg question
+prep_mv_conffile() {
+    local PKGNAME="$1"
+    local CONFFILE="$2"
+
+    [ -e "$CONFFILE" ] || return 0
+
+    local md5sum="$(md5sum $CONFFILE | sed -e 's/ .*//')"
+    local old_md5sum="$(dpkg-query -W -f='${Conffiles}' $PKGNAME | \
+            sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")"
+    if [ "$md5sum" = "$old_md5sum" ]; then
+        rm -f "$CONFFILE"
+    fi
+}
+
+case "$1" in
+install|upgrade)
+    if test -d /usr/lib/firefox/extensions/[e-mail]; then
+        rm -rf /usr/lib/firefox/extensions/[e-mail]
+    fi
+
+    if test -d /usr/lib/firefox-addons/extensions/[e-mail]; then
+        rm -rf /usr/lib/firefox-addons/extensions/[e-mail]
+    fi
+
+    if dpkg --compare-versions "$2" le "0.9~rc2-0ubuntu1"; then
+        prep_mv_conffile mypackage /etc/firefox-3.0/pref/ubufox.js
+    fi
+esac
+
+#DEBHELPER#

=== 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 @@
 #!/usr/bin/make -f
 
-# name the package (as in debian/control) that will ship the extension
-MOZ_EXTENSION_PKG := ubufox
-#
-# 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
-#
-# 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
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/mozilla-devscripts/xpi.mk
-
-common-install-indep::
-	dh_install -pubufox debian/ubufox.js etc/firefox-3.0/pref/
-	dh_link -pubufox /etc/firefox-3.0/pref/ubufox.js /usr/share/ubufox/defaults/preferences/000system.js
-

=== 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 @@
+3.0 (quilt)

=== renamed file 'debian/ubufox.js' => 'debian/xul-ext-ubufox.js'