Firefox Extensions

Merge lp:~heikki-mantysaari/firefox-extensions/mozvoikko.ubuntu-1.0-4ubuntu1 into lp:~ubuntu-dev/firefox-extensions/mozvoikko.ubuntu

  1. mozvoikko.ubuntu-1.0-4ubuntu1
  2. Merge into mozvoikko.ubuntu
Proposed by Heikki Mäntysaari
Status: Merged
Merged at revision: not available
Proposed branch: lp:~heikki-mantysaari/firefox-extensions/mozvoikko.ubuntu-1.0-4ubuntu1
Merge into: lp:~ubuntu-dev/firefox-extensions/mozvoikko.ubuntu
Diff against target: 156 lines (+92/-7)
6 files modified
debian/changelog (+48/-0)
debian/control (+5/-6)
debian/patches/fix_freebsd_ftbfs.patch (+13/-0)
debian/patches/fix_min_version.patch (+22/-0)
debian/patches/series (+2/-0)
debian/rules (+2/-1)
To merge this branch: bzr merge lp:~heikki-mantysaari/firefox-extensions/mozvoikko.ubuntu-1.0-4ubuntu1
To post a comment you must log in.

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 2009-08-10 17:22:42 +0000
3+++ debian/changelog 2010-01-28 17:05:25 +0000
4@@ -1,3 +1,51 @@
5+mozvoikko (1.0-4ubuntu1) lucid; urgency=low
6+
7+ * Merge changes from Debian
8+ * Change conflict to abrowser (>= 3.7). Closes LP: #513320
9+ * Add optional dependency to firefox-3.6.
10+
11+ -- Heikki Mäntysaari <heikki.mantysaari@linux.fi> Thu, 28 Jan 2010 18:42:53 +0200
12+
13+mozvoikko (1.0-4) unstable; urgency=low
14+
15+ * Change conflict to iceweasel (>= 3.7)
16+
17+ -- Heikki Mäntysaari <heikki.mantysaari@linux.fi> Wed, 27 Jan 2010 18:21:41 +0200
18+
19+mozvoikko (1.0-3ubuntu1) lucid; urgency=low
20+
21+ * Merge changes from Debian. Closes LP: #493628
22+ * Move Ubuntu specific changes on file mozvoikko.config to separated
23+ patch file patches/fix_min_version.patch
24+ * Change Maintainer to Ubuntu Core Developers as the package is in main
25+
26+ -- Heikki Mäntysaari <heikki.mantysaari@linux.fi> Mon, 07 Dec 2009 18:08:54 +0200
27+
28+mozvoikko (1.0-3) unstable; urgency=low
29+
30+ * Add quilt patch system
31+ * Add patches/fix_freebsd_ftbfs.patch via quilt to fix FTBFS bug on
32+ GNU/kFreeBSD. Thanks to Cyril Brulebois. Closes: #558337
33+
34+ -- Heikki Mäntysaari <heikki.mantysaari@linux.fi> Mon, 30 Nov 2009 17:25:04 +0200
35+
36+mozvoikko (1.0-2) unstable; urgency=low
37+
38+ * Add pkg-config to Build-Depends. Closes: #551225
39+ * Change Standards-Version to 3.8.3
40+
41+ -- Heikki Mäntysaari <heikki.mantysaari@linux.fi> Fri, 13 Nov 2009 21:57:56 +0200
42+
43+mozvoikko (1.0-1ubuntu3) karmic; urgency=low
44+
45+ * LP: #456598 - incorrect Breaks statement forces removal
46+ because of newer firefox-3.5; fix install.rdf to use proper
47+ minVersion bounds rather than shipping a package Breaks:
48+ - update mozvoikko.config
49+ - update debian/control
50+
51+ -- Alexander Sack <asac@ubuntu.com> Tue, 20 Oct 2009 21:37:02 +0200
52+
53 mozvoikko (1.0-1ubuntu2) karmic; urgency=low
54
55 * drop firefox-3.0 and firefox-3.1 from Depends; add 3.0 to Breaks instead.
56
57=== modified file 'debian/control'
58--- debian/control 2009-08-10 17:22:42 +0000
59+++ debian/control 2010-01-28 17:05:25 +0000
60@@ -1,17 +1,16 @@
61 Source: mozvoikko
62 Section: web
63 Priority: optional
64-Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
65+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
66 XSBC-Original-Maintainer: Heikki Mäntysaari <heikki.mantysaari@linux.fi>
67-Build-Depends: debhelper (>= 5), xulrunner-dev (>= 1.9.1~), libvoikko-dev
68+Build-Depends: debhelper (>= 5), xulrunner-dev (>= 1.9.1~), libvoikko-dev, pkg-config, quilt (>= 0.46-7~)
69 Vcs-Bzr: https://code.launchpad.net/~ubuntu-dev/firefox-extensions/mozvoikko.ubuntu
70-Standards-Version: 3.8.1
71+Standards-Version: 3.8.3
72
73 Package: mozvoikko
74 Architecture: any
75-Depends: ${shlibs:Depends}, libvoikko1, voikko-fi, firefox-3.5 | abrowser (>= 3) | iceweasel (>= 3)
76-Breaks: firefox-3.0
77-Conflicts: iceweasel (>= 3.6), abrowser (>= 3.6)
78+Depends: ${shlibs:Depends}, libvoikko1, voikko-fi, firefox-3.5 | firefox-3.6 | abrowser (>= 3) | iceweasel (>= 3)
79+Conflicts: iceweasel (>= 3.7), abrowser (>= 3.7)
80 Description: Finnish spell-checker extension for Firefox
81 Finnish spell-checker extension for Firefox 3. Spell-checking
82 functionality is provided by Voikko - a free spellchecker
83
84=== added directory 'debian/patches'
85=== added file 'debian/patches/fix_freebsd_ftbfs.patch'
86--- debian/patches/fix_freebsd_ftbfs.patch 1970-01-01 00:00:00 +0000
87+++ debian/patches/fix_freebsd_ftbfs.patch 2010-01-28 17:05:25 +0000
88@@ -0,0 +1,13 @@
89+Index: mozvoikko.debian/src/mozVoikkoUtils.cpp
90+===================================================================
91+--- mozvoikko.debian.orig/src/mozVoikkoUtils.cpp 2009-11-30 17:18:24.000000000 +0200
92++++ mozvoikko.debian/src/mozVoikkoUtils.cpp 2009-11-30 17:19:12.000000000 +0200
93+@@ -32,7 +32,7 @@
94+ #include <nsStringAPI.h>
95+ #include <prerror.h>
96+
97+-#if defined(__linux__)
98++#if defined(__linux__) || defined(__GLIBC__)
99+
100+ const char *preloadLibNames[] =
101+ {
102
103=== added file 'debian/patches/fix_min_version.patch'
104--- debian/patches/fix_min_version.patch 1970-01-01 00:00:00 +0000
105+++ debian/patches/fix_min_version.patch 2010-01-28 17:05:25 +0000
106@@ -0,0 +1,22 @@
107+Index: mozvoikko.ubuntu/mozvoikko.config
108+===================================================================
109+--- mozvoikko.ubuntu.orig/mozvoikko.config 2009-12-07 17:59:16.000000000 +0200
110++++ mozvoikko.ubuntu/mozvoikko.config 2009-12-07 17:59:49.000000000 +0200
111+@@ -24,13 +24,13 @@
112+ # https://addons.mozilla.org/en-US/firefox/pages/appversions
113+
114+ # Supported Firefox versions.
115+-MOZVOIKKO_FF_MIN = 3.0a9pre
116++MOZVOIKKO_FF_MIN = 3.5a9pre
117+ MOZVOIKKO_FF_MAX = 3.6a1pre
118+
119+ # Supported Thunderbird versions
120+-MOZVOIKKO_TB_MIN = 3.0a1pre
121++MOZVOIKKO_TB_MIN = 3.0b2pre
122+ MOZVOIKKO_TB_MAX = 3.1a1pre
123+
124+ # Supported SeaMonkey versions
125+-MOZVOIKKO_SM_MIN = 2.0a1pre
126+-MOZVOIKKO_SM_MAX = 2.0b1pre
127++MOZVOIKKO_SM_MIN = 2.0b1pre
128++MOZVOIKKO_SM_MAX = 2.1a1pre
129
130=== added file 'debian/patches/series'
131--- debian/patches/series 1970-01-01 00:00:00 +0000
132+++ debian/patches/series 2010-01-28 17:05:25 +0000
133@@ -0,0 +1,2 @@
134+fix_min_version.patch
135+fix_freebsd_ftbfs.patch
136
137=== modified file 'debian/rules'
138--- debian/rules 2009-05-15 19:01:12 +0000
139+++ debian/rules 2010-01-28 17:05:25 +0000
140@@ -17,7 +17,7 @@
141 configure: configure-stamp
142 configure-stamp:
143 dh_testdir
144- # Add here commands to configure the package.
145+ dh_quilt_patch
146
147 touch configure-stamp
148
149@@ -35,6 +35,7 @@
150 clean:
151 dh_testdir
152 dh_testroot
153+ dh_quilt_unpatch
154 rm -f build-stamp configure-stamp
155
156 # Add here commands to clean up after the build process.

Subscribers

People subscribed via source and target branches