Merge lp:~heikki-mantysaari/firefox-extensions/mozvoikko.ubuntu-1.0-1ubuntu2-to-1.0-3ubuntu1 into lp:~ubuntu-dev/firefox-extensions/mozvoikko.ubuntu

[Heikki Mäntysaari]

[Heikki Mäntysaari (heikki-mantysaari)]

Merge from Debian unstable to version 1.0-3

=== modified file 'debian/changelog'
--- debian/changelog	2009-08-10 17:22:42 +0000
+++ debian/changelog	2009-12-07 17:05:21 +0000
@@ -1,3 +1,37 @@
+mozvoikko (1.0-3ubuntu1) lucid; urgency=low
+
+  * Merge changes from Debian. Closes LP: #493628
+  * Move Ubuntu specific changes on file mozvoikko.config to separated
+    patch file patches/fix_min_version.patch
+  * Change Maintainer to Ubuntu Core Developers as the package is in main
+
+ -- Heikki Mäntysaari <[e-mail]>  Mon, 07 Dec 2009 18:08:54 +0200
+
+mozvoikko (1.0-3) unstable; urgency=low
+
+  * Add quilt patch system
+  * Add patches/fix_freebsd_ftbfs.patch via quilt to fix FTBFS bug on
+    GNU/kFreeBSD. Thanks to Cyril Brulebois. Closes: #558337
+
+ -- Heikki Mäntysaari <[e-mail]>  Mon, 30 Nov 2009 17:25:04 +0200
+
+mozvoikko (1.0-2) unstable; urgency=low
+
+  * Add pkg-config to Build-Depends. Closes: #551225
+  * Change Standards-Version to 3.8.3
+
+ -- Heikki Mäntysaari <[e-mail]>  Fri, 13 Nov 2009 21:57:56 +0200
+
+mozvoikko (1.0-1ubuntu3) karmic; urgency=low
+
+  * LP: #456598 - incorrect Breaks statement forces removal
+    because of newer firefox-3.5; fix install.rdf to use proper
+    minVersion bounds rather than shipping a package Breaks:
+    - update mozvoikko.config
+    - update debian/control
+
+ -- Alexander Sack <[e-mail]>  Tue, 20 Oct 2009 21:37:02 +0200
+
 mozvoikko (1.0-1ubuntu2) karmic; urgency=low
 
   * drop firefox-3.0 and firefox-3.1 from Depends; add 3.0 to Breaks instead.

=== modified file 'debian/control'
--- debian/control	2009-08-10 17:22:42 +0000
+++ debian/control	2009-12-07 17:05:21 +0000
@@ -1,16 +1,15 @@
 Source: mozvoikko
 Section: web
 Priority: optional
-Maintainer: Ubuntu MOTU Developers <[e-mail]>
+Maintainer: Ubuntu Core Developers <[e-mail]> 
 XSBC-Original-Maintainer: Heikki Mäntysaari <[e-mail]>
-Build-Depends: debhelper (>= 5), xulrunner-dev (>= 1.9.1~), libvoikko-dev
+Build-Depends: debhelper (>= 5), xulrunner-dev (>= 1.9.1~), libvoikko-dev, pkg-config, quilt (>= 0.46-7~)
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-dev/firefox-extensions/mozvoikko.ubuntu
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 
 Package: mozvoikko
 Architecture: any 
 Depends: ${shlibs:Depends}, libvoikko1, voikko-fi, firefox-3.5 | abrowser (>= 3) | iceweasel (>= 3)
-Breaks: firefox-3.0
 Conflicts: iceweasel (>= 3.6), abrowser (>= 3.6)
 Description: Finnish spell-checker extension for Firefox  
  Finnish spell-checker extension for Firefox 3. Spell-checking 

=== added directory 'debian/patches'
=== added file 'debian/patches/fix_freebsd_ftbfs.patch'
--- debian/patches/fix_freebsd_ftbfs.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix_freebsd_ftbfs.patch	2009-12-07 17:05:21 +0000
@@ -0,0 +1,13 @@
+Index: mozvoikko.debian/src/mozVoikkoUtils.cpp
+===================================================================
+--- mozvoikko.debian.orig/src/mozVoikkoUtils.cpp	2009-11-30 17:18:24.000000000 +0200
++++ mozvoikko.debian/src/mozVoikkoUtils.cpp	2009-11-30 17:19:12.000000000 +0200
+@@ -32,7 +32,7 @@
+ #include <nsStringAPI.h>
+ #include <prerror.h>
+ 
+-#if defined(__linux__)
++#if defined(__linux__) || defined(__GLIBC__)
+ 
+ const char *preloadLibNames[] =
+ {

=== added file 'debian/patches/fix_min_version.patch'
--- debian/patches/fix_min_version.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix_min_version.patch	2009-12-07 17:05:21 +0000
@@ -0,0 +1,22 @@
+Index: mozvoikko.ubuntu/mozvoikko.config
+===================================================================
+--- mozvoikko.ubuntu.orig/mozvoikko.config	2009-12-07 17:59:16.000000000 +0200
++++ mozvoikko.ubuntu/mozvoikko.config	2009-12-07 17:59:49.000000000 +0200
+@@ -24,13 +24,13 @@
+ #    https://addons.mozilla.org/en-US/firefox/pages/appversions
+ 
+ # Supported Firefox versions.
+-MOZVOIKKO_FF_MIN  = 3.0a9pre
++MOZVOIKKO_FF_MIN  = 3.5a9pre
+ MOZVOIKKO_FF_MAX  = 3.6a1pre
+ 
+ # Supported Thunderbird versions
+-MOZVOIKKO_TB_MIN  = 3.0a1pre
++MOZVOIKKO_TB_MIN  = 3.0b2pre
+ MOZVOIKKO_TB_MAX  = 3.1a1pre
+ 
+ # Supported SeaMonkey versions
+-MOZVOIKKO_SM_MIN  = 2.0a1pre
+-MOZVOIKKO_SM_MAX  = 2.0b1pre
++MOZVOIKKO_SM_MIN  = 2.0b1pre
++MOZVOIKKO_SM_MAX  = 2.1a1pre

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2009-12-07 17:05:21 +0000
@@ -0,0 +1,2 @@
+fix_min_version.patch
+fix_freebsd_ftbfs.patch

=== modified file 'debian/rules'
--- debian/rules	2009-05-15 19:01:12 +0000
+++ debian/rules	2009-12-07 17:05:21 +0000
@@ -17,7 +17,7 @@
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	# Add here commands to configure the package.
+	dh_quilt_patch
 
 	touch configure-stamp
 
@@ -35,6 +35,7 @@
 clean:
 	dh_testdir
 	dh_testroot
+	dh_quilt_unpatch
 	rm -f build-stamp configure-stamp
 
 	# Add here commands to clean up after the build process.