Mozilla Firefox

Merge lp:~jbicha/firefox/update-dependencies into lp:~mozillateam/firefox/firefox-beta.artful

  1. update-dependencies
  2. Merge into firefox-beta.artful
Proposed by Jeremy Bícha
Status: Needs review
Proposed branch: lp:~jbicha/firefox/update-dependencies
Merge into: lp:~mozillateam/firefox/firefox-beta.artful
Diff against target: 71 lines (+3/-8)
3 files modified
debian/config/mozconfig.in (+1/-0)
debian/control (+1/-4)
debian/control.in (+1/-4)
To merge this branch: bzr merge lp:~jbicha/firefox/update-dependencies
Reviewer Review Type Date Requested Status
Rico Tzschichholz Pending
Review via email: mp+334732@code.launchpad.net

Description of the change

The thunderbird equivalent merge proposal is

https://code.launchpad.net/~jbicha/thunderbird/update-dependencies/+merge/334654

To post a comment you must log in.
Revision history for this message
Rico Tzschichholz (ricotz) wrote :

Merged into https://code.launchpad.net/~mozillateam/firefox/firefox-trunk.head

Reply

Unmerged revisions

1218. By Jeremy Bícha

Update dependencies

Drop obsolete Build-Depends on quilt, libgconf2-dev and libgnomeui-dev
Depend on libdbusmenu-gtk3-4 instead of the GTK+ 2 version

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/config/mozconfig.in'
2--- debian/config/mozconfig.in 2017-11-28 06:36:40 +0000
3+++ debian/config/mozconfig.in 2017-12-05 05:46:45 +0000
4@@ -6,6 +6,7 @@
5 ac_add_options --with-l10n-base=@TOPSRCDIR@/@DEB_BUILDDIR@/l10n
6 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/@MOZ_OBJDIR@
7 ac_add_options --enable-release
8+ac_add_options --disable-gconf
9 ac_add_options --disable-install-strip
10 ac_add_options --disable-updater
11 ac_add_options --enable-application=browser
12
13=== modified file 'debian/control'
14--- debian/control 2017-11-11 09:22:52 +0000
15+++ debian/control 2017-12-05 05:46:45 +0000
16@@ -9,7 +9,6 @@
17 debhelper (>= 9),
18 autotools-dev,
19 autoconf2.13,
20- quilt,
21 zip,
22 libx11-dev,
23 libx11-xcb-dev,
24@@ -21,8 +20,6 @@
25 libpango1.0-dev (>= 1.14.0),
26 libfontconfig1-dev,
27 libfreetype6-dev (>= 2.0.1),
28- libgconf2-dev (>= 1.2.1),
29- libgnomeui-dev (>= 2.2.0),
30 libstartup-notification0-dev,
31 libasound2-dev,
32 libcurl4-openssl-dev,
33@@ -55,7 +52,7 @@
34 ${support:Recommends},
35 libcanberra0,
36 libdbusmenu-glib4,
37- libdbusmenu-gtk4
38+ libdbusmenu-gtk3-4
39 Provides: www-browser,
40 iceweasel,
41 gnome-www-browser,
42
43=== modified file 'debian/control.in'
44--- debian/control.in 2017-11-11 09:22:52 +0000
45+++ debian/control.in 2017-12-05 05:46:45 +0000
46@@ -9,7 +9,6 @@
47 debhelper (>= 9),
48 autotools-dev,
49 autoconf2.13,
50- quilt,
51 zip,
52 libx11-dev,
53 libx11-xcb-dev,
54@@ -21,8 +20,6 @@
55 libpango1.0-dev (>= 1.14.0),
56 libfontconfig1-dev,
57 libfreetype6-dev (>= 2.0.1),
58- libgconf2-dev (>= 1.2.1),
59- libgnomeui-dev (>= 2.2.0),
60 libstartup-notification0-dev,
61 libasound2-dev,
62 libcurl4-openssl-dev,
63@@ -55,7 +52,7 @@
64 ${support:Recommends},
65 libcanberra0,
66 libdbusmenu-glib4,
67- libdbusmenu-gtk4
68+ libdbusmenu-gtk3-4
69 Provides: www-browser,
70 iceweasel,
71 gnome-www-browser,

Subscribers

People subscribed via source and target branches

to all changes: