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
=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf 2009-09-07 15:16:17 +0000
@@ -0,0 +1,4 @@
1[BUILDDEB]
2export-upstream-revision = revid:gnomefreak@ubuntu.com-20090907140616-el91l7yz71wvw7hi
3export-upstream = .
4merge = True
05
=== modified file 'debian/changelog'
--- debian/changelog 2009-09-07 14:06:16 +0000
+++ debian/changelog 2009-09-07 15:16:17 +0000
@@ -1,6 +1,6 @@
1flashgot (1.2-0+dfsg1-1) UNRELEASED; urgency=low1flashgot (1.2-0+dfsg1-1) UNRELEASED; urgency=low
22
3 [John Vivirito]3 [John Vivirito <gnomefreak@ubuntu.com>]
4 * New upstream version 1.24 * New upstream version 1.2
5 * Removed chrome/flashgot.jar!/content/flashgot/FlashGot.exe:5 * Removed chrome/flashgot.jar!/content/flashgot/FlashGot.exe:
6 We have no reason to build with any Windows content.6 We have no reason to build with any Windows content.
@@ -8,10 +8,16 @@
8 due to a non-free license8 due to a non-free license
9 * Removed chrome/flashgot.jar!/content/flashgot/DAP.cpp:9 * Removed chrome/flashgot.jar!/content/flashgot/DAP.cpp:
10 Only useful to Internet Explorer10 Only useful to Internet Explorer
11 * debian/rules: uncommented MOZ_XPI_MOZILLA_DIRS to fix addon install11 * Removed chrome/flashgot.jar!/content/flashgot/Flashgot.h: It has no license
12 * debian/control: demoted xpi:depends to satisfy mozilla-devscripts version 0.1512 * debian/rules:
13 - uncommented MOZ_XPI_MOZILLA_DIRS to fix addon install
14 - removed all browsers from MOZ_XPI_MOZILLA_DIRS
15 * debian/control:
16 - demoted xpi:depends to satisfy mozilla-devscripts version 0.15
17 - removed all browsers from depends
18 * Added .bzr-builddeb/default.conf dir with revision id info
1319
14 [Andrea Veri]20 [Andrea Veri <andrea.veri89@gmail.com>]
15 * First package's upload on Debian unstable.21 * First package's upload on Debian unstable.
16 * debian/control:22 * debian/control:
17 - added myself as co-maintainer23 - added myself as co-maintainer
@@ -31,9 +37,9 @@
31 * debian/rules:37 * debian/rules:
32 - removed the extra license file using the latest38 - removed the extra license file using the latest
33 MOZ_XPI_DOCUMENTED_LICENSE_FILES available on39 MOZ_XPI_DOCUMENTED_LICENSE_FILES available on
34 mozilla-devscript 0.15 package. 40 mozilla-devscript 0.15 package.
3541
36 -- John Vivirito <gnomefreak@ubuntu.com> Mon, 07 Sep 2009 10:05:35 -040042 -- John Vivirito <gnomefreak@ubuntu.com> Mon, 07 Sep 2009 10:59:25 -0400
3743
38flashgot (1.1.9-0+dfsg-0ubuntu1) karmic; urgency=low44flashgot (1.1.9-0+dfsg-0ubuntu1) karmic; urgency=low
3945
4046
=== modified file 'debian/control'
--- debian/control 2009-09-07 14:06:16 +0000
+++ debian/control 2009-09-07 15:16:17 +0000
@@ -12,7 +12,7 @@
1212
13Package: flashgot13Package: flashgot
14Architecture: all14Architecture: all
15Depends: 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.615Depends: curl, | icedove | thunderbird
16Recommends: ${xpi:Depends}16Recommends: ${xpi:Depends}
17Description: Turns every supported download manager into a download manager for Firefox17Description: Turns every supported download manager into a download manager for Firefox
18 FlashGot offers also a Build Gallery functionality which helps to synthetize 18 FlashGot offers also a Build Gallery functionality which helps to synthetize
1919
=== modified file 'debian/rules'
--- debian/rules 2009-09-07 14:06:16 +0000
+++ debian/rules 2009-09-07 15:16:17 +0000
@@ -30,7 +30,7 @@
30# iceweasel - set if compatible with Iceweasel30# iceweasel - set if compatible with Iceweasel
31# icedove - set if compatible with Icedove31# icedove - set if compatible with Icedove
32# Don't forget to adjust Depends field in debian/control If the extension doesnt work with Thunderbird or Icedove32# Don't forget to adjust Depends field in debian/control If the extension doesnt work with Thunderbird or Icedove
33MOZ_XPI_MOZILLA_DIRS := firefox-addons firefox thunderbird iceweasel icedove33MOZ_XPI_MOZILLA_DIRS := thunderbird icedove
3434
35include /usr/share/cdbs/1/rules/debhelper.mk35include /usr/share/cdbs/1/rules/debhelper.mk
36include /usr/share/mozilla-devscripts/xpi.mk36include /usr/share/mozilla-devscripts/xpi.mk

Subscribers

People subscribed via source and target branches

to all changes: