r20024 - in /desktop/unstable/epiphany-webkit/debian: changelog control control.in

[kov at users.alioth.debian.org]

Author: kov
Date: Mon May 18 00:06:59 2009
New Revision: 20024

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20024
Log:
Merge relevant changes from r19903

Modified:
    desktop/unstable/epiphany-webkit/debian/changelog
    desktop/unstable/epiphany-webkit/debian/control
    desktop/unstable/epiphany-webkit/debian/control.in

Modified: desktop/unstable/epiphany-webkit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-webkit/debian/changelog?rev=20024&op=diff
==============================================================================
--- desktop/unstable/epiphany-webkit/debian/changelog (original)
+++ desktop/unstable/epiphany-webkit/debian/changelog Mon May 18 00:06:59 2009
@@ -4,6 +4,11 @@
   * Add libglib2.0-doc and libgtk2.0-doc to b-d-i to ensure proper
     xrefs.
   * 12_safetypes.patch: make application/x-desktop an unsafe MIME type.
+  * Bump gtk+ build-dependency.
+  * Fix dependencies of the -dev package.
+  * Add a strict dependency between -dev and -data to ensure it is the 
+    same major version as epiphany-gecko.
+  * Fix section for debug package.
 
  -- Gustavo Noronha Silva <kov at debian.org>  Sun, 17 May 2009 20:50:26 -0300
 

Modified: desktop/unstable/epiphany-webkit/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-webkit/debian/control?rev=20024&op=diff
==============================================================================
--- desktop/unstable/epiphany-webkit/debian/control (original)
+++ desktop/unstable/epiphany-webkit/debian/control Mon May 18 00:06:59 2009
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 5),
                pkg-config,
                libglib2.0-dev (>= 2.18.0),
-               libgtk2.0-dev (>= 2.14.0),
+               libgtk2.0-dev (>= 2.16.0),
                libxml2-dev (>= 2.6.12),
                libxslt1-dev (>= 1.1.7),
                libglade2-dev (>= 2.3.1),
@@ -38,7 +38,7 @@
                lsb-release,
                zip
 Build-Depends-Indep: libglib2.0-doc, libgtk2.0-doc
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 Homepage: http://www.gnome.org/projects/epiphany/
 
 Package: epiphany-webkit
@@ -86,7 +86,10 @@
 Package: epiphany-webkit-dev
 Architecture: all
 Section: devel
-Depends: epiphany-webkit (>= ${binary:Version}), libgnomeui-dev (>= 2.16.0-2), libwebkit-dev
+Depends: epiphany-webkit (>= ${binary:Version}),
+         epiphany-webkit-data (= ${source:Version}),
+         libgtk2.0-dev (>= 2.16.0),
+         libwebkit-dev
 Conflicts: epiphany-browser-dev
 Description: Development files for the GNOME web browser
  Epiphany is a simple yet powerful GNOME web browser targeted at
@@ -97,7 +100,7 @@
 
 Package: epiphany-webkit-dbg
 Architecture: any
-Section: gnome
+Section: debug
 Priority: extra
 Depends: epiphany-webkit (= ${binary:Version})
 Recommends: libwebkit-1.0-2-dbg

Modified: desktop/unstable/epiphany-webkit/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-webkit/debian/control.in?rev=20024&op=diff
==============================================================================
--- desktop/unstable/epiphany-webkit/debian/control.in (original)
+++ desktop/unstable/epiphany-webkit/debian/control.in Mon May 18 00:06:59 2009
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 5),
                pkg-config,
                libglib2.0-dev (>= 2.18.0),
-               libgtk2.0-dev (>= 2.14.0),
+               libgtk2.0-dev (>= 2.16.0),
                libxml2-dev (>= 2.6.12),
                libxslt1-dev (>= 1.1.7),
                libglade2-dev (>= 2.3.1),
@@ -38,7 +38,7 @@
                lsb-release,
                zip
 Build-Depends-Indep: libglib2.0-doc, libgtk2.0-doc
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 Homepage: http://www.gnome.org/projects/epiphany/
 
 Package: epiphany-webkit
@@ -86,7 +86,10 @@
 Package: epiphany-webkit-dev
 Architecture: all
 Section: devel
-Depends: epiphany-webkit (>= ${binary:Version}), libgnomeui-dev (>= 2.16.0-2), libwebkit-dev
+Depends: epiphany-webkit (>= ${binary:Version}),
+         epiphany-webkit-data (= ${source:Version}),
+         libgtk2.0-dev (>= 2.16.0),
+         libwebkit-dev
 Conflicts: epiphany-browser-dev
 Description: Development files for the GNOME web browser
  Epiphany is a simple yet powerful GNOME web browser targeted at
@@ -97,7 +100,7 @@
 
 Package: epiphany-webkit-dbg
 Architecture: any
-Section: gnome
+Section: debug
 Priority: extra
 Depends: epiphany-webkit (= ${binary:Version})
 Recommends: libwebkit-1.0-2-dbg