r27572 - in /desktop/unstable/seahorse/debian: ./ patches/
jordi at users.alioth.debian.org
jordi at users.alioth.debian.org
Thu Apr 14 19:16:55 UTC 2011
Author: jordi
Date: Thu Apr 14 19:16:53 2011
New Revision: 27572
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27572
Log:
* Build with GTK+3 and require 3.0 versions of libgnome-keyring-dev and
libgcr-dev.
* Rename libcryptui0 to libcryptui0a, as it now links to GTK+3 but
didn't get a soname bump upstream.
* Refresh patches.
* Build-Depend on dh-autoreconf, and use it to replace 90_autotools.patch.
* Enable gobject-introspection support for libcryptui.
* Disable libnotify support temporarily, to avoid entangling the
gnome-keyring transition with libnotify's.
* Bump Standards-Version to 3.9.2 (no changes required).
* Add Vcs-* and Homepage fields.
Added:
desktop/unstable/seahorse/debian/gir1.2-cryptui-0.0.install
desktop/unstable/seahorse/debian/libcryptui0a.install
- copied unchanged from r27563, desktop/unstable/seahorse/debian/libcryptui0.install
Removed:
desktop/unstable/seahorse/debian/libcryptui0.install
desktop/unstable/seahorse/debian/patches/90_autotools.patch
Modified:
desktop/unstable/seahorse/debian/changelog
desktop/unstable/seahorse/debian/control
desktop/unstable/seahorse/debian/control.in
desktop/unstable/seahorse/debian/libcryptui-dev.install
desktop/unstable/seahorse/debian/patches/01_autostart_path.patch
desktop/unstable/seahorse/debian/patches/08_force_ssh.patch
desktop/unstable/seahorse/debian/patches/series
desktop/unstable/seahorse/debian/rules
Modified: desktop/unstable/seahorse/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/changelog?rev=27572&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/changelog [utf-8] (original)
+++ desktop/unstable/seahorse/debian/changelog [utf-8] Thu Apr 14 19:16:53 2011
@@ -1,11 +1,19 @@
seahorse (3.0.0-1) UNRELEASED; urgency=low
- * WIP, does not build.
* New upstream stable release.
- * Build with GTK+3.
- * Temporarily disable libnotify support.
-
- -- Jordi Mallach <jordi at debian.org> Thu, 14 Apr 2011 13:34:35 +0200
+ * Build with GTK+3 and require 3.0 versions of libgnome-keyring-dev and
+ libgcr-dev.
+ * Rename libcryptui0 to libcryptui0a, as it now links to GTK+3 but
+ didn't get a soname bump upstream.
+ * Refresh patches.
+ * Build-Depend on dh-autoreconf, and use it to replace 90_autotools.patch.
+ * Enable gobject-introspection support for libcryptui.
+ * Disable libnotify support temporarily, to avoid entangling the
+ gnome-keyring transition with libnotify's.
+ * Bump Standards-Version to 3.9.2 (no changes required).
+ * Add Vcs-* and Homepage fields.
+
+ -- Jordi Mallach <jordi at debian.org> Thu, 14 Apr 2011 21:16:18 +0200
seahorse (2.30.1-2) unstable; urgency=low
Modified: desktop/unstable/seahorse/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/control?rev=27572&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/control [utf-8] (original)
+++ desktop/unstable/seahorse/debian/control [utf-8] Thu Apr 14 19:16:53 2011
@@ -7,13 +7,14 @@
Section: gnome
Priority: optional
Maintainer: Jose Carlos Garcia Sogo <jsogo at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Jordi Mallach <jordi at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: debhelper (>= 5),
cdbs (>= 0.4.41),
+ dh-autoreconf,
scrollkeeper,
libgpgme11-dev (>= 1.0.0),
libgp11-dev (>= 2.29.4),
- libgcr-dev (>= 2.25.5),
+ libgcr-3-dev (>= 3.0.0),
intltool (>= 0.35),
libsoup2.4-dev,
libldap2-dev,
@@ -22,14 +23,20 @@
libdbus-glib-1-dev (>= 0.35),
gnome-doc-utils,
gtk-doc-tools (>= 1.9),
- libgnome-keyring-dev (>= 2.25.5),
+ libgnome-keyring-dev (>= 3.0.0),
libglib2.0-dev (>= 2.10.0),
- libgtk-3-dev (>= 3.90.0),
+ libgtk-3-dev (>= 2.90.0),
# libnotify-dev (>= 0.7),
libgconf2-dev,
+ gobject-introspection (>= 0.6.4),
+ libgirepository1.0-dev (>= 0.6.4),
+ gir1.2-gtk-3.0,
gnome-pkg-tools
Build-Conflicts: gnupg2
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
+Vcs-Svn: svn://svn.debian.org/pkg-gnome/desktop/unstable/seahorse/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/
+Homepage: http://live.gnome.org/Seahorse
Package: seahorse
Architecture: any
@@ -42,38 +49,58 @@
Seahorse is a front end for GnuPG - the GNU Privacy Guard program -
that integrates to the GNOME desktop. It is a tool for secure
communications and data storage. Data encryption and digital signature
- creation can easily be performed through a GUI and Key Management
+ creation can easily be performed through a GUI and Key Management
operations can easily be carried out through an intuitive interface.
-Package: libcryptui0
+Package: libcryptui0a
Architecture: any
+Section: libs
Depends: ${shlibs:Depends},
${misc:Depends}
-Section: libs
Replaces: seahorse (<< 2.23.6-0ubuntu2)
+Conflicts: libcryptui0
Description: the UI library for DBUS functions exported by seahorse
Seahorse is a front end for GnuPG - the GNU Privacy Guard program -
that integrates to the GNOME desktop. It is a tool for secure
communications and data storage. Data encryption and digital signature
- creation can easily be performed through a GUI and Key Management
+ creation can easily be performed through a GUI and Key Management
operations can easily be carried out through an intuitive interface.
.
This package contains the shared library.
Package: libcryptui-dev
Architecture: any
+Section: libdevel
Depends: ${shlibs:Depends},
${misc:Depends},
libglib2.0-dev (>= 2.10.0),
- libgtk2.0-dev (>= 2.18.0),
+ libgtk-3-dev (>= 2.90.0),
libgconf2-dev,
- libcryptui0 (= ${binary:Version})
-Section: libdevel
+ libcryptui0a (= ${binary:Version}),
+ gir1.2-cryptui-0.0 (= ${binary:Version})
Description: the UI library for DBUS functions exported by seahorse (development)
Seahorse is a front end for GnuPG - the GNU Privacy Guard program -
that integrates to the GNOME desktop. It is a tool for secure
communications and data storage. Data encryption and digital signature
- creation can easily be performed through a GUI and Key Management
+ creation can easily be performed through a GUI and Key Management
operations can easily be carried out through an intuitive interface.
.
- This package contains the development files for the library
+ This package contains the development files for the library.
+
+Package: gir1.2-cryptui-0.0
+Architecture: any
+Section: libs
+Depends: ${gir:Depends},
+ ${misc:Depends}
+Description: GObject introspection data for the Seahorse CryptUI library
+ Seahorse is a front end for GnuPG - the GNU Privacy Guard program -
+ that integrates to the GNOME desktop. It is a tool for secure
+ communications and data storage. Data encryption and digital signature
+ creation can easily be performed through a GUI and Key Management
+ operations can easily be carried out through an intuitive interface.
+ .
+ This package contains introspection data for the Seahorse CryptUI
+ library.
+ .
+ It can be used by packages using the GIRepository format to generate
+ dynamic bindings.
Modified: desktop/unstable/seahorse/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/control.in?rev=27572&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/control.in [utf-8] (original)
+++ desktop/unstable/seahorse/debian/control.in [utf-8] Thu Apr 14 19:16:53 2011
@@ -5,10 +5,11 @@
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>= 5),
cdbs (>= 0.4.41),
+ dh-autoreconf,
scrollkeeper,
libgpgme11-dev (>= 1.0.0),
libgp11-dev (>= 2.29.4),
- libgcr-dev (>= 2.25.5),
+ libgcr-3-dev (>= 3.0.0),
intltool (>= 0.35),
libsoup2.4-dev,
libldap2-dev,
@@ -17,14 +18,20 @@
libdbus-glib-1-dev (>= 0.35),
gnome-doc-utils,
gtk-doc-tools (>= 1.9),
- libgnome-keyring-dev (>= 2.25.5),
+ libgnome-keyring-dev (>= 3.0.0),
libglib2.0-dev (>= 2.10.0),
- libgtk-3-dev (>= 3.90.0),
+ libgtk-3-dev (>= 2.90.0),
# libnotify-dev (>= 0.7),
libgconf2-dev,
+ gobject-introspection (>= 0.6.4),
+ libgirepository1.0-dev (>= 0.6.4),
+ gir1.2-gtk-3.0,
gnome-pkg-tools
Build-Conflicts: gnupg2
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
+Vcs-Svn: svn://svn.debian.org/pkg-gnome/desktop/unstable/seahorse/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/
+Homepage: http://live.gnome.org/Seahorse
Package: seahorse
Architecture: any
@@ -37,38 +44,58 @@
Seahorse is a front end for GnuPG - the GNU Privacy Guard program -
that integrates to the GNOME desktop. It is a tool for secure
communications and data storage. Data encryption and digital signature
- creation can easily be performed through a GUI and Key Management
+ creation can easily be performed through a GUI and Key Management
operations can easily be carried out through an intuitive interface.
-Package: libcryptui0
+Package: libcryptui0a
Architecture: any
+Section: libs
Depends: ${shlibs:Depends},
${misc:Depends}
-Section: libs
Replaces: seahorse (<< 2.23.6-0ubuntu2)
+Conflicts: libcryptui0
Description: the UI library for DBUS functions exported by seahorse
Seahorse is a front end for GnuPG - the GNU Privacy Guard program -
that integrates to the GNOME desktop. It is a tool for secure
communications and data storage. Data encryption and digital signature
- creation can easily be performed through a GUI and Key Management
+ creation can easily be performed through a GUI and Key Management
operations can easily be carried out through an intuitive interface.
.
This package contains the shared library.
Package: libcryptui-dev
Architecture: any
+Section: libdevel
Depends: ${shlibs:Depends},
${misc:Depends},
libglib2.0-dev (>= 2.10.0),
- libgtk2.0-dev (>= 2.18.0),
+ libgtk-3-dev (>= 2.90.0),
libgconf2-dev,
- libcryptui0 (= ${binary:Version})
-Section: libdevel
+ libcryptui0a (= ${binary:Version}),
+ gir1.2-cryptui-0.0 (= ${binary:Version})
Description: the UI library for DBUS functions exported by seahorse (development)
Seahorse is a front end for GnuPG - the GNU Privacy Guard program -
that integrates to the GNOME desktop. It is a tool for secure
communications and data storage. Data encryption and digital signature
- creation can easily be performed through a GUI and Key Management
+ creation can easily be performed through a GUI and Key Management
operations can easily be carried out through an intuitive interface.
.
- This package contains the development files for the library
+ This package contains the development files for the library.
+
+Package: gir1.2-cryptui-0.0
+Architecture: any
+Section: libs
+Depends: ${gir:Depends},
+ ${misc:Depends}
+Description: GObject introspection data for the Seahorse CryptUI library
+ Seahorse is a front end for GnuPG - the GNU Privacy Guard program -
+ that integrates to the GNOME desktop. It is a tool for secure
+ communications and data storage. Data encryption and digital signature
+ creation can easily be performed through a GUI and Key Management
+ operations can easily be carried out through an intuitive interface.
+ .
+ This package contains introspection data for the Seahorse CryptUI
+ library.
+ .
+ It can be used by packages using the GIRepository format to generate
+ dynamic bindings.
Added: desktop/unstable/seahorse/debian/gir1.2-cryptui-0.0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/gir1.2-cryptui-0.0.install?rev=27572&op=file
==============================================================================
--- desktop/unstable/seahorse/debian/gir1.2-cryptui-0.0.install (added)
+++ desktop/unstable/seahorse/debian/gir1.2-cryptui-0.0.install [utf-8] Thu Apr 14 19:16:53 2011
@@ -1,0 +1,1 @@
+debian/tmp/usr/lib/girepository-1.0/CryptUI-0.0.typelib
Modified: desktop/unstable/seahorse/debian/libcryptui-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/libcryptui-dev.install?rev=27572&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/libcryptui-dev.install [utf-8] (original)
+++ desktop/unstable/seahorse/debian/libcryptui-dev.install [utf-8] Thu Apr 14 19:16:53 2011
@@ -2,3 +2,4 @@
debian/tmp/usr/lib/*.so
debian/tmp/usr/lib/pkgconfig
debian/tmp/usr/share/gtk-doc
+debian/tmp/usr/share/gir-1.0/CryptUI-0.0.gir
Modified: desktop/unstable/seahorse/debian/patches/01_autostart_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/01_autostart_path.patch?rev=27572&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/patches/01_autostart_path.patch [utf-8] (original)
+++ desktop/unstable/seahorse/debian/patches/01_autostart_path.patch [utf-8] Thu Apr 14 19:16:53 2011
@@ -1,8 +1,8 @@
-Index: seahorse-2.26.1/daemon/Makefile.am
+Index: seahorse-3.0.0/daemon/Makefile.am
===================================================================
---- seahorse-2.26.1.orig/daemon/Makefile.am 2009-05-20 18:44:11.026450272 +0200
-+++ seahorse-2.26.1/daemon/Makefile.am 2009-05-20 18:44:48.634700182 +0200
-@@ -14,7 +14,7 @@ INCLUDES = -I$(top_builddir) \
+--- 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 @@
-DLOCALEDIR=\""$(localedir)"\" \
-DPIXMAPSDIR=\""$(pixmapsdir)"\" \
-DLIBCRYPTUI_API_SUBJECT_TO_CHANGE \
Modified: desktop/unstable/seahorse/debian/patches/08_force_ssh.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/08_force_ssh.patch?rev=27572&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/patches/08_force_ssh.patch [utf-8] (original)
+++ desktop/unstable/seahorse/debian/patches/08_force_ssh.patch [utf-8] Thu Apr 14 19:16:53 2011
@@ -1,8 +1,8 @@
-Index: seahorse-2.26.2/configure.in
+Index: seahorse-3.0.0/configure.in
===================================================================
---- seahorse-2.26.2.orig/configure.in 2009-08-24 21:41:09.000000000 +0200
-+++ seahorse-2.26.2/configure.in 2009-08-24 21:41:28.000000000 +0200
-@@ -461,16 +461,16 @@
+--- seahorse-3.0.0.orig/configure.in 2011-04-14 17:33:56.859294959 +0200
++++ seahorse-3.0.0/configure.in 2011-04-14 17:34:06.623294976 +0200
+@@ -494,16 +494,16 @@
echo "disabling ssh support"
else
Modified: desktop/unstable/seahorse/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/series?rev=27572&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/patches/series [utf-8] (original)
+++ desktop/unstable/seahorse/debian/patches/series [utf-8] Thu Apr 14 19:16:53 2011
@@ -1,5 +1,4 @@
01_autostart_path.patch
08_force_ssh.patch
30_preferences_menu.patch
-90_autotools.patch
99_ltmain_as-needed.patch
Modified: desktop/unstable/seahorse/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/rules?rev=27572&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/rules [utf-8] (original)
+++ desktop/unstable/seahorse/debian/rules [utf-8] Thu Apr 14 19:16:53 2011
@@ -1,6 +1,7 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
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
More information about the pkg-gnome-commits
mailing list