r31544 - in /desktop/unstable/libcryptui/debian: changelog compat control control.in gir1.2-cryptui-0.0.install libcryptui-dev.install libcryptui0a.install rules
jordi at users.alioth.debian.org
jordi at users.alioth.debian.org
Fri Nov 18 23:09:39 UTC 2011
Author: jordi
Date: Fri Nov 18 23:09:36 2011
New Revision: 31544
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31544
Log:
* 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.
Modified:
desktop/unstable/libcryptui/debian/changelog
desktop/unstable/libcryptui/debian/compat
desktop/unstable/libcryptui/debian/control
desktop/unstable/libcryptui/debian/control.in
desktop/unstable/libcryptui/debian/gir1.2-cryptui-0.0.install
desktop/unstable/libcryptui/debian/libcryptui-dev.install
desktop/unstable/libcryptui/debian/libcryptui0a.install
desktop/unstable/libcryptui/debian/rules
Modified: desktop/unstable/libcryptui/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libcryptui/debian/changelog?rev=31544&op=diff
==============================================================================
--- desktop/unstable/libcryptui/debian/changelog [utf-8] (original)
+++ desktop/unstable/libcryptui/debian/changelog [utf-8] Fri Nov 18 23:09:36 2011
@@ -5,6 +5,11 @@
* This library is split from the seahorse source, so the soname bump is
kept.
* Introduce a seahorse-daemon package.
- * TODO: Multi-Archify.
+ * 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.
-- Jordi Mallach <jordi at debian.org> Sun, 13 Nov 2011 23:43:56 +0100
Modified: desktop/unstable/libcryptui/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libcryptui/debian/compat?rev=31544&op=diff
==============================================================================
--- desktop/unstable/libcryptui/debian/compat [utf-8] (original)
+++ desktop/unstable/libcryptui/debian/compat [utf-8] Fri Nov 18 23:09:36 2011
@@ -1,1 +1,1 @@
-8
+9
Modified: desktop/unstable/libcryptui/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libcryptui/debian/control?rev=31544&op=diff
==============================================================================
--- desktop/unstable/libcryptui/debian/control [utf-8] (original)
+++ desktop/unstable/libcryptui/debian/control [utf-8] Fri Nov 18 23:09:36 2011
@@ -3,49 +3,44 @@
# Modifications should be made to debian/control.in instead.
# This file is regenerated automatically in the clean target.
-Source: seahorse
+Source: libcryptui
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>, Jordi Mallach <jordi at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>
-Build-Depends: debhelper (>= 8),
- cdbs (>= 0.4.41),
+Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
+Uploaders: Jordi Mallach <jordi at debian.org>
+Build-Depends: cdbs (>= 0.4.93),
+ debhelper (>= 8.1.3~),
dh-autoreconf,
- scrollkeeper,
+ gsettings-desktop-schemas-dev,
libgpgme11-dev (>= 1.0.0),
- libgck-dev (>= 3.1.2),
- libgcr-3-dev (>= 3.1.5),
intltool (>= 0.35),
- libsoup2.4-dev,
- libldap2-dev,
- libavahi-glib-dev (>= 0.6),
- libavahi-client-dev (>= 0.6),
libdbus-glib-1-dev (>= 0.35),
- gnome-doc-utils,
gtk-doc-tools (>= 1.9),
libgnome-keyring-dev (>= 3.0.0),
libglib2.0-dev (>= 2.10.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.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
+Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/libcryptui/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/libcryptui/
+Homepage: http://developer.gnome.org/libcryptui/
-Package: seahorse
+Package: seahorse-daemon
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
gnupg (>= 1.4.7)
-Recommends: openssh-client
-Suggests: seahorse-plugins
-Description: GNOME front end for GnuPG
+Recommends: seahorse
+Breaks: seahorse (<< 3.2)
+Description: Seahorse pass phrase caching agent
+ This is the agent program for seahorse which keeps a temporary secure
+ storage of your pass phrases.
+ .
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
@@ -55,18 +50,16 @@
Package: libcryptui0a
Architecture: any
Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends}
-Replaces: seahorse (<< 2.23.6-0ubuntu2)
Conflicts: libcryptui0
-Description: 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
- operations can easily be carried out through an intuitive interface.
+Description: UI library for OpenPGP prompts
+ CryptUI is a library to manage OpenPGP prompts on GUI applications.
.
- This package contains the shared library.
+ This package contains the shared library needed to run programs built
+ against the CryptUI library.
Package: libcryptui-dev
Architecture: any
@@ -75,32 +68,23 @@
${misc:Depends},
libglib2.0-dev (>= 2.10.0),
libgtk-3-dev (>= 2.90.0),
- libgconf2-dev,
libcryptui0a (= ${binary:Version}),
gir1.2-cryptui-0.0 (= ${binary:Version})
-Description: 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
- operations can easily be carried out through an intuitive interface.
+Description: UI library for OpenPGP prompts (development)
+ CryptUI is a library to manage OpenPGP prompts on GUI applications.
.
- This package contains the development files for the library.
+ This package contains the development files and documentation needed to
+ build applications using the CryptUI 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.
+Description: GObject introspection data for the CryptUI library
+ CryptUI is a library to manage OpenPGP prompts on GUI applications.
.
- This package contains introspection data for the Seahorse CryptUI
- library.
+ This package contains introspection data for the CryptUI library.
.
It can be used by packages using the GIRepository format to generate
dynamic bindings.
Modified: desktop/unstable/libcryptui/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libcryptui/debian/control.in?rev=31544&op=diff
==============================================================================
--- desktop/unstable/libcryptui/debian/control.in [utf-8] (original)
+++ desktop/unstable/libcryptui/debian/control.in [utf-8] Fri Nov 18 23:09:36 2011
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs (>= 0.4.41),
- debhelper (>= 8),
+Build-Depends: cdbs (>= 0.4.93),
+ debhelper (>= 8.1.3~),
dh-autoreconf,
gsettings-desktop-schemas-dev,
libgpgme11-dev (>= 1.0.0),
@@ -45,6 +45,8 @@
Package: libcryptui0a
Architecture: any
Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends}
Conflicts: libcryptui0
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=31544&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] Fri Nov 18 23:09:36 2011
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/girepository-1.0/CryptUI-0.0.typelib
+usr/lib/girepository-1.0/CryptUI-0.0.typelib
Modified: desktop/unstable/libcryptui/debian/libcryptui-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libcryptui/debian/libcryptui-dev.install?rev=31544&op=diff
==============================================================================
--- desktop/unstable/libcryptui/debian/libcryptui-dev.install [utf-8] (original)
+++ desktop/unstable/libcryptui/debian/libcryptui-dev.install [utf-8] Fri Nov 18 23:09:36 2011
@@ -1,5 +1,5 @@
usr/include
-usr/lib/*.so
-usr/lib/pkgconfig
+usr/lib/*/*.so
+usr/lib/*/pkgconfig
usr/share/gtk-doc
usr/share/gir-1.0/CryptUI-0.0.gir
Modified: desktop/unstable/libcryptui/debian/libcryptui0a.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libcryptui/debian/libcryptui0a.install?rev=31544&op=diff
==============================================================================
--- desktop/unstable/libcryptui/debian/libcryptui0a.install [utf-8] (original)
+++ desktop/unstable/libcryptui/debian/libcryptui0a.install [utf-8] Fri Nov 18 23:09:36 2011
@@ -1,2 +1,2 @@
-usr/lib/libcryptui.so.*
+usr/lib/*/libcryptui.so.*
usr/share/locale
Modified: desktop/unstable/libcryptui/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libcryptui/debian/rules?rev=31544&op=diff
==============================================================================
--- desktop/unstable/libcryptui/debian/rules [utf-8] (original)
+++ desktop/unstable/libcryptui/debian/rules [utf-8] Fri Nov 18 23:09:36 2011
@@ -9,5 +9,6 @@
LDFLAGS += -Wl,-O1 -Wl,--as-needed
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-update-mime-database \
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+ --disable-update-mime-database \
--enable-pgp
More information about the pkg-gnome-commits
mailing list