[libgsf] Updated debianisation

[J.H.M. Dassen (Ray) <jdassen src gnome org>]

commit 88679362222ed7bb05e63bb6e489fa44bc6288e2
Author: J.H.M. Dassen (Ray) <jdassen debian org>
Date:   Thu Dec 20 13:33:52 2012 +0100

    Updated debianisation

 debian/changelog               |   10 ++++++++++
 debian/control                 |    9 ++++++---
 debian/gir1.2-gsf-1.dirs       |    1 +
 debian/gir1.2-gsf-1.install    |    1 +
 debian/gir1.2-libgsf-1.dirs    |    2 --
 debian/gir1.2-libgsf-1.install |    2 --
 debian/libgsf-1-dev.install    |    1 +
 debian/rules                   |    2 +-
 debian/watch                   |    2 +-
 9 files changed, 21 insertions(+), 9 deletions(-)
---
diff --git a/debian/changelog b/debian/changelog
index fc2f0aa..bae415b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libgsf (1.14.25-2) unstable; urgency=medium
+
+  * [debian/*] Fix introspection packaging. (Closes: #695599)
+    * Gir package name fix: gir1.2-libgsf-1 -> gir1.2-gsf-1 .
+    * Add runtime dependency of -dev on gir package.
+    * Added Conflicts:/Replaces: accordingly to ensure smooth upgrades.
+  * [debian/watch] Upstream has switched to .xz tarballs.
+
+ -- J.H.M. Dassen (Ray) <jdassen debian org>  Wed, 19 Dec 2012 19:02:34 +0100
+
 libgsf (1.14.25-1) unstable; urgency=low
 
   * New upstream release. (Closes: #678456)
diff --git a/debian/control b/debian/control
index cdc453a..4cc289e 100644
--- a/debian/control
+++ b/debian/control
@@ -21,8 +21,9 @@ Description: Structured File Library - debugging files (basic version)
 Package: libgsf-1-dev
 Section: libdevel
 Architecture: any
-Depends: libgsf-1-114 (= ${binary:Version}), libglib2.0-dev (>= 2.16.1), libxml2-dev (>= 2.6.10-1), libbz2-dev, ${misc:Depends}
-Replaces: libgsf-gnome-1-dev (<= 1.14.8-1)
+Depends: libgsf-1-114 (= ${binary:Version}), gir1.2-gsf-1 (= ${binary:Version}), libglib2.0-dev (>= 2.16.1), libxml2-dev (>= 2.6.10-1), libbz2-dev, ${misc:Depends}
+Conflicts: gir1.2-libgsf-1
+Replaces: libgsf-gnome-1-dev (<= 1.14.8-1), gir1.2-libgsf-1
 Recommends: pkg-config
 Description: Structured File Library - development files
  This package contains the development files used in building applications
@@ -33,9 +34,11 @@ Description: Structured File Library - development files
  formats. It is actively being developed and its API is still likely to
  undergo significant changes (in particular, extensions).
 
-Package: gir1.2-libgsf-1
+Package: gir1.2-gsf-1
 Section: introspection
 Architecture: any
+Conflicts: gir1.2-libgsf-1
+Replaces: gir1.2-libgsf-1
 Depends: ${gir:Depends}, ${misc:Depends}
 Description: GObject introspection data for the Structured File Library
  This package contains introspection data for the Structured File Library.
diff --git a/debian/gir1.2-gsf-1.dirs b/debian/gir1.2-gsf-1.dirs
new file mode 100644
index 0000000..75f1a9b
--- /dev/null
+++ b/debian/gir1.2-gsf-1.dirs
@@ -0,0 +1 @@
+usr/lib/girepository-1.0
diff --git a/debian/gir1.2-gsf-1.install b/debian/gir1.2-gsf-1.install
new file mode 100644
index 0000000..7625055
--- /dev/null
+++ b/debian/gir1.2-gsf-1.install
@@ -0,0 +1 @@
+usr/lib/girepository-*/Gsf-*.typelib
diff --git a/debian/libgsf-1-dev.install b/debian/libgsf-1-dev.install
index 45860b0..ffd1ac8 100644
--- a/debian/libgsf-1-dev.install
+++ b/debian/libgsf-1-dev.install
@@ -3,3 +3,4 @@ usr/lib/libgsf-[0-9]*.a
 usr/lib/libgsf-[0-9]*.so
 usr/lib/pkgconfig/libgsf-[0-9]*.pc
 usr/share/doc/libgsf-1-dev/html/*
+usr/share/gir-1.0/Gsf-1.gir
diff --git a/debian/rules b/debian/rules
index e7be3dd..a2c64fb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,7 +56,7 @@ p_libgsf_common=libgsf-1-common
 p_libgsf_bin=libgsf-bin
 p_libgsf_dev=libgsf-1-dev
 p_libgsf_dbg=libgsf-1-$(so_version_major)-dbg
-p_libgsf_gir=gir1.2-libgsf-1
+p_libgsf_gir=gir1.2-gsf-1
 
 # Build up the options for "./configure"
 confflags :=	-v
diff --git a/debian/watch b/debian/watch
index 82e3409..ed2d570 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=2
 http://ftp.gnome.org/pub/gnome/sources/libgsf/([\d\.]+)/ \
-        libgsf-(.*)\.tar\.gz \
+        libgsf-(.*)\.tar\.xz \
         debian