Changeset 7351

Timestamp:

02/11/11 03:02:59 (2 years ago)

Author:

alanbach-guest

Message:

• Sync'd with Debian 0.10.2-1

Location:

pkg/raul/main/gobject-introspection/trunk/debian

Files:

• changelog (modified) (1 diff)
• control (modified) (1 diff)
• dh_girepository (modified) (4 diffs)
• libgirepository-1.0-1.symbols (modified) (1 diff)
• rules (modified) (1 diff)

pkg/raul/main/gobject-introspection/trunk/debian/changelog

@@ -1 @@
-gobject-introspection (0.10.1-1) unstable; urgency=low
-
-  * New upstream stable release
-
- -- Alan Baghumian <alan@technotux.org>  Sat, 05 Feb 2011 19:58:09 -0800
-
-gobject-introspection (0.10.0-1) unstable; urgency=low
+gobject-introspection (0.10.2-1) unstable; urgency=low
 
   [ Emilio Pozuelo Monfort ]
+  * New upstream release.
+    + debian/libgirepository-1.0-1.symbols:
+      - Updated for the new symbols.
+    + debian/rules:
+      - Fail the build if the symbols file is outdated.
+      - Make the shlibs file always depend on the latest upstream version.
+  * debian/dh_girepository:
+    + Look for libraries in private directories. Closes: #612148.
+
+ -- Alan Baghumian <alan@technotux.org>  Thu, 10 Feb 2011 18:02:16 -0800
+
+gobject-introspection (0.10.1-1) experimental; urgency=low
+
+  * New upstream release.
+    - d/p/0001-Avoid-using-namespace-as-identifier-in-public-header.patch,
+      d/p/0002-Regenerate-gio-2.0.c-and-gobject-2.0.c-from-current-.patch,
+      d/p/0003-Regenerate-gio-2.0.c.patch,
+      d/p/0004-scanner-Properly-parse-recursive-list-type-nodes.patch,
+      d/p/0005-scanner-Fix-handling-of-property-transfer.patch,
+      d/p/0006-scanner-Make-sure-that-vfuncs-made-to-the-GIR.patch:
+      + Removed, included upstream.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Wed, 12 Jan 2011 23:30:21 +0000
+
+gobject-introspection (0.10.0-2) experimental; urgency=low
+
+  * debian/dh_girepository:
+    - Look for the format version everywhere in all the <repository line,
+      not just after "<repository", as some packages (e.g. telepathy-glib)
+      have it at the end.
+  * debian/patches/0001-Avoid-using-namespace-as-identifier-in-public-header.patch
+    debian/patches/0002-Regenerate-gio-2.0.c-and-gobject-2.0.c-from-current-.patch
+    debian/patches/0003-Regenerate-gio-2.0.c.patch
+    debian/patches/0004-scanner-Properly-parse-recursive-list-type-nodes.patch
+    debian/patches/0005-scanner-Fix-handling-of-property-transfer.patch
+    debian/patches/0006-scanner-Make-sure-that-vfuncs-made-to-the-GIR.patch
+    - Backport patches from upstream git to build with latest glib2.0.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Fri, 07 Jan 2011 17:32:00 +0000
+
+gobject-introspection (0.10.0-1) experimental; urgency=low
+
   * New upstream release.
     - debian/libgirepository-1.0-1.symbols:
       + Updated.
 
- -- Alan Baghumian <alan@technotux.org>  Fri, 24 Dec 2010 12:40:45 -0800
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Thu, 23 Dec 2010 02:02:10 +0000
 
 gobject-introspection (0.9.12-5) experimental; urgency=low

pkg/raul/main/gobject-introspection/trunk/debian/control

@@ -8 +8 @@
 Priority: optional
 Maintainer: Sebastian Dröge <slomo@debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Gustavo Noronha Silva <kov@debian.org>, Laurent Bigonville <bigon@debian.org>, Sjoerd Simons <sjoerd@debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Laurent Bigonville <bigon@debian.org>, Sjoerd Simons <sjoerd@debian.org>
 Build-Depends: debhelper (>= 5),
                cdbs,

pkg/raul/main/gobject-introspection/trunk/debian/dh_girepository

@@ -47 +47 @@
 List of directories where to look for typelibs and the corresponding .gir
 files. Useful when the package installs its typelibs in a private
-directory, such as /usr/lib/<package>.
+directory, such as /usr/lib/<package>. Library dependencies are also looked
+there, in case your typelib depends on a library that you ship on a private
+directory.
 
 =back
@@ -80 +82 @@
 my $arch_triplet = `dpkg-architecture -qDEB_BUILD_GNU_TYPE`;
 chomp $arch_triplet;
-my @libdirs = ("/lib/$arch_triplet", "/lib", "/usr/lib/$arch_triplet", "/usr/lib");
+my @privlibdirs = (@ARGV);
+my @libdirs = ("/lib/$arch_triplet", "/lib", "/usr/lib/$arch_triplet", "/usr/lib", @privlibdirs);
 my $format;
 
@@ -259 +262 @@
                 # "Parse" the XML file
                 chomp;
-                if (/<repository\s+version="(.*?)"/) {
+                if (/<repository.+version="(.*?)"/) {
                     # gir format version
                     $format="$1";
@@ -326 +329 @@
         # Let dpkg-shlibdeps generate the corresponding dependencies
         # It must run first since otherwise it overwrites the variable
-        doit (("dpkg-shlibdeps", "-pgir", "-Tdebian/${ext}substvars", "-xlibc6", "-xlibc0", @bin_files));
+        complex_doit ("LD_LIBRARY_PATH=" . join (':', @privlibdirs) . " dpkg-shlibdeps -pgir -Tdebian/${ext}substvars -xlibc6 -xlibc0 @bin_files");
     }
     doit (("rm", "-f", @c_files, @bin_files));

pkg/raul/main/gobject-introspection/trunk/debian/libgirepository-1.0-1.symbols

@@ -180 +180 @@
  g_union_info_is_discriminated@Base 0.9.2
  g_value_info_get_value@Base 0.9.2
+ g_vfunc_info_get_address@Base 0.10.2
  g_vfunc_info_get_flags@Base 0.9.2
  g_vfunc_info_get_invoker@Base 0.9.2
  g_vfunc_info_get_offset@Base 0.9.2
  g_vfunc_info_get_signal@Base 0.9.2
+ g_vfunc_info_invoke@Base 0.10.2
  gi_cclosure_marshal_generic@Base 0.9.2
  gi_type_tag_get_ffi_type@Base 0.10.0

pkg/raul/main/gobject-introspection/trunk/debian/rules

@@ -17 +17 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc
+DEB_DH_MAKESHLIBS_ARGS_ALL += -V -- -c4
 
 binary-install/gobject-introspection::