r31715 - in /desktop/unstable/libcryptui/debian: changelog control control.in patches/02_seahorse-daemon_libcryptui_static_link.patch patches/series

[jordi at users.alioth.debian.org]

Author: jordi
Date: Mon Nov 21 00:17:53 2011
New Revision: 31715

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31715
Log:
* Refresh patches.
  - Mark seahorse-daemon Multi-Arch: foreign.
* Add debian/patches/02_seahorse-daemon_libcryptui_static_link.patch, by
  Michael Biebl: create a noinst libcryptui-private.la, and link
  seahorse-daemon against it to avoid a dependency loop between
  seahorse-daemon and libcryptui which requires the D-Bus service.

Added:
    desktop/unstable/libcryptui/debian/patches/02_seahorse-daemon_libcryptui_static_link.patch
Modified:
    desktop/unstable/libcryptui/debian/changelog
    desktop/unstable/libcryptui/debian/control
    desktop/unstable/libcryptui/debian/control.in
    desktop/unstable/libcryptui/debian/patches/series

Modified: desktop/unstable/libcryptui/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libcryptui/debian/changelog?rev=31715&op=diff
==============================================================================
--- desktop/unstable/libcryptui/debian/changelog [utf-8] (original)
+++ desktop/unstable/libcryptui/debian/changelog [utf-8] Mon Nov 21 00:17:53 2011
@@ -6,13 +6,18 @@
   * Introduce a new seahorse-daemon package. Make it Break seahorse < 3.2.
   * Let libcryptui0a depend on seahorse-daemon, as the D-Bus service is
     required.
+  * Refresh patches.
   * Add Multi-Arch support:
     - Bump debhelper & cdbs.
     - Add Pre-Depends.
     - Fix install dirs in *.install.
     - Use the M-A dir as $libdir.
     - Mark libcryptui0a Multi-Arch: same.
-  * Refresh patches.
+    - Mark seahorse-daemon Multi-Arch: foreign.
+  * Add debian/patches/02_seahorse-daemon_libcryptui_static_link.patch, by
+    Michael Biebl: create a noinst libcryptui-private.la, and link
+    seahorse-daemon against it to avoid a dependency loop between
+    seahorse-daemon and libcryptui which requires the D-Bus service.
   * Don't pass obsolete --with-pgp.
   * Pass --enable-gtk-doc, and Build-Depend on libgtk-3-doc to ensure correct
     cross-references.

Modified: desktop/unstable/libcryptui/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libcryptui/debian/control?rev=31715&op=diff
==============================================================================
--- desktop/unstable/libcryptui/debian/control [utf-8] (original)
+++ desktop/unstable/libcryptui/debian/control [utf-8] Mon Nov 21 00:17:53 2011
@@ -33,6 +33,7 @@
 
 Package: seahorse-daemon
 Architecture: any
+Multi-Arch: foreign
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          gnupg (>= 1.4.7)
@@ -55,7 +56,7 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         seahorse-daemon
+         seahorse-daemon $(= ${binary:Version})
 Conflicts: libcryptui0
 Description: UI library for OpenPGP prompts
  CryptUI is a library to manage OpenPGP prompts on GUI applications.

Modified: desktop/unstable/libcryptui/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libcryptui/debian/control.in?rev=31715&op=diff
==============================================================================
--- desktop/unstable/libcryptui/debian/control.in [utf-8] (original)
+++ desktop/unstable/libcryptui/debian/control.in [utf-8] Mon Nov 21 00:17:53 2011
@@ -28,6 +28,7 @@
 
 Package: seahorse-daemon
 Architecture: any
+Multi-Arch: foreign
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          gnupg (>= 1.4.7)
@@ -50,7 +51,7 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         seahorse-daemon
+         seahorse-daemon $(= ${binary:Version})
 Conflicts: libcryptui0
 Description: UI library for OpenPGP prompts
  CryptUI is a library to manage OpenPGP prompts on GUI applications.

Added: desktop/unstable/libcryptui/debian/patches/02_seahorse-daemon_libcryptui_static_link.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libcryptui/debian/patches/02_seahorse-daemon_libcryptui_static_link.patch?rev=31715&op=file
==============================================================================
--- desktop/unstable/libcryptui/debian/patches/02_seahorse-daemon_libcryptui_static_link.patch (added)
+++ desktop/unstable/libcryptui/debian/patches/02_seahorse-daemon_libcryptui_static_link.patch [utf-8] Mon Nov 21 00:17:53 2011
@@ -1,0 +1,40 @@
+Author: Michael Biebl <biebl at debian.org>
+Description: Avoid a circular dependency between -daemon and libcryptui by
+ statically linking seahorse-daemon to libcryptui.
+
+
+diff --git a/daemon/Makefile.am b/daemon/Makefile.am
+index c84dc5c..267d1bf 100644
+--- a/daemon/Makefile.am
++++ b/daemon/Makefile.am
+@@ -73,7 +73,7 @@ seahorse_daemon_SOURCES = \
+ 	$(BUILT_SOURCES)
+ 
+ seahorse_daemon_LDADD = \
+-	$(top_builddir)/libcryptui/libcryptui.la \
++	$(top_builddir)/libcryptui/libcryptui-private.la \
+ 	$(top_builddir)/libegg/libeggdatetime.la \
+ 	$(top_builddir)/libegg/libeggsmclient.la \
+ 	$(SEAHORSE_LIBS)
+diff --git a/libcryptui/Makefile.am b/libcryptui/Makefile.am
+index 8fca33b..9a15530 100644
+--- a/libcryptui/Makefile.am
++++ b/libcryptui/Makefile.am
+@@ -40,6 +40,7 @@ cryptui-marshal.c: cryptui-marshal.list $(GLIB_GENMARSHAL)
+ # 
+ 
+ lib_LTLIBRARIES = libcryptui.la
++noinst_LTLIBRARIES = libcryptui-private.la
+ 
+ libcryptui_src = \
+     $(srcdir)/cryptui.c \
+@@ -61,6 +62,9 @@ libcryptui_la_LDFLAGS = \
+     
+ libcryptui_la_LIBADD = $(LIBCRYPTUI_LIBS) 
+ 
++libcryptui_private_la_SOURCES = $(libcryptui_la_SOURCES)
++libcryptui_private_la_LIBADD = $(libcryptui_la_LIBADD)
++
+ # ------------------------------------------------------------------
+ # PKGCONFIG
+ # 

Modified: desktop/unstable/libcryptui/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libcryptui/debian/patches/series?rev=31715&op=diff
==============================================================================
--- desktop/unstable/libcryptui/debian/patches/series [utf-8] (original)
+++ desktop/unstable/libcryptui/debian/patches/series [utf-8] Mon Nov 21 00:17:53 2011
@@ -1,2 +1,3 @@
 01_autostart_path.patch
+02_seahorse-daemon_libcryptui_static_link.patch
 99_ltmain_as-needed.patch