[SCM] WebKit Debian packaging branch, debian/unstable, updated. 0+svn29752-1-1645-gd3fe478

[Mike Hommey]

The following commit has been merged in the debian/unstable branch:
commit d3ec5926cc24219ba56e55714dd4b8de0fa000d1
Author: Mike Hommey <glandium at debian.org>
Date:   Sat Apr 12 19:42:33 2008 +0200

    Rename packages to fit new library SONAME.

diff --git a/debian/changelog b/debian/changelog
index 5254e1c..7ff773a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ webkit (0~svn31841-1) UNRELEASED; urgency=low
   * JavaScriptCore/wtf/ASCIICType.h: Revert what were warning fixes, to avoid
     diverging too much from upstream.
   * debian/rules: Clean-up autotools generated files in the clean target.
+  * debian/control, debian/rules, debian/libwebkit*: Rename packages to fit
+    new library SONAME.
 
  -- Mike Hommey <glandium at debian.org>  Sat, 12 Apr 2008 11:47:32 +0200
 
diff --git a/debian/control b/debian/control
index fe1b333..f4f9589 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ 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: libwebkitgtk1d
+Package: libwebkit-1.0-1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -23,11 +23,11 @@ Description: Web content engine library for Gtk+
  .
  This is the library for embedding in Gtk+ applications.
 
-Package: libwebkitgtk-dev
+Package: libwebkit-dev
 Section: libdevel
 Priority: extra
 Architecture: all
-Depends: libwebkitgtk1d (>= ${source:Upstream-Version}), libwebkitgtk1d (<< ${source:Version}.1~), libglib2.0-dev, libgtk2.0-dev
+Depends: libwebkit-1.0-1 (>= ${source:Upstream-Version}), libwebkit-1.0-1 (<< ${source:Version}.1~), libglib2.0-dev, 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 +40,11 @@ Description: Web content engine library for Gtk+ - Development files
  This package provides development files required to create Gtk+ applications
  embedding WebKit.
 
-Package: libwebkitgtk1d-dbg
+Package: libwebkit-1.0-1-dbg
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libwebkitgtk1d (= ${binary:Version})
+Depends: libwebkit-1.0-1 (= ${binary:Version})
 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-1.install
new file mode 100644
index 0000000..a925f22
--- /dev/null
+++ b/debian/libwebkit-1.0-1.install
@@ -0,0 +1,3 @@
+usr/lib/libwebkit-1.0.so.*
+usr/lib/WebKit/GtkLauncher
+usr/lib/WebKit/GtkDumpRenderTree
diff --git a/debian/libwebkit-1.0-1.postrm b/debian/libwebkit-1.0-1.postrm
new file mode 100644
index 0000000..a9f89a0
--- /dev/null
+++ b/debian/libwebkit-1.0-1.postrm
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+[ "$1" = "remove" ] || [ "$1" = "purge" ] && dpkg-divert --package libwebkit-1.0-1 --remove --rename --divert /usr/lib/WebKit/GtkLauncher.old /usr/lib/WebKit/GtkLauncher
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/libwebkit-1.0-1.preinst b/debian/libwebkit-1.0-1.preinst
new file mode 100644
index 0000000..0732348
--- /dev/null
+++ b/debian/libwebkit-1.0-1.preinst
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+[ "$1" = "install" ] && dpkg-divert --package libwebkit-1.0-1 --add --rename --divert /usr/lib/WebKit/GtkLauncher.old /usr/lib/WebKit/GtkLauncher
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/libwebkit-dev.install b/debian/libwebkit-dev.install
new file mode 100644
index 0000000..09082ca
--- /dev/null
+++ b/debian/libwebkit-dev.install
@@ -0,0 +1,3 @@
+usr/lib/libwebkit-1.0.so
+usr/include/webkit-1.0
+usr/lib/pkgconfig/webkit-1.0.pc
diff --git a/debian/libwebkitgtk-dev.install b/debian/libwebkitgtk-dev.install
deleted file mode 100644
index 74991da..0000000
--- a/debian/libwebkitgtk-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/libWebKitGtk.so
-usr/include/WebKit
-usr/lib/pkgconfig/WebKitGtk.pc
diff --git a/debian/libwebkitgtk1d.install b/debian/libwebkitgtk1d.install
deleted file mode 100644
index a262c99..0000000
--- a/debian/libwebkitgtk1d.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/libWebKitGtk.so.*
-usr/lib/WebKit/GtkLauncher
-usr/lib/WebKit/GtkDumpRenderTree
diff --git a/debian/libwebkitgtk1d.postrm b/debian/libwebkitgtk1d.postrm
deleted file mode 100644
index 0afea9d..0000000
--- a/debian/libwebkitgtk1d.postrm
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-[ "$1" = "remove" ] || [ "$1" = "purge" ] && dpkg-divert --package libwebkitgtk1d --remove --rename --divert /usr/lib/WebKit/GtkLauncher.old /usr/lib/WebKit/GtkLauncher
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/libwebkitgtk1d.preinst b/debian/libwebkitgtk1d.preinst
deleted file mode 100644
index d3c8ef1..0000000
--- a/debian/libwebkitgtk1d.preinst
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-[ "$1" = "install" ] && dpkg-divert --package libwebkitgtk1d --add --rename --divert /usr/lib/WebKit/GtkLauncher.old /usr/lib/WebKit/GtkLauncher
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/rules b/debian/rules
index 8c9952f..f58038b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-SO_VERSION=1d
-
 CFLAGS = -g -Wall
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
@@ -78,10 +76,10 @@ binary-arch: build install
 	dh_installchangelogs -a
 	dh_install -a --sourcedir=debian/tmp
 	dh_link -a
-	dh_strip -plibwebkitgtk$(SO_VERSION) --dbg-package=libwebkitgtk$(SO_VERSION)-dbg
+	dh_strip -a --dbg-package=libwebkit-1.0-1-dbg
 	dh_compress -a
 	dh_fixperms -a
-	dh_makeshlibs -plibwebkitgtk$(SO_VERSION)
+	dh_makeshlibs -a
 	dh_installdeb -a
 	dh_shlibdeps -a
 	dh_gencontrol -a

-- 
WebKit Debian packaging