r28318 - in /desktop/experimental/vinagre/debian: changelog control patches/00_check_for_dbus_glib.patch patches/01_gettext_configure_ac_fixes.patch patches/series rules vinagre.install

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Sun Jun 5 22:43:03 UTC 2011 

Author: sjoerd
Date: Sun Jun  5 22:43:03 2011
New Revision: 28318

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28318
Log:
* debian/vinagre.install: Install the typelib, otherwise the protocol plugins
  won't work
* debian/patches/01_gettext_configure_ac_fixes.patch:
  + Added. Don't mix intltool and gettext macros, this breaks things for
    autoreconf (from upstream git)
* debian/patches/debian/patches/00_check_for_dbus_glib.patch:
  + Addd. Check for dbus-glib for telepathy (from upstream git)
* debian/rules: Use autoreconf
* debian/rules: Explictely enable telepathy integration
* debian/rules: add list-missing rule

Added:
    desktop/experimental/vinagre/debian/patches/00_check_for_dbus_glib.patch
    desktop/experimental/vinagre/debian/patches/01_gettext_configure_ac_fixes.patch
Modified:
    desktop/experimental/vinagre/debian/changelog
    desktop/experimental/vinagre/debian/control
    desktop/experimental/vinagre/debian/patches/series
    desktop/experimental/vinagre/debian/rules
    desktop/experimental/vinagre/debian/vinagre.install

Modified: desktop/experimental/vinagre/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vinagre/debian/changelog?rev=28318&op=diff
==============================================================================
--- desktop/experimental/vinagre/debian/changelog [utf-8] (original)
+++ desktop/experimental/vinagre/debian/changelog [utf-8] Sun Jun  5 22:43:03 2011
@@ -23,7 +23,19 @@
     - Update Build-Depends on debhelper.
     - Strip leading debian/tmp/ from .install files.
 
- -- Michael Biebl <biebl at debian.org>  Sun, 05 Jun 2011 00:24:12 +0200
+  [ Sjoerd Simons ]
+  * debian/vinagre.install: Install the typelib, otherwise the protocol plugins
+    won't work
+  * debian/patches/01_gettext_configure_ac_fixes.patch:
+    + Added. Don't mix intltool and gettext macros, this breaks things for
+      autoreconf (from upstream git)
+  * debian/patches/debian/patches/00_check_for_dbus_glib.patch:
+    + Addd. Check for dbus-glib for telepathy (from upstream git)
+  * debian/rules: Use autoreconf
+  * debian/rules: Explictely enable telepathy integration
+  * debian/rules: add list-missing rule
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 05 Jun 2011 15:39:25 -0700
 
 vinagre (2.30.3-1) unstable; urgency=low
 

Modified: desktop/experimental/vinagre/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vinagre/debian/control?rev=28318&op=diff
==============================================================================
--- desktop/experimental/vinagre/debian/control [utf-8] (original)
+++ desktop/experimental/vinagre/debian/control [utf-8] Sun Jun  5 22:43:03 2011
@@ -7,7 +7,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Emilio Pozuelo Monfort <pochu at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Build-Depends: cdbs (>= 0.4.52),
                debhelper (>= 8),
                gnome-doc-utils (>= 0.3.2),

Added: desktop/experimental/vinagre/debian/patches/00_check_for_dbus_glib.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vinagre/debian/patches/00_check_for_dbus_glib.patch?rev=28318&op=file
==============================================================================
--- desktop/experimental/vinagre/debian/patches/00_check_for_dbus_glib.patch (added)
+++ desktop/experimental/vinagre/debian/patches/00_check_for_dbus_glib.patch [utf-8] Sun Jun  5 22:43:03 2011
@@ -1,0 +1,21 @@
+commit b94ef0d49c7d2d4b8ab4f8d03fa25d9def696c6f
+Author: David King <amigadave at amigadave.com>
+Date:   Fri Apr 29 14:11:02 2011 +0200
+
+    Add dbus-glib-1 to telepathy-glib pkg-config check
+    
+    Thanks to Andreas Henriksson for the report.
+
+diff --git a/configure.ac b/configure.ac
+index 88815e2..029e619 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -145,7 +145,7 @@ AS_IF([test "x$have_avahi" = "xyes"],
+ AM_CONDITIONAL([VINAGRE_HAVE_AVAHI], [test "x$have_avahi" = "xyes"])
+ 
+ # Check for telepathy-glib.
+-TELEPATHY_GLIB_DEPS="telepathy-glib >= 0.11.6"
++TELEPATHY_GLIB_DEPS="dbus-glib-1 telepathy-glib >= 0.11.6"
+ 
+ AC_ARG_WITH([telepathy],
+   [AS_HELP_STRING([--without-telepathy],

Added: desktop/experimental/vinagre/debian/patches/01_gettext_configure_ac_fixes.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vinagre/debian/patches/01_gettext_configure_ac_fixes.patch?rev=28318&op=file
==============================================================================
--- desktop/experimental/vinagre/debian/patches/01_gettext_configure_ac_fixes.patch (added)
+++ desktop/experimental/vinagre/debian/patches/01_gettext_configure_ac_fixes.patch [utf-8] Sun Jun  5 22:43:03 2011
@@ -1,0 +1,27 @@
+commit c6c5015dbd92e81856577a47d922d31ac85c7031
+Author: David King <amigadave at amigadave.com>
+Date:   Tue May 24 02:08:13 2011 +0200
+
+    Remove gettext macros in configure.ac, bug 650150
+    
+    Using both intltool and gettext macros in configure.ac leads to problems
+    when autoreconf is run, as gettext is run by autopoint, which leads to
+    intltool rejecting the po/Makefile.in.in installed by gettext. Removing
+    the two gettext macro calls from configure.ac fixes the problem. This is
+    an acknowledged problem in the intltool documentation:
+    
+    https://bugs.launchpad.net/intltool/+bug/784191
+
+diff --git a/configure.ac b/configure.ac
+index 0462801..5e606f1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -105,8 +105,6 @@ AM_CONDITIONAL([VINAGRE_ENABLE_SPICE], [test "x$have_spice" = "xyes"])
+ AC_CHECK_HEADERS([ifaddrs.h sys/un.h stropts.h termios.h utmp.h])
+ 
+ # Internationalization.
+-AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION([0.17])
+ AC_SUBST([GETTEXT_PACKAGE], [$PACKAGE_TARNAME])
+ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [GETTEXT package name])
+ IT_PROG_INTLTOOL([0.40.0])

Modified: desktop/experimental/vinagre/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vinagre/debian/patches/series?rev=28318&op=diff
==============================================================================
--- desktop/experimental/vinagre/debian/patches/series [utf-8] (original)
+++ desktop/experimental/vinagre/debian/patches/series [utf-8] Sun Jun  5 22:43:03 2011
@@ -1,1 +1,2 @@
-# Debian patches for vinagre
+00_check_for_dbus_glib.patch
+01_gettext_configure_ac_fixes.patch

Modified: desktop/experimental/vinagre/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vinagre/debian/rules?rev=28318&op=diff
==============================================================================
--- desktop/experimental/vinagre/debian/rules [utf-8] (original)
+++ desktop/experimental/vinagre/debian/rules [utf-8] Sun Jun  5 22:43:03 2011
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/gnome.mk
@@ -11,5 +12,7 @@
 # N.B. telepathy temporarily disabled.
 DEB_CONFIGURE_EXTRA_FLAGS += --with-avahi \
                              --enable-ssh \
-                             --with-telepathy=no \
+                             --with-telepathy=yes \
                              --disable-scrollkeeper
+
+common-binary-post-install-arch:: list-missing

Modified: desktop/experimental/vinagre/debian/vinagre.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vinagre/debian/vinagre.install?rev=28318&op=diff
==============================================================================
--- desktop/experimental/vinagre/debian/vinagre.install [utf-8] (original)
+++ desktop/experimental/vinagre/debian/vinagre.install [utf-8] Sun Jun  5 22:43:03 2011
@@ -2,4 +2,5 @@
 usr/lib/vinagre
 usr/lib/vinagre-3.0/plugins/*.plugin
 usr/lib/vinagre-3.0/plugins/*.so
+usr/lib/vinagre-3.0/girepository-1.0
 usr/share

More information about the pkg-gnome-commits mailing list