r29430 - in /packages/unstable/libgdata: ./ debian/changelog debian/control debian/control.in debian/gir1.2-gdata-0.0.install debian/libgdata-dev.install debian/libgdata11.install debian/libgdata7.install debian/rules

joss at users.alioth.debian.org joss at users.alioth.debian.org
Fri Aug 19 19:27:07 UTC 2011 

Author: joss
Date: Fri Aug 19 19:27:06 2011
New Revision: 29430

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29430
Log:
Merge changes from the experimental branch

Added:
    packages/unstable/libgdata/debian/gir1.2-gdata-0.0.install
      - copied unchanged from r29429, packages/experimental/libgdata/debian/gir1.2-gdata-0.0.install
    packages/unstable/libgdata/debian/libgdata11.install
      - copied unchanged from r29429, packages/experimental/libgdata/debian/libgdata11.install
Removed:
    packages/unstable/libgdata/debian/libgdata7.install
Modified:
    packages/unstable/libgdata/   (props changed)
    packages/unstable/libgdata/debian/changelog
    packages/unstable/libgdata/debian/control
    packages/unstable/libgdata/debian/control.in
    packages/unstable/libgdata/debian/libgdata-dev.install
    packages/unstable/libgdata/debian/rules

Propchange: packages/unstable/libgdata/
------------------------------------------------------------------------------
    svn:mergeinfo = /packages/experimental/libgdata:26944-29429

Modified: packages/unstable/libgdata/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgdata/debian/changelog?rev=29430&op=diff
==============================================================================
--- packages/unstable/libgdata/debian/changelog [utf-8] (original)
+++ packages/unstable/libgdata/debian/changelog [utf-8] Fri Aug 19 19:27:06 2011
@@ -1,3 +1,25 @@
+libgdata (0.8.1-1) experimental; urgency=low
+
+  [ Josselin Mouette ]
+  * Add missing conflict with gir1.0-gdata-0.0.
+  * Make the -dev package depend on the gir package.
+
+  [ Sebastien Bacher ]
+  * New upstream version
+
+ -- Sebastien Bacher <seb128 at debian.org>  Wed, 18 May 2011 17:30:18 +0200
+
+libgdata (0.8.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * Bump soname.
+  * Update build-dependencies.
+  * Re-introduce introspection package.
+  * Fix the shlibs generation code.
+  * Fix swapped maintainer/uploaders.
+
+ -- Josselin Mouette <joss at debian.org>  Thu, 17 Mar 2011 00:45:38 +0100
+
 libgdata (0.6.4-3) unstable; urgency=low
 
   * Remove gir1.0-gdata-0.0 to ease the gir1.2 transition.

Modified: packages/unstable/libgdata/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgdata/debian/control?rev=29430&op=diff
==============================================================================
--- packages/unstable/libgdata/debian/control [utf-8] (original)
+++ packages/unstable/libgdata/debian/control [utf-8] Fri Aug 19 19:27:06 2011
@@ -6,8 +6,8 @@
 Source: libgdata
 Section: libs
 Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Sebastian Dröge <slomo at debian.org>
-Uploaders: Sebastian Dröge <slomo at debian.org>
+Maintainer: Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 5),
                gnome-pkg-tools (>= 0.11),
@@ -16,13 +16,20 @@
                libxml2-dev,
                libsoup2.4-dev (>= 2.26.1),
                libsoup-gnome2.4-dev (>= 2.26.1),
-               intltool (>= 0.40)
+               libgdk-pixbuf2.0-dev,
+               intltool (>= 0.40),
+               gtk-doc-tools (>= 1.14),
+               libgirepository1.0-dev (>= 0.9.7),
+               gobject-introspection (>= 0.9.12-4~),
+               gir1.2-glib-2.0,
+               gir1.2-freedesktop,
+               gir1.2-soup-2.4
 Standards-Version: 3.8.4
 Homepage: http://live.gnome.org/libgdata
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/libgdata
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgdata?op=log
 
-Package: libgdata7
+Package: libgdata11
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -49,7 +56,8 @@
 Package: libgdata-dev
 Section: libdevel
 Architecture: any
-Depends: libgdata7 (= ${binary:Version}),
+Depends: libgdata11 (= ${binary:Version}),
+         gir1.2-gdata-0.0 (= ${binary:Version}),
          ${misc:Depends},
          libglib2.0-dev (>= 2.19.0),
          libxml2-dev,
@@ -67,7 +75,7 @@
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Recommends: libgdata7
+Recommends: libgdata-dev
 Suggests: devhelp
 Description: Library for accessing GData webservices - documentation
  libgdata is a GLib-based library for accessing online service APIs using
@@ -75,3 +83,19 @@
  to access the common Google services, and has full asynchronous support. 
  .
  This package contains the HTML documentation for the libgdata library
+
+Package: gir1.2-gdata-0.0
+Section: libs
+Architecture: any
+Depends: ${gir:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends}
+Conflicts: gir1.0-gdata-0.0
+Description: Description: GObject introspection data for the GData webservices library
+ libgdata is a GLib-based library for accessing online service APIs using
+ the GData protocol — most notably, Google's services. It provides APIs
+ to access the common Google services, and has full asynchronous support. 
+ .
+ This package contains introspection data for the GData webservices
+ library. It can be used by packages using the GIRepository format to 
+ generate dynamic bindings.

Modified: packages/unstable/libgdata/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgdata/debian/control.in?rev=29430&op=diff
==============================================================================
--- packages/unstable/libgdata/debian/control.in [utf-8] (original)
+++ packages/unstable/libgdata/debian/control.in [utf-8] Fri Aug 19 19:27:06 2011
@@ -1,8 +1,8 @@
 Source: libgdata
 Section: libs
 Priority: optional
-Maintainer: @GNOME_TEAM@
-Uploaders: Sebastian Dröge <slomo at debian.org>
+Maintainer: Sebastian Dröge <slomo at debian.org>
+Uploaders: @GNOME_TEAM@
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 5),
                gnome-pkg-tools (>= 0.11),
@@ -11,13 +11,20 @@
                libxml2-dev,
                libsoup2.4-dev (>= 2.26.1),
                libsoup-gnome2.4-dev (>= 2.26.1),
-               intltool (>= 0.40)
+               libgdk-pixbuf2.0-dev,
+               intltool (>= 0.40),
+               gtk-doc-tools (>= 1.14),
+               libgirepository1.0-dev (>= 0.9.7),
+               gobject-introspection (>= 0.9.12-4~),
+               gir1.2-glib-2.0,
+               gir1.2-freedesktop,
+               gir1.2-soup-2.4
 Standards-Version: 3.8.4
 Homepage: http://live.gnome.org/libgdata
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/libgdata
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgdata?op=log
 
-Package: libgdata7
+Package: libgdata11
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -44,7 +51,8 @@
 Package: libgdata-dev
 Section: libdevel
 Architecture: any
-Depends: libgdata7 (= ${binary:Version}),
+Depends: libgdata11 (= ${binary:Version}),
+         gir1.2-gdata-0.0 (= ${binary:Version}),
          ${misc:Depends},
          libglib2.0-dev (>= 2.19.0),
          libxml2-dev,
@@ -62,7 +70,7 @@
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Recommends: libgdata7
+Recommends: libgdata-dev
 Suggests: devhelp
 Description: Library for accessing GData webservices - documentation
  libgdata is a GLib-based library for accessing online service APIs using
@@ -70,3 +78,19 @@
  to access the common Google services, and has full asynchronous support. 
  .
  This package contains the HTML documentation for the libgdata library
+
+Package: gir1.2-gdata-0.0
+Section: libs
+Architecture: any
+Depends: ${gir:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends}
+Conflicts: gir1.0-gdata-0.0
+Description: Description: GObject introspection data for the GData webservices library
+ libgdata is a GLib-based library for accessing online service APIs using
+ the GData protocol — most notably, Google's services. It provides APIs
+ to access the common Google services, and has full asynchronous support. 
+ .
+ This package contains introspection data for the GData webservices
+ library. It can be used by packages using the GIRepository format to 
+ generate dynamic bindings.

Modified: packages/unstable/libgdata/debian/libgdata-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgdata/debian/libgdata-dev.install?rev=29430&op=diff
==============================================================================
--- packages/unstable/libgdata/debian/libgdata-dev.install [utf-8] (original)
+++ packages/unstable/libgdata/debian/libgdata-dev.install [utf-8] Fri Aug 19 19:27:06 2011
@@ -2,3 +2,4 @@
 debian/tmp/usr/lib/libgdata.a
 debian/tmp/usr/lib/libgdata.so
 debian/tmp/usr/lib/pkgconfig/libgdata*
+debian/tmp/usr/share/gir-1.0/*.gir

Modified: packages/unstable/libgdata/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgdata/debian/rules?rev=29430&op=diff
==============================================================================
--- packages/unstable/libgdata/debian/rules [utf-8] (original)
+++ packages/unstable/libgdata/debian/rules [utf-8] Fri Aug 19 19:27:06 2011
@@ -10,8 +10,8 @@
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-libgdata := $(shell sed -nr 's/^Package:[[:space:]]*(libgdata\.0-[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+libgdata := $(shell sed -nr 's/^Package:[[:space:]]*(libgdata[0-9]+)[[:space:]]*$$/\1/p' debian/control)
 
-SHLIBVER := 0.6.4
+SHLIBVER := 0.8.0
 
 DEB_DH_MAKESHLIBS_ARGS_$(libgdata) = -V '$(libgdata) (>= $(SHLIBVER))'

More information about the pkg-gnome-commits mailing list