r26970 - in /packages/experimental/libunique3/debian: ./ patches/ source/

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sat Mar 19 20:01:22 UTC 2011 

Author: joss
Date: Sat Mar 19 20:01:13 2011
New Revision: 26970

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26970
Log:
* New upstream pre-release.
* Disable dbus (GDBus is the default now).
* libunique-3.0-0.symbols: drop dbus symbols.
* Update package names according to the new soname.
* Remove useless docs file.
* Switch to 3.0 (quilt) format.
* Remove 99_ltmain_as-needed.patch.
* 01_link_x11.patch: add missing link to libX11.
* Use dh_autoreconf.

Added:
    packages/experimental/libunique3/debian/gir1.2-unique-3.0.install
      - copied unchanged from r26968, packages/experimental/libunique3/debian/gir1.0-unique-3.0.install
    packages/experimental/libunique3/debian/libunique-3.0-0.install
      - copied, changed from r26968, packages/experimental/libunique3/debian/libunique3-0.install
    packages/experimental/libunique3/debian/libunique-3.0-0.symbols
      - copied, changed from r26968, packages/experimental/libunique3/debian/libunique3-0.symbols
    packages/experimental/libunique3/debian/libunique-3.0-dev.install
      - copied, changed from r26968, packages/experimental/libunique3/debian/libunique3-dev.install
    packages/experimental/libunique3/debian/libunique-3.0-doc.install
      - copied unchanged from r26968, packages/experimental/libunique3/debian/libunique3-doc.install
    packages/experimental/libunique3/debian/patches/01_link_x11.patch
    packages/experimental/libunique3/debian/patches/series
    packages/experimental/libunique3/debian/source/
    packages/experimental/libunique3/debian/source/format
Removed:
    packages/experimental/libunique3/debian/docs
    packages/experimental/libunique3/debian/gir1.0-unique-3.0.install
    packages/experimental/libunique3/debian/libunique3-0.install
    packages/experimental/libunique3/debian/libunique3-0.symbols
    packages/experimental/libunique3/debian/libunique3-dev.install
    packages/experimental/libunique3/debian/libunique3-doc.install
    packages/experimental/libunique3/debian/patches/99_ltmain_as-needed.patch
Modified:
    packages/experimental/libunique3/debian/changelog
    packages/experimental/libunique3/debian/control
    packages/experimental/libunique3/debian/control.in
    packages/experimental/libunique3/debian/rules

Modified: packages/experimental/libunique3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/libunique3/debian/changelog?rev=26970&op=diff
==============================================================================
--- packages/experimental/libunique3/debian/changelog [utf-8] (original)
+++ packages/experimental/libunique3/debian/changelog [utf-8] Sat Mar 19 20:01:13 2011
@@ -1,10 +1,22 @@
-libunique3 (2.90.1-1) UNRELEASED; urgency=low
+libunique3 (2.91.4-1) experimental; urgency=low
 
+  [ Sjoerd Simons ]
   * New upstream release
   * Rename source package to libunique3 for parallel maintainability
   * Turn off gobject-introspection support for now
 
- -- Sjoerd Simons <sjoerd at debian.org>  Sun, 10 Oct 2010 19:24:45 +0100
+  [ Josselin Mouette ]
+  * New upstream pre-release.
+  * Disable dbus (GDBus is the default now).
+  * libunique-3.0-0.symbols: drop dbus symbols.
+  * Update package names according to the new soname.
+  * Remove useless docs file.
+  * Switch to 3.0 (quilt) format.
+  * Remove 99_ltmain_as-needed.patch.
+  * 01_link_x11.patch: add missing link to libX11.
+  * Use dh_autoreconf.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 19 Mar 2011 21:00:55 +0100
 
 libunique (1.1.6-1.1) unstable; urgency=medium
 

Modified: packages/experimental/libunique3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/libunique3/debian/control?rev=26970&op=diff
==============================================================================
--- packages/experimental/libunique3/debian/control [utf-8] (original)
+++ packages/experimental/libunique3/debian/control [utf-8] Sat Mar 19 20:01:13 2011
@@ -7,22 +7,30 @@
 Section: libs
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 5),
                gnome-pkg-tools (>= 0.11),
+               dh-autoreconf,
                pkg-config (>= 0.14),
-               libglib2.0-dev (>= 2.12.0),
-               libgtk3.0-dev,
+               libglib2.0-dev (>= 2.25.7),
+               libgtk-3-dev (>= 2.90.0),
                libx11-dev,
-               libdbus-glib-1-dev (>= 0.70),
-               gtk-doc-tools (>= 1.11),
-               intltool,
-               dpkg-dev (>= 1.14.13)
+               libxt-dev,
+               gtk-doc-tools (>= 1.13),
+               dpkg-dev (>= 1.14.13),
+               gobject-introspection (>= 0.9.12-4~),
+               libgirepository1.0-dev (>= 0.9.0),
+               gir1.2-freedesktop,
+               gir1.2-atk-1.0,
+               gir1.2-gdkpixbuf-2.0,
+               gir1.2-glib-2.0,
+               gir1.2-pango-1.0,
+               gir1.2-gtk-3.0
 Standards-Version: 3.8.3
 Homepage: http://live.gnome.org/LibUnique
 
-Package: libunique3-0
+Package: libunique-3.0-0
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
@@ -41,14 +49,13 @@
  .
  This package contains the shared libraries.
 
-Package: libunique3-dev
+Package: libunique-3.0-dev
 Section: libdevel
 Architecture: any
-Depends: libunique3-0 (= ${binary:Version}),
+Depends: libunique-3.0-0 (= ${binary:Version}),
          ${misc:Depends},
-         libglib2.0-dev (>= 2.12.0),
          libgtk3.0-dev
-Suggests: libunique3-doc
+Recommends: libunique-3.0-doc
 Description: Library for writing single instance applications - development files
  Unique is a library for writing single instance application.
  If you launch a single instance application twice, the second
@@ -63,11 +70,11 @@
  This package contains the headers and development libraries needed to
  build applications using the Unique library
 
-Package: libunique3-doc
+Package: libunique-3.0-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Recommends: libunique3-0
+Conflicts: libunique-doc
 Suggests: devhelp
 Description: Library for writing single instance applications - documentation
  Unique is a library for writing single instance application.
@@ -81,3 +88,16 @@
  the startup notification side. 
  .
  This package contains the HTML documentation for the Unique library
+
+Package: gir1.2-unique-3.0
+Section: libs
+Architecture: any
+Depends: ${gir:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends}
+Description: GObject introspection data for the Unique library
+ This package contains introspection data for LibUnique, a library for 
+ writing single instance applications.
+ .
+ It can be used by packages using the GIRepository format to generate 
+ dynamic bindings.

Modified: packages/experimental/libunique3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/libunique3/debian/control.in?rev=26970&op=diff
==============================================================================
--- packages/experimental/libunique3/debian/control.in [utf-8] (original)
+++ packages/experimental/libunique3/debian/control.in [utf-8] Sat Mar 19 20:01:13 2011
@@ -6,18 +6,26 @@
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 5),
                gnome-pkg-tools (>= 0.11),
+               dh-autoreconf,
                pkg-config (>= 0.14),
-               libglib2.0-dev (>= 2.12.0),
-               libgtk3.0-dev,
+               libglib2.0-dev (>= 2.25.7),
+               libgtk-3-dev (>= 2.90.0),
                libx11-dev,
-               libdbus-glib-1-dev (>= 0.70),
-               gtk-doc-tools (>= 1.11),
-               intltool,
-               dpkg-dev (>= 1.14.13)
+               libxt-dev,
+               gtk-doc-tools (>= 1.13),
+               dpkg-dev (>= 1.14.13),
+               gobject-introspection (>= 0.9.12-4~),
+               libgirepository1.0-dev (>= 0.9.0),
+               gir1.2-freedesktop,
+               gir1.2-atk-1.0,
+               gir1.2-gdkpixbuf-2.0,
+               gir1.2-glib-2.0,
+               gir1.2-pango-1.0,
+               gir1.2-gtk-3.0
 Standards-Version: 3.8.3
 Homepage: http://live.gnome.org/LibUnique
 
-Package: libunique3-0
+Package: libunique-3.0-0
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
@@ -36,14 +44,13 @@
  .
  This package contains the shared libraries.
 
-Package: libunique3-dev
+Package: libunique-3.0-dev
 Section: libdevel
 Architecture: any
-Depends: libunique3-0 (= ${binary:Version}),
+Depends: libunique-3.0-0 (= ${binary:Version}),
          ${misc:Depends},
-         libglib2.0-dev (>= 2.12.0),
          libgtk3.0-dev
-Suggests: libunique3-doc
+Recommends: libunique-3.0-doc
 Description: Library for writing single instance applications - development files
  Unique is a library for writing single instance application.
  If you launch a single instance application twice, the second
@@ -58,11 +65,11 @@
  This package contains the headers and development libraries needed to
  build applications using the Unique library
 
-Package: libunique3-doc
+Package: libunique-3.0-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Recommends: libunique3-0
+Conflicts: libunique-doc
 Suggests: devhelp
 Description: Library for writing single instance applications - documentation
  Unique is a library for writing single instance application.
@@ -76,3 +83,16 @@
  the startup notification side. 
  .
  This package contains the HTML documentation for the Unique library
+
+Package: gir1.2-unique-3.0
+Section: libs
+Architecture: any
+Depends: ${gir:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends}
+Description: GObject introspection data for the Unique library
+ This package contains introspection data for LibUnique, a library for 
+ writing single instance applications.
+ .
+ It can be used by packages using the GIRepository format to generate 
+ dynamic bindings.

Copied: packages/experimental/libunique3/debian/libunique-3.0-0.install (from r26968, packages/experimental/libunique3/debian/libunique3-0.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/libunique3/debian/libunique-3.0-0.install?rev=26970&op=diff
==============================================================================
--- packages/experimental/libunique3/debian/libunique3-0.install [utf-8] (original)
+++ packages/experimental/libunique3/debian/libunique-3.0-0.install [utf-8] Sat Mar 19 20:01:13 2011
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/libunique-3.0.so.*
+debian/tmp/usr/lib/libunique-*.so.*

Copied: packages/experimental/libunique3/debian/libunique-3.0-0.symbols (from r26968, packages/experimental/libunique3/debian/libunique3-0.symbols)
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/libunique3/debian/libunique-3.0-0.symbols?rev=26970&op=diff
==============================================================================
--- packages/experimental/libunique3/debian/libunique3-0.symbols [utf-8] (original)
+++ packages/experimental/libunique3/debian/libunique-3.0-0.symbols [utf-8] Sat Mar 19 20:01:13 2011
@@ -1,4 +1,4 @@
-libunique-3.0.so.0 libunique3-0 #MINVER#
+libunique-3.0.so.0 libunique-3.0-0 #MINVER#
  unique_app_add_command at Base 2.90.1
  unique_app_emit_message_received at Base 2.90.1
  unique_app_get_type at Base 2.90.1
@@ -9,7 +9,6 @@
  unique_app_watch_window at Base 2.90.1
  unique_backend_bacon_get_type at Base 2.90.1
  unique_backend_create at Base 2.90.1
- unique_backend_dbus_get_type at Base 2.90.1
  unique_backend_gdbus_get_type at Base 2.90.1
  unique_backend_get_name at Base 2.90.1
  unique_backend_get_screen at Base 2.90.1
@@ -27,7 +26,6 @@
  unique_factory_bacon_accept at Base 2.90.1
  unique_factory_bacon_get_fd at Base 2.90.1
  unique_factory_bacon_get_type at Base 2.90.1
- unique_factory_dbus_get_type at Base 2.90.1
  unique_marshal_ENUM__INT_BOXED_UINT at Base 2.90.1
  unique_message_data_copy at Base 2.90.1
  unique_message_data_free at Base 2.90.1

Copied: packages/experimental/libunique3/debian/libunique-3.0-dev.install (from r26968, packages/experimental/libunique3/debian/libunique3-dev.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/libunique3/debian/libunique-3.0-dev.install?rev=26970&op=diff
==============================================================================
--- packages/experimental/libunique3/debian/libunique3-dev.install [utf-8] (original)
+++ packages/experimental/libunique3/debian/libunique-3.0-dev.install [utf-8] Sat Mar 19 20:01:13 2011
@@ -1,3 +1,4 @@
 debian/tmp/usr/include/unique-3.0/unique/*
 debian/tmp/usr/lib/libunique-3.0.so
 debian/tmp/usr/lib/pkgconfig/unique-3.0*
+debian/tmp/usr/share/gir-1.0

Added: packages/experimental/libunique3/debian/patches/01_link_x11.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/libunique3/debian/patches/01_link_x11.patch?rev=26970&op=file
==============================================================================
--- packages/experimental/libunique3/debian/patches/01_link_x11.patch (added)
+++ packages/experimental/libunique3/debian/patches/01_link_x11.patch [utf-8] Sat Mar 19 20:01:13 2011
@@ -1,0 +1,15 @@
+GNOME #645255
+
+Index: libunique-2.91.4/configure.ac
+===================================================================
+--- libunique-2.91.4.orig/configure.ac	2011-03-19 20:43:33.859985001 +0100
++++ libunique-2.91.4/configure.ac	2011-03-19 20:43:39.083985002 +0100
+@@ -68,7 +68,7 @@ m4_define([dbus_required], [0.70])
+ PKG_CHECK_MODULES(UNIQUE, glib-2.0 >= glib_required dnl
+                           gtk+-3.0 >= gtk_required)
+ 
+-gdktarget=`$PKG_CONFIG --variable=target gdk-3.0`
++gdktarget=`$PKG_CONFIG --variable=targets gdk-3.0`
+ AS_IF([test "X$gdktarget" = "Xx11"],
+       [
+         AC_PATH_XTRA

Added: packages/experimental/libunique3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/libunique3/debian/patches/series?rev=26970&op=file
==============================================================================
--- packages/experimental/libunique3/debian/patches/series (added)
+++ packages/experimental/libunique3/debian/patches/series [utf-8] Sat Mar 19 20:01:13 2011
@@ -1,0 +1,1 @@
+01_link_x11.patch

Modified: packages/experimental/libunique3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/libunique3/debian/rules?rev=26970&op=diff
==============================================================================
--- packages/experimental/libunique3/debian/rules [utf-8] (original)
+++ packages/experimental/libunique3/debian/rules [utf-8] Sat Mar 19 20:01:13 2011
@@ -2,17 +2,16 @@
 
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
+GNOME_MODULE := libunique
+
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-DEB_DH_MAKESHLIBS_ARGS_libunique-1.0-0 = -V 'libunique-1.0-0 (>= 1.0.2)' -- -c4
+DEB_DH_MAKESHLIBS_ARGS_libunique-3.0-0 = -V'libunique-3.0-0 (>= 2.91.4)' -- -c4
 
-DEB_CONFIGURE_EXTRA_FLAGS = --enable-introspection=no
-
-binary-predeb/gir1.0-unique-1.0::
-	dh_girepository -p$(cdbs_curpkg)
+DEB_CONFIGURE_EXTRA_FLAGS = --disable-dbus

Added: packages/experimental/libunique3/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/libunique3/debian/source/format?rev=26970&op=file
==============================================================================
--- packages/experimental/libunique3/debian/source/format (added)
+++ packages/experimental/libunique3/debian/source/format [utf-8] Sat Mar 19 20:01:13 2011
@@ -1,0 +1,1 @@
+3.0 (quilt)

More information about the pkg-gnome-commits mailing list