diff -Nru devhelp-3.16.1/debian/changelog devhelp-3.16.1/debian/changelog --- devhelp-3.16.1/debian/changelog 2015-05-27 09:05:23.000000000 +1000 +++ devhelp-3.16.1/debian/changelog 2015-05-28 06:58:51.000000000 +1000 @@ -1,3 +1,13 @@ +devhelp (3.16.1-1ubuntu1) wily; urgency=medium + + * Revert until this is dropped to universe or webkit2gtk is main: LP:#1459434 + - debian/control.in: + + Switch to libwebkit2gtk-4.0-dev. + + Break anjuta << 2:3.14.0-2 to prevent anjuta from mixing + libwebkit2gtk-3.0 and libwebkit2gtk-4.0. + + -- Jackson Doak Thu, 28 May 2015 06:41:15 +1000 + devhelp (3.16.1-1) unstable; urgency=medium * New upstream release. diff -Nru devhelp-3.16.1/debian/control devhelp-3.16.1/debian/control --- devhelp-3.16.1/debian/control 2015-05-27 09:07:38.000000000 +1000 +++ devhelp-3.16.1/debian/control 2015-05-28 06:59:32.000000000 +1000 @@ -5,8 +5,9 @@ Source: devhelp Section: devel Priority: optional -Maintainer: Debian GNOME Maintainers -Uploaders: Andreas Henriksson , Emilio Pozuelo Monfort , Michael Biebl +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: Andreas Henriksson , Debian GNOME Maintainers , Emilio Pozuelo Monfort , Michael Biebl Homepage: https://wiki.gnome.org/Apps/Devhelp Build-Depends: cdbs, debhelper (>= 9), @@ -16,7 +17,7 @@ intltool, libglib2.0-dev (>= 2.37.3), libgtk-3-dev (>= 3.13.4), - libwebkit2gtk-4.0-dev (>= 2.0.0), + libwebkit2gtk-3.0-dev (>= 2.0.0), libxml-parser-perl, python3 Standards-Version: 3.9.6 @@ -41,7 +42,7 @@ Depends: ${misc:Depends}, libdevhelp-3-2 (= ${binary:Version}), libgtk-3-dev (>= 3.5.6), - libwebkit2gtk-4.0-dev (>= 2.0.0) + libwebkit2gtk-3.0-dev (>= 2.0.0) Description: Library providing documentation browser functionality (development) This library provides embedable widgets from the Devhelp program to be integrated in tools like the Anjuta IDE for browsing API reference diff -Nru devhelp-3.16.1/debian/control.in devhelp-3.16.1/debian/control.in --- devhelp-3.16.1/debian/control.in 2015-05-27 08:47:00.000000000 +1000 +++ devhelp-3.16.1/debian/control.in 2015-05-28 06:46:13.000000000 +1000 @@ -1,7 +1,8 @@ Source: devhelp Section: devel Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Homepage: https://wiki.gnome.org/Apps/Devhelp Build-Depends: cdbs, @@ -12,7 +13,7 @@ intltool, libglib2.0-dev (>= 2.37.3), libgtk-3-dev (>= 3.13.4), - libwebkit2gtk-4.0-dev (>= 2.0.0), + libwebkit2gtk-3.0-dev (>= 2.0.0), libxml-parser-perl, python3 Standards-Version: 3.9.6 @@ -37,7 +38,7 @@ Depends: ${misc:Depends}, libdevhelp-3-2 (= ${binary:Version}), libgtk-3-dev (>= 3.5.6), - libwebkit2gtk-4.0-dev (>= 2.0.0) + libwebkit2gtk-3.0-dev (>= 2.0.0) Description: Library providing documentation browser functionality (development) This library provides embedable widgets from the Devhelp program to be integrated in tools like the Anjuta IDE for browsing API reference