r31555 - in /desktop/unstable/libcryptui/debian: changelog control.in gir1.2-cryptui-0.0.install patches/01_autostart_path.patch rules seahorse-daemon.install

jordi at users.alioth.debian.org jordi at users.alioth.debian.org
Sat Nov 19 00:11:04 UTC 2011 

Author: jordi
Date: Sat Nov 19 00:11:00 2011
New Revision: 31555

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31555
Log:
* Initial release, based on Seahorse's packaging.
* Refresh patches.
* 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/changelog
    desktop/unstable/libcryptui/debian/control.in
    desktop/unstable/libcryptui/debian/gir1.2-cryptui-0.0.install
    desktop/unstable/libcryptui/debian/patches/01_autostart_path.patch
    desktop/unstable/libcryptui/debian/rules
    desktop/unstable/libcryptui/debian/seahorse-daemon.install

Modified: desktop/unstable/libcryptui/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libcryptui/debian/changelog?rev=31555&op=diff
==============================================================================
--- desktop/unstable/libcryptui/debian/changelog [utf-8] (original)
+++ desktop/unstable/libcryptui/debian/changelog [utf-8] Sat Nov 19 00:11:00 2011
@@ -1,7 +1,7 @@
 libcryptui (3.2.0-1) UNRELEASED; urgency=low
 
   * WIP, do not upload without testing.
-  * Initial release.
+  * Initial release, based on Seahorse's packaging.
   * This library is split from the seahorse source, so the soname bump is
     kept.
   * Introduce a seahorse-daemon package.
@@ -11,5 +11,9 @@
     - Fix install dirs in *.install.
     - Use the M-A dir as $libdir.
     - Mark libcryptui0a Multi-Arch: same.
+  * Refresh patches.
+  * Don't pass obsolete --with-pgp.
+  * Pass --enable-gtk-doc, and Build-Depend on libgtk-3-doc to ensure correct
+    cross-references.
 
  -- Jordi Mallach <jordi at debian.org>  Sun, 13 Nov 2011 23:43:56 +0100

Modified: desktop/unstable/libcryptui/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libcryptui/debian/control.in?rev=31555&op=diff
==============================================================================
--- desktop/unstable/libcryptui/debian/control.in [utf-8] (original)
+++ desktop/unstable/libcryptui/debian/control.in [utf-8] Sat Nov 19 00:11:00 2011
@@ -5,6 +5,7 @@
 Uploaders: @GNOME_TEAM@
 Build-Depends: cdbs (>= 0.4.93),
                debhelper (>= 8.1.3~),
+               gnome-pkg-tools,
                dh-autoreconf,
                gsettings-desktop-schemas-dev,
                libgpgme11-dev (>= 1.0.0),
@@ -18,7 +19,7 @@
                gobject-introspection (>= 0.6.4),
                libgirepository1.0-dev (>= 0.6.4),
                gir1.2-gtk-3.0,
-               gnome-pkg-tools
+               libgtk-3-doc
 Build-Conflicts: gnupg2
 Standards-Version: 3.9.2
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/libcryptui/

Modified: desktop/unstable/libcryptui/debian/gir1.2-cryptui-0.0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libcryptui/debian/gir1.2-cryptui-0.0.install?rev=31555&op=diff
==============================================================================
--- desktop/unstable/libcryptui/debian/gir1.2-cryptui-0.0.install [utf-8] (original)
+++ desktop/unstable/libcryptui/debian/gir1.2-cryptui-0.0.install [utf-8] Sat Nov 19 00:11:00 2011
@@ -1,1 +1,1 @@
-usr/lib/girepository-1.0/CryptUI-0.0.typelib
+usr/lib/*/girepository-1.0/CryptUI-0.0.typelib usr/lib/girepository-1.0

Modified: desktop/unstable/libcryptui/debian/patches/01_autostart_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libcryptui/debian/patches/01_autostart_path.patch?rev=31555&op=diff
==============================================================================
--- desktop/unstable/libcryptui/debian/patches/01_autostart_path.patch [utf-8] (original)
+++ desktop/unstable/libcryptui/debian/patches/01_autostart_path.patch [utf-8] Sat Nov 19 00:11:00 2011
@@ -1,13 +1,20 @@
-Index: seahorse-3.0.0/daemon/Makefile.am
+Author: Josselin Mouette <joss at debian.org>
+Description: Define AUTOSTARTDIR to /usr/share/gnome/xdg.
+ This is needed because the autostart .desktop file changes with every
+ release, as it's autogenerated with translations, and the path is
+ hardcoded in the binary. Seriously, WTF?
+Forwarded: no.
+
+Index: libcryptui-3.2.0/daemon/Makefile.am
 ===================================================================
---- seahorse-3.0.0.orig/daemon/Makefile.am	2011-04-14 17:33:57.639294959 +0200
-+++ seahorse-3.0.0/daemon/Makefile.am	2011-04-14 17:34:00.955294958 +0200
-@@ -12,7 +12,7 @@
+--- libcryptui-3.2.0.orig/daemon/Makefile.am	2011-08-02 10:48:04.000000000 +0200
++++ libcryptui-3.2.0/daemon/Makefile.am	2011-11-19 00:17:07.523144252 +0100
+@@ -13,7 +13,7 @@
  	-DLOCALEDIR=\""$(localedir)"\" \
  	-DPIXMAPSDIR=\""$(pixmapsdir)"\" \
  	-DLIBCRYPTUI_API_SUBJECT_TO_CHANGE \
--	-DAUTOSTARTDIR=\""$(sysconfdir)/xdg/autostart"\"
-+	-DAUTOSTARTDIR=\""$(datadir)/gnome/autostart"\"
+-	-DAUTOSTARTDIR=\""$(sysconfdir)/xdg/autostart"\" \
++	-DAUTOSTARTDIR=\""$(datadir)/gnome/autostart"\" \
+ 	-DSEAHORSE_UIDIR=\""$(uidir)"\"
  
  bin_PROGRAMS = seahorse-daemon
- 

Modified: desktop/unstable/libcryptui/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libcryptui/debian/rules?rev=31555&op=diff
==============================================================================
--- desktop/unstable/libcryptui/debian/rules [utf-8] (original)
+++ desktop/unstable/libcryptui/debian/rules [utf-8] Sat Nov 19 00:11:00 2011
@@ -11,4 +11,4 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 			     --disable-update-mime-database \
-			     --enable-pgp
+			     --enable-gtk-doc

Modified: desktop/unstable/libcryptui/debian/seahorse-daemon.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libcryptui/debian/seahorse-daemon.install?rev=31555&op=diff
==============================================================================
--- desktop/unstable/libcryptui/debian/seahorse-daemon.install [utf-8] (original)
+++ desktop/unstable/libcryptui/debian/seahorse-daemon.install [utf-8] Sat Nov 19 00:11:00 2011
@@ -1,4 +1,3 @@
-etc/gnome/autostart
 usr/bin
 usr/share/man
 usr/share/pixmaps

More information about the pkg-gnome-commits mailing list