r27883 - in /desktop/unstable/gnome-keyring/debian: changelog patches/01_fix_glib_link.patch patches/series rules

[bigon at users.alioth.debian.org]

Author: bigon
Date: Sun May  8 21:07:46 2011
New Revision: 27883

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27883
Log:
* debian/rules: Enable tests
* debian/patches/01_fix_glib_link.patch: Fix FTBFS with --no-add-needed

Added:
    desktop/unstable/gnome-keyring/debian/patches/01_fix_glib_link.patch
Modified:
    desktop/unstable/gnome-keyring/debian/changelog
    desktop/unstable/gnome-keyring/debian/patches/series
    desktop/unstable/gnome-keyring/debian/rules

Modified: desktop/unstable/gnome-keyring/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/changelog?rev=27883&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/changelog [utf-8] Sun May  8 21:07:46 2011
@@ -3,8 +3,10 @@
   * New upstream release
   * debian/patches/04_expand_LIBEXECDIR.patch: Drop patch, applied from
     upstream
-
- -- Laurent Bigonville <bigon at debian.org>  Sat, 07 May 2011 00:37:51 +0200
+  * debian/rules: Enable tests
+  * debian/patches/01_fix_glib_link.patch: Fix FTBFS with --no-add-needed
+
+ -- Laurent Bigonville <bigon at debian.org>  Sun, 08 May 2011 22:52:05 +0200
 
 gnome-keyring (3.0.0-3) unstable; urgency=low
 

Added: desktop/unstable/gnome-keyring/debian/patches/01_fix_glib_link.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/patches/01_fix_glib_link.patch?rev=27883&op=file
==============================================================================
--- desktop/unstable/gnome-keyring/debian/patches/01_fix_glib_link.patch (added)
+++ desktop/unstable/gnome-keyring/debian/patches/01_fix_glib_link.patch [utf-8] Sun May  8 21:07:46 2011
@@ -1,0 +1,19 @@
+Description: Fix FTBFS with --no-add-needed
+Author: Laurent Bigonville <bigon at debian.org>
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=649754
+
+--- a/gck/Makefile.am
++++ b/gck/Makefile.am
+@@ -62,7 +62,11 @@
+ 	gck-test.c \
+ 	gck-test.h
+ libgck_testable_la_LIBADD = \
+-	$(libgck_la_OBJECTS)
++	$(libgck_la_OBJECTS) \
++	$(top_builddir)/egg/libegg-hex.la \
++	$(GOBJECT_LIBS) \
++	$(GIO_LIBS) \
++	$(GLIB_LIBS)
+ 
+ gck-marshal.h: gck-marshal.list $(GLIB_GENMARSHAL)
+ 	$(GLIB_GENMARSHAL) $< --header --prefix=_gck_marshal > $@

Modified: desktop/unstable/gnome-keyring/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/patches/series?rev=27883&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/patches/series [utf-8] Sun May  8 21:07:46 2011
@@ -1,2 +1,3 @@
+01_fix_glib_link.patch
 03_kfreebsd.patch
 99_ltmain_as-needed.patch

Modified: desktop/unstable/gnome-keyring/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/rules?rev=27883&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/rules [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/rules [utf-8] Sun May  8 21:07:46 2011
@@ -9,6 +9,8 @@
 
 LDFLAGS := -Wl,-O1 -Wl,-z,defs -Wl,--as-needed
 
+DEB_MAKE_CHECK_TARGET := check
+
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-static --with-pam-dir=/lib/security \
                              --with-gtk=3.0 \
                              --enable-gtk-doc