r25892 - in /desktop/experimental/gconf/debian: changelog control control.in gir1.0-gconf-2.0.install gir1.2-gconf-2.0.install rules

[pochu at users.alioth.debian.org]

Author: pochu
Date: Sun Dec 12 15:00:51 2010
New Revision: 25892

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25892
Log:
* Update to the new gir policy:
  - Rename gir1.0-gconf-2.0 to gir1.2-gconf-2.0.
  - Bump the gobject-introspection build dependency.
  - Build depend on gir1.2 packages.

Added:
    desktop/experimental/gconf/debian/gir1.2-gconf-2.0.install
      - copied unchanged from r25816, desktop/experimental/gconf/debian/gir1.0-gconf-2.0.install
Removed:
    desktop/experimental/gconf/debian/gir1.0-gconf-2.0.install
Modified:
    desktop/experimental/gconf/debian/changelog
    desktop/experimental/gconf/debian/control
    desktop/experimental/gconf/debian/control.in
    desktop/experimental/gconf/debian/rules

Modified: desktop/experimental/gconf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gconf/debian/changelog?rev=25892&op=diff
==============================================================================
--- desktop/experimental/gconf/debian/changelog [utf-8] (original)
+++ desktop/experimental/gconf/debian/changelog [utf-8] Sun Dec 12 15:00:51 2010
@@ -1,12 +1,16 @@
-gconf (2.32.1-2) UNRELEASED; urgency=low
+gconf (2.32.1-2) experimental; urgency=low
 
   * debian/po-up/*:
     + Removed, the patch has been merged upstream so there's nothing
       to translate.
   * debian/rules:
     + Remove patch-translations.mk.
-
- -- Emilio Pozuelo Monfort <pochu at debian.org>  Tue, 07 Dec 2010 17:15:01 +0100
+  * Update to the new gir policy:
+    - Rename gir1.0-gconf-2.0 to gir1.2-gconf-2.0.
+    - Bump the gobject-introspection build dependency.
+    - Build depend on gir1.2 packages.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Sun, 12 Dec 2010 15:59:47 +0100
 
 gconf (2.32.1-1) experimental; urgency=low
 

Modified: desktop/experimental/gconf/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gconf/debian/control?rev=25892&op=diff
==============================================================================
--- desktop/experimental/gconf/debian/control [utf-8] (original)
+++ desktop/experimental/gconf/debian/control [utf-8] Sun Dec 12 15:00:51 2010
@@ -28,9 +28,9 @@
                python-support (>= 0.5.3),
                autotools-dev,
                libglib2.0-doc,
-               gobject-introspection (>= 0.9.12),
+               gobject-introspection (>= 0.9.12-4~),
                libgirepository1.0-dev (>= 0.9.12),
-               gir1.0-glib-2.0
+               gir1.2-glib-2.0
 Standards-Version: 3.8.4
 Homepage:  http://projects.gnome.org/gconf/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gconf
@@ -129,11 +129,12 @@
  This package contains the static libraries, header files and
  documentation needed to build applications using GConf. 
 
-Package: gir1.0-gconf-2.0
+Package: gir1.2-gconf-2.0
 Architecture: any
 Depends: ${gir:Depends},
          ${misc:Depends},
          ${shlibs:Depends}
+Conflicts: gir1.0-gconf-2.0
 Description: GNOME configuration database system (GObject-Introspection)
  GConf is a configuration database system for storing application
  preferences. It supports default or mandatory settings set by the

Modified: desktop/experimental/gconf/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gconf/debian/control.in?rev=25892&op=diff
==============================================================================
--- desktop/experimental/gconf/debian/control.in [utf-8] (original)
+++ desktop/experimental/gconf/debian/control.in [utf-8] Sun Dec 12 15:00:51 2010
@@ -23,9 +23,9 @@
                python-support (>= 0.5.3),
                autotools-dev,
                libglib2.0-doc,
-               gobject-introspection (>= 0.9.12),
+               gobject-introspection (>= 0.9.12-4~),
                libgirepository1.0-dev (>= 0.9.12),
-               gir1.0-glib-2.0
+               gir1.2-glib-2.0
 Standards-Version: 3.8.4
 Homepage:  http://projects.gnome.org/gconf/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gconf
@@ -124,11 +124,12 @@
  This package contains the static libraries, header files and
  documentation needed to build applications using GConf. 
 
-Package: gir1.0-gconf-2.0
+Package: gir1.2-gconf-2.0
 Architecture: any
 Depends: ${gir:Depends},
          ${misc:Depends},
          ${shlibs:Depends}
+Conflicts: gir1.0-gconf-2.0
 Description: GNOME configuration database system (GObject-Introspection)
  GConf is a configuration database system for storing application
  preferences. It supports default or mandatory settings set by the

Modified: desktop/experimental/gconf/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gconf/debian/rules?rev=25892&op=diff
==============================================================================
--- desktop/experimental/gconf/debian/rules [utf-8] (original)
+++ desktop/experimental/gconf/debian/rules [utf-8] Sun Dec 12 15:00:51 2010
@@ -36,6 +36,6 @@
 binary-predeb/gconf2::
 	dh_pysupport -p$(cdbs_curpkg)
 
-binary-predeb/gir1.0-gconf-2.0::
+$(patsubst %,binary-predeb/%,$(DEB_ALL_PACKAGES)) ::
 	dh_girepository -p$(cdbs_curpkg)