diff -Nru libcryptui-3.8.0/debian/changelog libcryptui-3.8.0/debian/changelog --- libcryptui-3.8.0/debian/changelog 2013-05-13 13:09:04.000000000 +0000 +++ libcryptui-3.8.0/debian/changelog 2013-06-11 18:10:09.000000000 +0000 @@ -1,32 +1,27 @@ -libcryptui (3.8.0-0ubuntu1) saucy; urgency=low +libcryptui (3.8.0-1) unstable; urgency=low - * New upstream version + [ Michael Biebl ] + * Change section of gir1.2-cryptui-0.0 to introspection. - -- Sebastien Bacher Mon, 13 May 2013 15:09:02 +0200 + [ Josselin Mouette ] + * Remove MA: same statements for the -dev package, because it depends + on the gir package which is not MA compatible. + + [ Emilio Pozuelo Monfort ] + * New upstream release. + * debian/control.in: + + Update (build-)dependencies. + + Remove Build-Conflicts on gnupg2. libgpgme11 depends on it and + gets pulled because of libgpgme11-dev. The build conflict comes + from seahorse's packaging and shouldn't be needed here. + * debian/patches/99_ltmain_as-needed.patch: + + Removed. Instead... + * debian/rules: + + Pass --as-needed to dh_autoreconf so it does the --as-needed magic. + The patch was useless before as we were calling autoreconf after + applying the patch. -libcryptui (3.6.0-0ubuntu1) quantal; urgency=low - - * New upstream stable release - - -- Robert Ancell Thu, 27 Sep 2012 10:35:15 +1200 - -libcryptui (3.5.92-0ubuntu1) quantal; urgency=low - - * New upstream release - - -- Didier Roche Tue, 18 Sep 2012 14:23:23 +0200 - -libcryptui (3.5.4-0ubuntu1) quantal; urgency=low - - * New upstream release (LP: #1046109) - - Make the default key chooser window size bigger (LP: #945841) - * debian/control: - - Use standards-version 3.9.3 - - Bump build-depends on debhelper, libglib2.0-dev, libgtk-3-dev - - Add build-depends on libsm-dev, libice-dev - - libcryptui-dev depends on libdbus-glib-1-dev - - -- Robert Ancell Thu, 06 Sep 2012 15:01:52 +1200 + -- Emilio Pozuelo Monfort Tue, 11 Jun 2013 20:09:34 +0200 libcryptui (3.2.2-1) unstable; urgency=low diff -Nru libcryptui-3.8.0/debian/control libcryptui-3.8.0/debian/control --- libcryptui-3.8.0/debian/control 2013-05-13 13:09:32.000000000 +0000 +++ libcryptui-3.8.0/debian/control 2013-06-11 18:46:58.000000000 +0000 @@ -2,14 +2,14 @@ # # Modifications should be made to debian/control.in instead. # This file is regenerated automatically in the clean target. + Source: libcryptui Section: gnome Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian GNOME Maintainers -Uploaders: Debian GNOME Maintainers , Jordi Mallach +Maintainer: Debian GNOME Maintainers +Uploaders: Emilio Pozuelo Monfort , Jordi Mallach Build-Depends: cdbs (>= 0.4.93), - debhelper (>= 9), + debhelper (>= 8.1.3~), gnome-pkg-tools, dh-autoreconf, gsettings-desktop-schemas-dev, @@ -20,15 +20,14 @@ libgnome-keyring-dev (>= 3.0.0), libglib2.0-dev (>= 2.32.0), libgtk-3-dev (>= 3.0.0), + libnotify-dev (>= 0.7), libsm-dev, libice-dev, - libnotify-dev (>= 0.7), gobject-introspection (>= 0.6.4), libgirepository1.0-dev (>= 0.6.4), gir1.2-gtk-3.0, libgtk-3-doc -Build-Conflicts: gnupg2 -Standards-Version: 3.9.3 +Standards-Version: 3.9.2 Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/libcryptui/ Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/libcryptui/ Homepage: http://developer.gnome.org/libcryptui/ @@ -71,12 +70,11 @@ Package: libcryptui-dev Architecture: any Section: libdevel -Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, + libdbus-glib-1-dev (>= 0.35), libglib2.0-dev (>= 2.32.0), libgtk-3-dev (>= 3.0.0), - libdbus-glib-1-dev, libcryptui0a (= ${binary:Version}), gir1.2-cryptui-0.0 (= ${binary:Version}) Suggests: libcryptui-doc @@ -103,7 +101,7 @@ Package: gir1.2-cryptui-0.0 Architecture: any -Section: libs +Section: introspection Depends: ${gir:Depends}, ${misc:Depends} Description: GObject introspection data for the CryptUI library diff -Nru libcryptui-3.8.0/debian/control.in libcryptui-3.8.0/debian/control.in --- libcryptui-3.8.0/debian/control.in 2013-05-13 12:44:19.000000000 +0000 +++ libcryptui-3.8.0/debian/control.in 2013-06-11 17:57:24.000000000 +0000 @@ -1,11 +1,10 @@ Source: libcryptui Section: gnome Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian GNOME Maintainers +Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Build-Depends: cdbs (>= 0.4.93), - debhelper (>= 9), + debhelper (>= 8.1.3~), gnome-pkg-tools, dh-autoreconf, gsettings-desktop-schemas-dev, @@ -16,15 +15,14 @@ libgnome-keyring-dev (>= 3.0.0), libglib2.0-dev (>= 2.32.0), libgtk-3-dev (>= 3.0.0), + libnotify-dev (>= 0.7), libsm-dev, libice-dev, - libnotify-dev (>= 0.7), gobject-introspection (>= 0.6.4), libgirepository1.0-dev (>= 0.6.4), gir1.2-gtk-3.0, libgtk-3-doc -Build-Conflicts: gnupg2 -Standards-Version: 3.9.3 +Standards-Version: 3.9.2 Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/libcryptui/ Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/libcryptui/ Homepage: http://developer.gnome.org/libcryptui/ @@ -67,12 +65,11 @@ Package: libcryptui-dev Architecture: any Section: libdevel -Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, + libdbus-glib-1-dev (>= 0.35), libglib2.0-dev (>= 2.32.0), libgtk-3-dev (>= 3.0.0), - libdbus-glib-1-dev, libcryptui0a (= ${binary:Version}), gir1.2-cryptui-0.0 (= ${binary:Version}) Suggests: libcryptui-doc @@ -99,7 +96,7 @@ Package: gir1.2-cryptui-0.0 Architecture: any -Section: libs +Section: introspection Depends: ${gir:Depends}, ${misc:Depends} Description: GObject introspection data for the CryptUI library diff -Nru libcryptui-3.8.0/debian/patches/01_autostart_path.patch libcryptui-3.8.0/debian/patches/01_autostart_path.patch --- libcryptui-3.8.0/debian/patches/01_autostart_path.patch 2013-05-13 12:44:19.000000000 +0000 +++ libcryptui-3.8.0/debian/patches/01_autostart_path.patch 2011-11-19 00:11:00.000000000 +0000 @@ -5,11 +5,11 @@ hardcoded in the binary. Seriously, WTF? Forwarded: no. -Index: libcryptui-3.5.4/daemon/Makefile.am +Index: libcryptui-3.2.0/daemon/Makefile.am =================================================================== ---- libcryptui-3.5.4.orig/daemon/Makefile.am 2012-03-31 01:39:41.000000000 +1300 -+++ libcryptui-3.5.4/daemon/Makefile.am 2012-09-05 12:02:49.582221296 +1200 -@@ -14,7 +14,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 \ diff -Nru libcryptui-3.8.0/debian/patches/02_seahorse-daemon_libcryptui_static_link.patch libcryptui-3.8.0/debian/patches/02_seahorse-daemon_libcryptui_static_link.patch --- libcryptui-3.8.0/debian/patches/02_seahorse-daemon_libcryptui_static_link.patch 2013-05-13 12:44:19.000000000 +0000 +++ libcryptui-3.8.0/debian/patches/02_seahorse-daemon_libcryptui_static_link.patch 2011-11-21 00:17:53.000000000 +0000 @@ -3,11 +3,11 @@ statically linking seahorse-daemon to libcryptui. -Index: libcryptui-3.5.4/daemon/Makefile.am -=================================================================== ---- libcryptui-3.5.4.orig/daemon/Makefile.am 2012-09-05 12:02:49.582221296 +1200 -+++ libcryptui-3.5.4/daemon/Makefile.am 2012-09-05 12:02:52.302221202 +1200 -@@ -74,7 +74,7 @@ +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 = \ @@ -16,11 +16,11 @@ $(top_builddir)/libegg/libeggdatetime.la \ $(top_builddir)/libegg/libeggsmclient.la \ $(SEAHORSE_LIBS) -Index: libcryptui-3.5.4/libcryptui/Makefile.am -=================================================================== ---- libcryptui-3.5.4.orig/libcryptui/Makefile.am 2011-07-22 19:33:04.000000000 +1200 -+++ libcryptui-3.5.4/libcryptui/Makefile.am 2012-09-05 12:02:52.302221202 +1200 -@@ -40,6 +40,7 @@ +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 @@ -28,7 +28,7 @@ libcryptui_src = \ $(srcdir)/cryptui.c \ -@@ -61,6 +62,9 @@ +@@ -61,6 +62,9 @@ libcryptui_la_LDFLAGS = \ libcryptui_la_LIBADD = $(LIBCRYPTUI_LIBS) diff -Nru libcryptui-3.8.0/debian/patches/99_ltmain_as-needed.patch libcryptui-3.8.0/debian/patches/99_ltmain_as-needed.patch --- libcryptui-3.8.0/debian/patches/99_ltmain_as-needed.patch 2013-05-13 12:44:19.000000000 +0000 +++ libcryptui-3.8.0/debian/patches/99_ltmain_as-needed.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -Index: libcryptui-3.5.4/ltmain.sh -=================================================================== ---- libcryptui-3.5.4.orig/ltmain.sh 2012-09-05 12:03:15.302220404 +1200 -+++ libcryptui-3.5.4/ltmain.sh 2012-09-05 12:03:24.878220078 +1200 -@@ -5800,6 +5800,11 @@ - arg=$func_stripname_result - ;; - -+ -Wl,--as-needed) -+ deplibs="$deplibs $arg" -+ continue -+ ;; -+ - -Wl,*) - func_stripname '-Wl,' '' "$arg" - args=$func_stripname_result -@@ -6160,6 +6165,15 @@ - lib= - found=no - case $deplib in -+ -Wl,--as-needed) -+ if test "$linkmode,$pass" = "prog,link"; then -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ else -+ deplibs="$deplib $deplibs" -+ fi -+ continue -+ ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - if test "$linkmode,$pass" = "prog,link"; then diff -Nru libcryptui-3.8.0/debian/patches/series libcryptui-3.8.0/debian/patches/series --- libcryptui-3.8.0/debian/patches/series 2013-05-13 12:44:19.000000000 +0000 +++ libcryptui-3.8.0/debian/patches/series 2013-06-11 18:01:04.000000000 +0000 @@ -1,3 +1,2 @@ 01_autostart_path.patch 02_seahorse-daemon_libcryptui_static_link.patch -99_ltmain_as-needed.patch diff -Nru libcryptui-3.8.0/debian/rules libcryptui-3.8.0/debian/rules --- libcryptui-3.8.0/debian/rules 2013-05-13 12:44:19.000000000 +0000 +++ libcryptui-3.8.0/debian/rules 2013-06-11 18:01:04.000000000 +0000 @@ -5,7 +5,9 @@ include /usr/share/cdbs/1/class/gnome.mk include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk --include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk +include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +DEB_DH_AUTORECONF_ARGS = --as-needed LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed