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

[Jeremy Bícha]

The thunderbird equivalent merge proposal is

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

[Rico Tzschichholz (ricotz)]

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

Unmerged revisions

1218. By Jeremy Bícha on 2017-12-05

Update dependencies

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

=== modified file 'debian/config/mozconfig.in'
--- debian/config/mozconfig.in	2017-11-28 06:36:40 +0000
+++ debian/config/mozconfig.in	2017-12-05 05:46:45 +0000
@@ -6,6 +6,7 @@
 ac_add_options --with-l10n-base=@TOPSRCDIR@/@DEB_BUILDDIR@/l10n
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/@MOZ_OBJDIR@
 ac_add_options --enable-release
+ac_add_options --disable-gconf
 ac_add_options --disable-install-strip
 ac_add_options --disable-updater
 ac_add_options --enable-application=browser
 
=== modified file 'debian/control'
--- debian/control	2017-11-11 09:22:52 +0000
+++ debian/control	2017-12-05 05:46:45 +0000
@@ -9,7 +9,6 @@
 	debhelper (>= 9),
 	autotools-dev,
 	autoconf2.13,
-	quilt,
 	zip,
 	libx11-dev,
 	libx11-xcb-dev,
@@ -21,8 +20,6 @@
 	libpango1.0-dev (>= 1.14.0),
 	libfontconfig1-dev,
 	libfreetype6-dev (>= 2.0.1),
-	libgconf2-dev (>= 1.2.1),
-	libgnomeui-dev (>= 2.2.0),
 	libstartup-notification0-dev,
 	libasound2-dev,
 	libcurl4-openssl-dev,
@@ -55,7 +52,7 @@
 	${support:Recommends},
 	libcanberra0,
 	libdbusmenu-glib4,
-	libdbusmenu-gtk4
+	libdbusmenu-gtk3-4
 Provides: www-browser,
 	iceweasel,
 	gnome-www-browser,
 
=== modified file 'debian/control.in'
--- debian/control.in	2017-11-11 09:22:52 +0000
+++ debian/control.in	2017-12-05 05:46:45 +0000
@@ -9,7 +9,6 @@
 	debhelper (>= 9),
 	autotools-dev,
 	autoconf2.13,
-	quilt,
 	zip,
 	libx11-dev,
 	libx11-xcb-dev,
@@ -21,8 +20,6 @@
 	libpango1.0-dev (>= 1.14.0),
 	libfontconfig1-dev,
 	libfreetype6-dev (>= 2.0.1),
-	libgconf2-dev (>= 1.2.1),
-	libgnomeui-dev (>= 2.2.0),
 	libstartup-notification0-dev,
 	libasound2-dev,
 	libcurl4-openssl-dev,
@@ -55,7 +52,7 @@
 	${support:Recommends},
 	libcanberra0,
 	libdbusmenu-glib4,
-	libdbusmenu-gtk4
+	libdbusmenu-gtk3-4
 Provides: www-browser,
 	iceweasel,
 	gnome-www-browser,