[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-142-g786665c

[Gustavo Noronha Silva]

The following commit has been merged in the debian/experimental branch:
commit baeec21e689f2c12bec28cc00398bbbceb31a1a5
Author: Gustavo Noronha Silva <kov at debian.org>
Date:   Thu Dec 23 09:59:16 2010 -0200

    Rename introspection packages to gir1.2-*

diff --git a/debian/changelog b/debian/changelog
index 7be8812..5ff4d4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ webkit (1.3.9-1) experimental; urgency=low
   - fixes build with newest GTK+
   * debian/control:
   - build-depend on GTK+ >= 2.91.7 for the GTK+3-based version
+  - rename introspection packages to gir1.2-*
+  - updated Build-Depends on gobject-introspection
 
  -- Gustavo Noronha Silva <kov at debian.org>  Thu, 23 Dec 2010 09:42:48 -0200
 
diff --git a/debian/control b/debian/control
index 69cb6b8..fd1cad3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: optional
 Section: web
 Maintainer: Debian WebKit Maintainers <pkg-webkit-maintainers at lists.alioth.debian.org>
 Uploaders: Mike Hommey <glandium at debian.org>, Gustavo Noronha Silva <kov at debian.org>
-Build-Depends: debhelper (>= 5.0), libgtk2.0-dev (>= 2.10), libgtk3.0-dev (>= 2.91.7), gir1.0-gtk-3.0 (>= 2.91.7), libpango1.0-dev (>= 1.16), libicu-dev, libxslt-dev, libsoup2.4-dev (>= 2.32.2), libsqlite3-dev, gperf, bison, flex, libjpeg62-dev, libpng12-dev, libxt-dev, autotools-dev, libgstreamer-plugins-base0.10-dev, libenchant-dev, gtk-doc-tools, libgail-dev, libgail3.0-dev, libgeoclue-dev, gobject-introspection (>= 0.9.5), libgirepository1.0-dev (>= 0.9.5)
+Build-Depends: debhelper (>= 5.0), libgtk2.0-dev (>= 2.10), libgtk3.0-dev (>= 2.91.7), gir1.2-gtk-3.0 (>= 2.91.7), libpango1.0-dev (>= 1.16), libicu-dev, libxslt-dev, libsoup2.4-dev (>= 2.32.2), libsqlite3-dev, gperf, bison, flex, libjpeg62-dev, libpng12-dev, libxt-dev, autotools-dev, libgstreamer-plugins-base0.10-dev, libenchant-dev, gtk-doc-tools, libgail-dev, libgail3.0-dev, libgeoclue-dev, gobject-introspection (>= 0.9.12-4), libgirepository1.0-dev (>= 0.9.12-4)
 Build-Conflicts: gir-repository-dev
 Standards-Version: 3.8.1.0
 Homepage: http://webkit.org/
@@ -79,13 +79,13 @@ Description: Web content engine library for Gtk+ - Debugging symbols
  .
  This package provides the debugging symbols for the Webkit library for Gtk+.
 
-Package: gir1.0-webkit-1.0
+Package: gir1.2-webkit-1.0
 Section: libs
 Architecture: any
 Depends: ${gir:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
-Conflicts: gobject-introspection-repository
+Conflicts: gobject-introspection-repository, gir1.0-webkit-1.0
 Description: GObject introspection data for the WebKit library
  This package contains introspection data for WebKit, a web content
  engine for GTK+.
@@ -152,13 +152,13 @@ Description: Web content engine library for Gtk+ - Debugging symbols
  .
  This package provides the debugging symbols for the Webkit library for Gtk+.
 
-Package: gir1.0-webkit-3.0
+Package: gir1.2-webkit-3.0
 Section: libs
 Architecture: any
 Depends: ${gir:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
-Conflicts: gobject-introspection-repository
+Conflicts: gobject-introspection-repository, gir1.0-webkit-3.0
 Description: GObject introspection data for the WebKit library
  This package contains introspection data for WebKit, a web content
  engine for GTK+.
diff --git a/debian/gir1.0-webkit-1.0.install b/debian/gir1.2-webkit-1.0.install
similarity index 100%
rename from debian/gir1.0-webkit-1.0.install
rename to debian/gir1.2-webkit-1.0.install
diff --git a/debian/gir1.0-webkit-3.0.install b/debian/gir1.2-webkit-3.0.install
similarity index 100%
rename from debian/gir1.0-webkit-3.0.install
rename to debian/gir1.2-webkit-3.0.install
diff --git a/debian/rules b/debian/rules
index c215066..96f5d7e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -159,13 +159,13 @@ ifeq (2.0,$(filter 2.0,$(GTK_VERSIONS)))
 	dh_install -plibwebkitgtk-1.0-0 --sourcedir=debian/tmp-2.0
 	dh_install -plibwebkitgtk-dev --sourcedir=debian/tmp-2.0
 	dh_install -plibwebkitgtk-1.0-0-dbg --sourcedir=debian/tmp-2.0
-	dh_install -pgir1.0-webkit-1.0 --sourcedir=debian/tmp-2.0
+	dh_install -pgir1.2-webkit-1.0 --sourcedir=debian/tmp-2.0
 endif
 ifeq (3.0,$(filter 3.0,$(GTK_VERSIONS)))
 	dh_install -plibwebkitgtk-3.0-0 --sourcedir=debian/tmp-3.0
 	dh_install -plibwebkitgtk-3.0-dev --sourcedir=debian/tmp-3.0
 	dh_install -plibwebkitgtk-3.0-0-dbg --sourcedir=debian/tmp-3.0
-	dh_install -pgir1.0-webkit-3.0 --sourcedir=debian/tmp-3.0
+	dh_install -pgir1.2-webkit-3.0 --sourcedir=debian/tmp-3.0
 endif
 	dh_link -a
 ifeq (2.0,$(filter 2.0,$(GTK_VERSIONS)))

-- 
WebKit Debian packaging