r25938 - in /packages/experimental/gobject-introspection/debian: changelog control dh_girepository

[pochu at users.alioth.debian.org]

Author: pochu
Date: Tue Dec 14 00:13:38 2010
New Revision: 25938

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25938
Log:
Rename the -i option to -p as it conflicts with the -i/--indep
debhelper option and it's not used by any package yet.

Modified:
    packages/experimental/gobject-introspection/debian/changelog
    packages/experimental/gobject-introspection/debian/control
    packages/experimental/gobject-introspection/debian/dh_girepository

Modified: packages/experimental/gobject-introspection/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gobject-introspection/debian/changelog?rev=25938&op=diff
==============================================================================
--- packages/experimental/gobject-introspection/debian/changelog [utf-8] (original)
+++ packages/experimental/gobject-introspection/debian/changelog [utf-8] Tue Dec 14 00:13:38 2010
@@ -1,10 +1,12 @@
-gobject-introspection (0.9.12-5) UNRELEASED; urgency=low
+gobject-introspection (0.9.12-5) experimental; urgency=low
 
   * debian/dh_girepository:
     - Use the extra dirs to look for the corresponding girs.
     - Also use them to look for the dependencies in the same package.
-
- -- Emilio Pozuelo Monfort <pochu at debian.org>  Mon, 13 Dec 2010 23:39:20 +0100
+    - Rename the -i option to -p as it conflicts with the -i/--indep
+      debhelper option and it's not used by any package yet.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Tue, 14 Dec 2010 00:49:23 +0100
 
 gobject-introspection (0.9.12-4) experimental; urgency=low
 

Modified: packages/experimental/gobject-introspection/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gobject-introspection/debian/control?rev=25938&op=diff
==============================================================================
--- packages/experimental/gobject-introspection/debian/control [utf-8] (original)
+++ packages/experimental/gobject-introspection/debian/control [utf-8] Tue Dec 14 00:13:38 2010
@@ -118,7 +118,8 @@
 Section: libs
 Depends: ${gir:Depends},
          ${misc:Depends}
-Conflicts: gobject-introspection-glib-2.0
+Conflicts: gobject-introspection-glib-2.0,
+           gir1.0-glib-2.0
 Description: Introspection data for GLib, GObject, Gio and GModule
  GObject Introspection is a project for providing machine readable
  introspection data of the API of C libraries. This introspection
@@ -137,7 +138,8 @@
 Section: libs
 Depends: ${gir:Depends},
          ${misc:Depends}
-Conflicts: gobject-introspection-freedesktop
+Conflicts: gobject-introspection-freedesktop,
+           gir1.0-freedesktop
 Description: Introspection data for some FreeDesktop components
  GObject Introspection is a project for providing machine readable
  introspection data of the API of C libraries. This introspection

Modified: packages/experimental/gobject-introspection/debian/dh_girepository
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gobject-introspection/debian/dh_girepository?rev=25938&op=diff
==============================================================================
--- packages/experimental/gobject-introspection/debian/dh_girepository [utf-8] (original)
+++ packages/experimental/gobject-introspection/debian/dh_girepository [utf-8] Tue Dec 14 00:13:38 2010
@@ -12,7 +12,7 @@
 
 =head1 SYNOPSIS
 
-B<dh_girepository> [I<debhelper options>] [-lI<directory>] [-iI<directory>] [-XI<item>] [I<private [...]>]
+B<dh_girepository> [I<debhelper options>] [-lI<directory>] [-pI<directory>] [-XI<item>] [I<private [...]>]
 
 =head1 DESCRIPTION
 
@@ -32,7 +32,7 @@
 are scanned. This option is only necessary if those files are not shipped in
 another, architecture-dependent package.
 
-=item B<-i>I<directory>
+=item B<-p>I<directory>
 
 Specify a directory (or a colon-separated list of directories) where to look
 for the dependencies. This is useful when a dependency ships the .typelib
@@ -59,15 +59,15 @@
 # Initialisation code
 init(options => {
     "l=s", => \$dh{L_PARAMS},
-    "i=s", => \$dh{I_PARAMS},
+    "p=s", => \$dh{P_PARAMS},
 });
 my @paths_first = ();
 my @privdirs = ();
 if ($dh{L_PARAMS}) {
     push @paths_first, split /:/, $dh{L_PARAMS};
 }
-if ($dh{I_PARAMS}) {
-    push @privdirs, split /:/, $dh{I_PARAMS};
+if ($dh{P_PARAMS}) {
+    push @privdirs, split /:/, $dh{P_PARAMS};
 }
 isnative($dh{MAINPACKAGE}); # Necessary to have $dh{VERSION}
 my $bin_version = $dh{VERSION};