r28152 - in /desktop/unstable/gnome-keyring/debian: changelog control control.in gnome-keyring.install libgck-dev.install libgck0.install libgcr-3-0.install libgcr-3-dev.install libgcr-dev.install libgcr0.install libpam-gnome-keyring.install rules
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Wed Jun 1 01:57:15 UTC 2011
Author: sjoerd
Date: Wed Jun 1 01:57:15 2011
New Revision: 28152
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28152
Log:
Re-add libgcr0 and libgcr-dev packages
Added:
desktop/unstable/gnome-keyring/debian/libgcr-dev.install
desktop/unstable/gnome-keyring/debian/libgcr0.install
Modified:
desktop/unstable/gnome-keyring/debian/changelog
desktop/unstable/gnome-keyring/debian/control
desktop/unstable/gnome-keyring/debian/control.in
desktop/unstable/gnome-keyring/debian/gnome-keyring.install
desktop/unstable/gnome-keyring/debian/libgck-dev.install
desktop/unstable/gnome-keyring/debian/libgck0.install
desktop/unstable/gnome-keyring/debian/libgcr-3-0.install
desktop/unstable/gnome-keyring/debian/libgcr-3-dev.install
desktop/unstable/gnome-keyring/debian/libpam-gnome-keyring.install
desktop/unstable/gnome-keyring/debian/rules
Modified: desktop/unstable/gnome-keyring/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/changelog?rev=28152&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/changelog [utf-8] Wed Jun 1 01:57:15 2011
@@ -1,3 +1,9 @@
+gnome-keyring (3.0.3-2) UNRELEASED; urgency=low
+
+ * Re-add libgcr0 and libgcr-dev packages
+
+ -- Sjoerd Simons <sjoerd at debian.org> Tue, 31 May 2011 18:55:44 -0700
+
gnome-keyring (3.0.3-1) unstable; urgency=low
* New upstream release.
Modified: desktop/unstable/gnome-keyring/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/control?rev=28152&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/control [utf-8] Wed Jun 1 01:57:15 2011
@@ -13,6 +13,7 @@
cdbs,
gnome-pkg-tools (>= 0.10),
intltool (>= 0.35.0),
+ libgtk2.0-dev,
libgtk-3-dev (>= 3.0.0),
libglib2.0-dev (>= 2.25.0),
libtasn1-3-dev (>= 0.3.4),
@@ -97,6 +98,34 @@
gnome-screensaver to unlock your keyrings when logging in and when
unlocking the screen saver.
+Package: libgcr-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends},
+ libgcr0 (= ${binary:Version}),
+ libglib2.0-dev (>= 2.25.0),
+ libgck-dev (= ${binary:Version}),
+ libgtk2.0-dev,
+ libtasn1-3-dev (>= 0.3.4),
+ libtasn1-3-bin
+Description: Library for Crypto UI related task - development
+ GCR is a library for crypto UI and related tasks.
+ .
+ This package contains the static libraries, header files and
+ documentation needed to build applications using the Gtk+ 2.0 version of the
+ GCR library.
+
+Package: libgcr0
+Section: libs
+Architecture: any
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
+Description: Library for Crypto UI related task - runtime
+ GCR is a library for crypto UI and related tasks.
+ .
+ This package contains the shared libraries needed to run programs
+ built against the Gtk+ 2.0 version of the GCR library.
+
Package: libgcr-3-dev
Section: libdevel
Architecture: any
@@ -113,7 +142,8 @@
GCR is a library for crypto UI and related tasks.
.
This package contains the static libraries, header files and
- documentation needed to build applications using the GCR library.
+ documentation needed to build applications using the Gtk+ 3.0 version of the
+ GCR library.
Package: libgcr-3-0
Section: libs
@@ -124,4 +154,4 @@
GCR is a library for crypto UI and related tasks.
.
This package contains the shared libraries needed to run programs
- built against the GCR library.
+ built against the Gtk+ 3.0 version of the GCR library.
Modified: desktop/unstable/gnome-keyring/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/control.in?rev=28152&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/control.in [utf-8] Wed Jun 1 01:57:15 2011
@@ -8,6 +8,7 @@
cdbs,
gnome-pkg-tools (>= 0.10),
intltool (>= 0.35.0),
+ libgtk2.0-dev,
libgtk-3-dev (>= 3.0.0),
libglib2.0-dev (>= 2.25.0),
libtasn1-3-dev (>= 0.3.4),
@@ -92,6 +93,34 @@
gnome-screensaver to unlock your keyrings when logging in and when
unlocking the screen saver.
+Package: libgcr-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends},
+ libgcr0 (= ${binary:Version}),
+ libglib2.0-dev (>= 2.25.0),
+ libgck-dev (= ${binary:Version}),
+ libgtk2.0-dev,
+ libtasn1-3-dev (>= 0.3.4),
+ libtasn1-3-bin
+Description: Library for Crypto UI related task - development
+ GCR is a library for crypto UI and related tasks.
+ .
+ This package contains the static libraries, header files and
+ documentation needed to build applications using the Gtk+ 2.0 version of the
+ GCR library.
+
+Package: libgcr0
+Section: libs
+Architecture: any
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
+Description: Library for Crypto UI related task - runtime
+ GCR is a library for crypto UI and related tasks.
+ .
+ This package contains the shared libraries needed to run programs
+ built against the Gtk+ 2.0 version of the GCR library.
+
Package: libgcr-3-dev
Section: libdevel
Architecture: any
@@ -108,7 +137,8 @@
GCR is a library for crypto UI and related tasks.
.
This package contains the static libraries, header files and
- documentation needed to build applications using the GCR library.
+ documentation needed to build applications using the Gtk+ 3.0 version of the
+ GCR library.
Package: libgcr-3-0
Section: libs
@@ -119,4 +149,4 @@
GCR is a library for crypto UI and related tasks.
.
This package contains the shared libraries needed to run programs
- built against the GCR library.
+ built against the Gtk+ 3.0 version of the GCR library.
Modified: desktop/unstable/gnome-keyring/debian/gnome-keyring.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/gnome-keyring.install?rev=28152&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/gnome-keyring.install [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/gnome-keyring.install [utf-8] Wed Jun 1 01:57:15 2011
@@ -1,11 +1,11 @@
-debian/tmp/usr/bin
-debian/tmp/usr/share/applications/
-debian/tmp/usr/share/locale
-debian/tmp/usr/share/dbus-1/services
-debian/tmp/usr/lib/gnome-keyring/gnome-keyring-prompt*
-debian/tmp/usr/lib/gnome-keyring/devel/*.so
-debian/tmp/usr/share/glib-2.0/schemas/*
-debian/tmp/usr/share/GConf/gsettings/*
-debian/tmp/etc/xdg/autostart
-debian/tmp/usr/share/gnome-keyring-3/ui
-debian/tmp/usr/lib/pkcs11/*.so
+usr/bin
+usr/share/applications/
+usr/share/locale
+usr/share/dbus-1/services
+usr/lib/gnome-keyring/gnome-keyring-prompt*
+usr/lib/gnome-keyring/devel/*.so
+usr/share/glib-2.0/schemas/*
+usr/share/GConf/gsettings/*
+etc/xdg/autostart
+usr/share/gnome-keyring-3/ui
+usr/lib/pkcs11/*.so
Modified: desktop/unstable/gnome-keyring/debian/libgck-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/libgck-dev.install?rev=28152&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/libgck-dev.install [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/libgck-dev.install [utf-8] Wed Jun 1 01:57:15 2011
@@ -1,5 +1,5 @@
-debian/tmp/usr/include/gck
-debian/tmp/usr/lib/libgck.a
-debian/tmp/usr/lib/libgck.so
-debian/tmp/usr/lib/pkgconfig/gck*.pc
-debian/tmp/usr/share/gtk-doc/html/gck
+usr/include/gck
+usr/lib/libgck.a
+usr/lib/libgck.so
+usr/lib/pkgconfig/gck*.pc
+usr/share/gtk-doc/html/gck
Modified: desktop/unstable/gnome-keyring/debian/libgck0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/libgck0.install?rev=28152&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/libgck0.install [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/libgck0.install [utf-8] Wed Jun 1 01:57:15 2011
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/libgck.so.*
+usr/lib/libgck.so.*
Modified: desktop/unstable/gnome-keyring/debian/libgcr-3-0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/libgcr-3-0.install?rev=28152&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/libgcr-3-0.install [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/libgcr-3-0.install [utf-8] Wed Jun 1 01:57:15 2011
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/libgcr-3.so.*
-debian/tmp/usr/share/gcr-3/ui
+usr/lib/libgcr-3.so.*
+usr/share/gcr-3/ui
Modified: desktop/unstable/gnome-keyring/debian/libgcr-3-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/libgcr-3-dev.install?rev=28152&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/libgcr-3-dev.install [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/libgcr-3-dev.install [utf-8] Wed Jun 1 01:57:15 2011
@@ -1,5 +1,5 @@
-debian/tmp/usr/include/gcr-3
-debian/tmp/usr/lib/libgcr-3.a
-debian/tmp/usr/lib/libgcr-3.so
-debian/tmp/usr/lib/pkgconfig/gcr-3.pc
-debian/tmp/usr/share/gtk-doc/html/gcr-3
+usr/include/gcr-3
+usr/lib/libgcr-3.a
+usr/lib/libgcr-3.so
+usr/lib/pkgconfig/gcr-3.pc
+usr/share/gtk-doc/html/gcr-3
Added: desktop/unstable/gnome-keyring/debian/libgcr-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/libgcr-dev.install?rev=28152&op=file
==============================================================================
--- desktop/unstable/gnome-keyring/debian/libgcr-dev.install (added)
+++ desktop/unstable/gnome-keyring/debian/libgcr-dev.install [utf-8] Wed Jun 1 01:57:15 2011
@@ -1,0 +1,5 @@
+usr/include/gcr
+usr/lib/libgcr.a
+usr/lib/libgcr.so
+usr/lib/pkgconfig/gcr-0.pc
+usr/share/gtk-doc/html/gcr-0
Added: desktop/unstable/gnome-keyring/debian/libgcr0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/libgcr0.install?rev=28152&op=file
==============================================================================
--- desktop/unstable/gnome-keyring/debian/libgcr0.install (added)
+++ desktop/unstable/gnome-keyring/debian/libgcr0.install [utf-8] Wed Jun 1 01:57:15 2011
@@ -1,0 +1,2 @@
+usr/lib/libgcr.so.*
+usr/share/gcr/ui
Modified: desktop/unstable/gnome-keyring/debian/libpam-gnome-keyring.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/libpam-gnome-keyring.install?rev=28152&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/libpam-gnome-keyring.install [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/libpam-gnome-keyring.install [utf-8] Wed Jun 1 01:57:15 2011
@@ -1,2 +1,2 @@
-debian/tmp/lib/security/*.so
-debian/pam-configs /usr/share/
+lib/security/*.so
+usr/share/pam-configs
Modified: desktop/unstable/gnome-keyring/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/rules?rev=28152&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/rules [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/rules [utf-8] Wed Jun 1 01:57:15 2011
@@ -1,4 +1,8 @@
#!/usr/bin/make -f
+
+DEB_BUILDDIR = debian/build
+DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/install/@FLAVOR@
+DEB_MAKE_FLAVORS = gtk2 gtk3
include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/cdbs/1/rules/debhelper.mk
@@ -9,14 +13,27 @@
LDFLAGS := -Wl,-O1 -Wl,-z,defs -Wl,--as-needed
-DEB_MAKE_CHECK_TARGET := check || true
+DEB_MAKE_CHECK_TARGET := -k check || true
DEB_CONFIGURE_EXTRA_FLAGS += --enable-static --with-pam-dir=/lib/security \
- --with-gtk=3.0 \
--enable-gtk-doc
+DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3.0
+DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2.0
+
+# Default installation source dir is the gtk3, override for gtk2 based library
+# packages only
+DEB_DH_INSTALL_SOURCEDIR = $(or $(DEB_DH_INSTALL_SOURCEDIR_$(cdbs_curpkg)),$(DEB_DH_INSTALL_SOURCEDIR_ALL))
+DEB_DH_INSTALL_SOURCEDIR_ALL = debian/install/gtk3
+DEB_DH_INSTALL_SOURCEDIR_libgcr0 = debian/install/gtk2
+DEB_DH_INSTALL_SOURCEDIR_libgcr-dev = debian/install/gtk2
+
DEB_DH_MAKESHLIBS_ARGS_gnome-keyring := --no-act
+DEB_DH_MAKESHLIBS_ARGS_libgcr0 += -V -- -c4
DEB_DH_MAKESHLIBS_ARGS_libgcr-3-0 += -V -- -c4
DEB_DH_MAKESHLIBS_ARGS_libgck0 += -V -- -c4
common-binary-post-install-arch:: list-missing
+
+install/libpam-gnome-keyring::
+ cp -r debian/pam-configs debian/install/gtk3/usr/share
More information about the pkg-gnome-commits
mailing list