r44514 - in /desktop/unstable/devhelp/debian: changelog control control.in

[pochu at users.alioth.debian.org]

Author: pochu
Date: Thu May 21 19:22:59 2015
New Revision: 44514

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=44514
Log:
* 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.

Modified:
    desktop/unstable/devhelp/debian/changelog
    desktop/unstable/devhelp/debian/control
    desktop/unstable/devhelp/debian/control.in

Modified: desktop/unstable/devhelp/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/devhelp/debian/changelog?rev=44514&op=diff
==============================================================================
--- desktop/unstable/devhelp/debian/changelog	[utf-8] (original)
+++ desktop/unstable/devhelp/debian/changelog	[utf-8] Thu May 21 19:22:59 2015
@@ -1,7 +1,14 @@
 devhelp (3.14.0-2) UNRELEASED; urgency=medium
 
+  [ Laurent Bigonville ]
   * debian/rules: List not installed files
   * debian/devhelp.install: Install appdata file
+
+  [ Emilio Pozuelo Monfort ]
+  * 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.
 
  -- Laurent Bigonville <bigon at debian.org>  Mon, 27 Oct 2014 15:55:06 +0100
 

Modified: desktop/unstable/devhelp/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/devhelp/debian/control?rev=44514&op=diff
==============================================================================
--- desktop/unstable/devhelp/debian/control	[utf-8] (original)
+++ desktop/unstable/devhelp/debian/control	[utf-8] Thu May 21 19:22:59 2015
@@ -6,7 +6,7 @@
 Section: devel
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
 Homepage: https://wiki.gnome.org/Apps/Devhelp
 Build-Depends: cdbs,
                debhelper (>= 8),
@@ -16,7 +16,7 @@
                intltool,
                libglib2.0-dev (>= 2.37.3),
                libgtk-3-dev (>= 3.13.4),
-               libwebkit2gtk-3.0-dev (>= 2.0.0),
+               libwebkit2gtk-4.0-dev (>= 2.0.0),
                libxml-parser-perl,
                python3
 Standards-Version: 3.9.5
@@ -29,6 +29,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          devhelp-common (>= ${source:Version})
+Breaks: anjuta (<< 2:3.14.0-2),
 Description: Library providing documentation browser functionality
  This library provides embedable widgets from the Devhelp program to
  be integrated in tools like the Anjuta IDE for browsing API reference
@@ -40,7 +41,7 @@
 Depends: ${misc:Depends},
          libdevhelp-3-2 (= ${binary:Version}),
          libgtk-3-dev (>= 3.5.6),
-         libwebkit2gtk-3.0-dev (>= 2.0.0)
+         libwebkit2gtk-4.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

Modified: desktop/unstable/devhelp/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/devhelp/debian/control.in?rev=44514&op=diff
==============================================================================
--- desktop/unstable/devhelp/debian/control.in	[utf-8] (original)
+++ desktop/unstable/devhelp/debian/control.in	[utf-8] Thu May 21 19:22:59 2015
@@ -12,7 +12,7 @@
                intltool,
                libglib2.0-dev (>= 2.37.3),
                libgtk-3-dev (>= 3.13.4),
-               libwebkit2gtk-3.0-dev (>= 2.0.0),
+               libwebkit2gtk-4.0-dev (>= 2.0.0),
                libxml-parser-perl,
                python3
 Standards-Version: 3.9.5
@@ -25,6 +25,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          devhelp-common (>= ${source:Version})
+Breaks: anjuta (<< 2:3.14.0-2),
 Description: Library providing documentation browser functionality
  This library provides embedable widgets from the Devhelp program to
  be integrated in tools like the Anjuta IDE for browsing API reference
@@ -36,7 +37,7 @@
 Depends: ${misc:Depends},
          libdevhelp-3-2 (= ${binary:Version}),
          libgtk-3-dev (>= 3.5.6),
-         libwebkit2gtk-3.0-dev (>= 2.0.0)
+         libwebkit2gtk-4.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