Firefox Extensions

Merge lp:~gnomefreak/firefox-extensions/flashgot.ubuntu into lp:~mozilla-extensions-dev/firefox-extensions/flashgot.ubuntu

  1. flashgot.ubuntu
  2. Merge into flashgot.ubuntu
Proposed by John Vivirito
Status: Merged
Approved by: Andrea Veri
Approved revision: 16
Merge reported by: Andrea Veri
Merged at revision: not available
Proposed branch: lp:~gnomefreak/firefox-extensions/flashgot.ubuntu
Merge into: lp:~mozilla-extensions-dev/firefox-extensions/flashgot.ubuntu
Diff against target: None lines
To merge this branch: bzr merge lp:~gnomefreak/firefox-extensions/flashgot.ubuntu
Reviewer Review Type Date Requested Status
Andrea Veri (community) Approve
Review via email: mp+11315@code.launchpad.net
To post a comment you must log in.
Revision history for this message
John Vivirito (gnomefreak) wrote :

ok all fixes applied please merge.

Revision history for this message
Andrea Veri (av) wrote :

fixes seems to apply. Approving.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory '.bzr-builddeb'
2=== added file '.bzr-builddeb/default.conf'
3--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
4+++ .bzr-builddeb/default.conf 2009-09-07 15:16:17 +0000
5@@ -0,0 +1,4 @@
6+[BUILDDEB]
7+export-upstream-revision = revid:gnomefreak@ubuntu.com-20090907140616-el91l7yz71wvw7hi
8+export-upstream = .
9+merge = True
10
11=== modified file 'debian/changelog'
12--- debian/changelog 2009-09-07 14:06:16 +0000
13+++ debian/changelog 2009-09-07 15:16:17 +0000
14@@ -1,6 +1,6 @@
15 flashgot (1.2-0+dfsg1-1) UNRELEASED; urgency=low
16
17- [John Vivirito]
18+ [John Vivirito <gnomefreak@ubuntu.com>]
19 * New upstream version 1.2
20 * Removed chrome/flashgot.jar!/content/flashgot/FlashGot.exe:
21 We have no reason to build with any Windows content.
22@@ -8,10 +8,16 @@
23 due to a non-free license
24 * Removed chrome/flashgot.jar!/content/flashgot/DAP.cpp:
25 Only useful to Internet Explorer
26- * debian/rules: uncommented MOZ_XPI_MOZILLA_DIRS to fix addon install
27- * debian/control: demoted xpi:depends to satisfy mozilla-devscripts version 0.15
28+ * Removed chrome/flashgot.jar!/content/flashgot/Flashgot.h: It has no license
29+ * debian/rules:
30+ - uncommented MOZ_XPI_MOZILLA_DIRS to fix addon install
31+ - removed all browsers from MOZ_XPI_MOZILLA_DIRS
32+ * debian/control:
33+ - demoted xpi:depends to satisfy mozilla-devscripts version 0.15
34+ - removed all browsers from depends
35+ * Added .bzr-builddeb/default.conf dir with revision id info
36
37- [Andrea Veri]
38+ [Andrea Veri <andrea.veri89@gmail.com>]
39 * First package's upload on Debian unstable.
40 * debian/control:
41 - added myself as co-maintainer
42@@ -31,9 +37,9 @@
43 * debian/rules:
44 - removed the extra license file using the latest
45 MOZ_XPI_DOCUMENTED_LICENSE_FILES available on
46- mozilla-devscript 0.15 package.
47+ mozilla-devscript 0.15 package.
48
49- -- John Vivirito <gnomefreak@ubuntu.com> Mon, 07 Sep 2009 10:05:35 -0400
50+ -- John Vivirito <gnomefreak@ubuntu.com> Mon, 07 Sep 2009 10:59:25 -0400
51
52 flashgot (1.1.9-0+dfsg-0ubuntu1) karmic; urgency=low
53
54
55=== modified file 'debian/control'
56--- debian/control 2009-09-07 14:06:16 +0000
57+++ debian/control 2009-09-07 15:16:17 +0000
58@@ -12,7 +12,7 @@
59
60 Package: flashgot
61 Architecture: all
62-Depends: curl, firefox | firefox-3.0 | abrowser-3.0 | iceweasel | icedove | thunderbird | firefox-3.5 | firefox-3.6 | seamonkey | seamonkey-2.0 | abrowser-3.5 | abrowser-3.6
63+Depends: curl, | icedove | thunderbird
64 Recommends: ${xpi:Depends}
65 Description: Turns every supported download manager into a download manager for Firefox
66 FlashGot offers also a Build Gallery functionality which helps to synthetize
67
68=== modified file 'debian/rules'
69--- debian/rules 2009-09-07 14:06:16 +0000
70+++ debian/rules 2009-09-07 15:16:17 +0000
71@@ -30,7 +30,7 @@
72 # iceweasel - set if compatible with Iceweasel
73 # icedove - set if compatible with Icedove
74 # Don't forget to adjust Depends field in debian/control If the extension doesnt work with Thunderbird or Icedove
75-MOZ_XPI_MOZILLA_DIRS := firefox-addons firefox thunderbird iceweasel icedove
76+MOZ_XPI_MOZILLA_DIRS := thunderbird icedove
77
78 include /usr/share/cdbs/1/rules/debhelper.mk
79 include /usr/share/mozilla-devscripts/xpi.mk

Subscribers

People subscribed via source and target branches

to all changes: