r29860 - in /desktop/unstable/gnome-keyring/debian: changelog control control.in libgcr-dev.install libgcr0.install libpam-gnome-keyring.install rules
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Thu Sep 29 15:29:11 UTC 2011
Author: biebl
Date: Thu Sep 29 15:29:11 2011
New Revision: 29860
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29860
Log:
Drop libgcr0 and libgcr-dev again, upstream no longer supports GTK 2
builds.
Removed:
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/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=29860&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/changelog [utf-8] Thu Sep 29 15:29:11 2011
@@ -1,6 +1,8 @@
gnome-keyring (3.2.0-1) UNRELEASED; urgency=low
* New upstream release.
+ * Drop libgcr0 and libgcr-dev again, upstream no longer supports GTK 2
+ builds.
-- Michael Biebl <biebl at debian.org> Thu, 29 Sep 2011 15:30:43 +0200
Modified: desktop/unstable/gnome-keyring/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/control?rev=29860&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/control [utf-8] Thu Sep 29 15:29:11 2011
@@ -7,13 +7,12 @@
Section: gnome
Priority: optional
Maintainer: Josselin Mouette <joss 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>, Laurent Bigonville <bigon at debian.org>, Sjoerd Simons <sjoerd 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>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
Build-Depends: debhelper (>= 5),
dh-autoreconf,
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),
@@ -98,34 +97,6 @@
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
@@ -142,8 +113,7 @@
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+ 3.0 version of the
- GCR library.
+ documentation needed to build applications using the GCR library.
Package: libgcr-3-0
Section: libs
@@ -154,4 +124,4 @@
GCR is a library for crypto UI and related tasks.
.
This package contains the shared libraries needed to run programs
- built against the Gtk+ 3.0 version of the GCR library.
+ built against 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=29860&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/control.in [utf-8] Thu Sep 29 15:29:11 2011
@@ -8,7 +8,6 @@
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),
@@ -93,34 +92,6 @@
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
@@ -137,8 +108,7 @@
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+ 3.0 version of the
- GCR library.
+ documentation needed to build applications using the GCR library.
Package: libgcr-3-0
Section: libs
@@ -149,4 +119,4 @@
GCR is a library for crypto UI and related tasks.
.
This package contains the shared libraries needed to run programs
- built against the Gtk+ 3.0 version of the GCR library.
+ built against the GCR library.
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=29860&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] Thu Sep 29 15:29:11 2011
@@ -1,2 +1,2 @@
lib/security/*.so
-usr/share/pam-configs
+debian/pam-configs usr/share/
Modified: desktop/unstable/gnome-keyring/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/rules?rev=29860&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/rules [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/rules [utf-8] Thu Sep 29 15:29:11 2011
@@ -1,8 +1,4 @@
#!/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
@@ -18,22 +14,8 @@
DEB_CONFIGURE_EXTRA_FLAGS += --enable-static --with-pam-dir=/lib/security \
--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