[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.0.2+pre.svn37878-1-3024-g716ac29

[Gustavo Noronha Silva]

The following commit has been merged in the debian/unstable branch:
commit ee12e2468d1216f59ffe4f986f1e3acc003480fc
Author: Gustavo Noronha Silva <kov at kov.eti.br>
Date:   Thu Mar 5 16:24:50 2009 -0300

    New upstream release; this release bumps soversion, and drops curl in
    favor of libsoup, so update package names and build-deps accordingly.

diff --git a/debian/changelog b/debian/changelog
index 4d4eb44..f06d5b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+webkit (1.1.1-1) UNRELEASED; urgency=low
+
+  * New 1.1.1 upstream release
+  * debian/rules, debian/control, debian/*:
+  - soversion was bumped, so rename packages accordingly
+  * debian/control:
+  - curl is not used anymore, so drop build-dependecy and replace it with
+    libsoup2.4 >= 2.25.91
+
+ -- Gustavo Noronha Silva <kov at debian.org>  Thu, 05 Mar 2009 16:20:39 -0300
+
 webkit (1.0.2~pre.svn37878-1) experimental; urgency=low
 
   * Upstream 1.0.2 pre-release, taken from svn revision 37878.
diff --git a/debian/control b/debian/control
index cf77094..55326f9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,16 +3,18 @@ Priority: optional
 Section: web
 Maintainer: Debian WebKit Maintainers <pkg-webkit-maintainers at lists.alioth.debian.org>
 Uploaders: Mike Hommey <glandium at debian.org>
-Build-Depends: debhelper (>= 5.0), libgtk2.0-dev (>= 2.10), libpango1.0-dev (>= 1.16), libicu-dev, libxslt-dev, libcurl4-dev, libsqlite3-dev, gperf, bison, flex, libjpeg62-dev, libpng12-dev, libxt-dev, autotools-dev
+Build-Depends: debhelper (>= 5.0), libgtk2.0-dev (>= 2.10), libpango1.0-dev (>= 1.16), libicu-dev, libxslt-dev, libsoup2.4-dev (>= 2.25.91), libsqlite3-dev, gperf, bison, flex, libjpeg62-dev, libpng12-dev, libxt-dev, autotools-dev
 Standards-Version: 3.8.0.1
 Homepage: http://webkit.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-webkit/webkit.git
 Vcs-Git: git://git.debian.org/git/pkg-webkit/webkit.git
 
-Package: libwebkit-1.0-1
+Package: libwebkit-1.0-2
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
+Conflicts: libwebkit-1.0-1
+Replaces: libwebkit-1.0-1
 Description: Web content engine library for Gtk+
  WebKit is a web content engine, derived from KHTML and KJS from KDE, and
  used primarily in Apple's Safari browser.  It is made to be embedded in
@@ -27,7 +29,7 @@ Package: libwebkit-dev
 Section: libdevel
 Priority: extra
 Architecture: all
-Depends: libwebkit-1.0-1 (>= ${source:Upstream-Version}), libgtk2.0-dev
+Depends: libwebkit-1.0-2 (>= ${source:Upstream-Version}), libgtk2.0-dev
 Conflicts: libwebkitgdk-dev
 Description: Web content engine library for Gtk+ - Development files
  WebKit is a web content engine, derived from KHTML and KJS from KDE, and
@@ -40,11 +42,13 @@ Description: Web content engine library for Gtk+ - Development files
  This package provides development files required to create Gtk+ applications
  embedding WebKit.
 
-Package: libwebkit-1.0-1-dbg
+Package: libwebkit-1.0-2-dbg
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libwebkit-1.0-1 (= ${binary:Version})
+Depends: libwebkit-1.0-2 (= ${binary:Version})
+Conflicts: libwebkit-1.0-1-dbg
+Replaces: libwebkit-1.0-1-dbg
 Description: Web content engine library for Gtk+ - Debugging symbols
  WebKit is a web content engine, derived from KHTML and KJS from KDE, and
  used primarily in Apple's Safari browser.  It is made to be embedded in
diff --git a/debian/libwebkit-1.0-1.install b/debian/libwebkit-1.0-2.install
similarity index 100%
rename from debian/libwebkit-1.0-1.install
rename to debian/libwebkit-1.0-2.install
diff --git a/debian/libwebkit-1.0-1.symbols b/debian/libwebkit-1.0-2.symbols
similarity index 100%
rename from debian/libwebkit-1.0-1.symbols
rename to debian/libwebkit-1.0-2.symbols
diff --git a/debian/rules b/debian/rules
index d21dd36..b56c54c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -92,10 +92,10 @@ binary-arch: build install
 	dh_installchangelogs -a
 	dh_install -a --sourcedir=debian/tmp
 	dh_link -a
-	dh_strip -a --dbg-package=libwebkit-1.0-1-dbg
+	dh_strip -a --dbg-package=libwebkit-1.0-2-dbg
 	dh_compress -a
 	dh_fixperms -a
-	dh_makeshlibs -a -V 'libwebkit-1.0-1 (>= 1.0.2~pre.svn37878)' -- -c4
+	dh_makeshlibs -a -V 'libwebkit-1.0-2 (>= 1.1.1)' -- -c4
 	dh_installdeb -a
 	dh_shlibdeps -a
 	dh_gencontrol -a

-- 
WebKit Debian packaging