r26109 - in /desktop/experimental/gnome-keyring/debian: changelog control control.in rules

[pochu at users.alioth.debian.org]

Author: pochu
Date: Sun Jan  2 19:50:50 2011
New Revision: 26109

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26109
Log:
* debian/rules,
  debian/control.in:
  - Don't add quilt support, source format 3.0 (quilt) does that for us.
  - Build depend on ca-certificates and let the configure script
    autodetect the certificates dir. Closes: #608003.

Modified:
    desktop/experimental/gnome-keyring/debian/changelog
    desktop/experimental/gnome-keyring/debian/control
    desktop/experimental/gnome-keyring/debian/control.in
    desktop/experimental/gnome-keyring/debian/rules

Modified: desktop/experimental/gnome-keyring/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/changelog?rev=26109&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-keyring/debian/changelog [utf-8] Sun Jan  2 19:50:50 2011
@@ -1,3 +1,13 @@
+gnome-keyring (2.91.4-2) UNRELEASED; urgency=low
+
+  * debian/rules,
+    debian/control.in:
+    - Don't add quilt support, source format 3.0 (quilt) does that for us.
+    - Build depend on ca-certificates and let the configure script
+      autodetect the certificates dir. Closes: #608003.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Sun, 02 Jan 2011 19:04:31 +0000
+
 gnome-keyring (2.91.4-1) experimental; urgency=low
 
   [ Josselin Mouette ]

Modified: desktop/experimental/gnome-keyring/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/control?rev=26109&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-keyring/debian/control [utf-8] Sun Jan  2 19:50:50 2011
@@ -11,7 +11,6 @@
 Build-Depends: debhelper (>= 5),
                dh-autoreconf,
                cdbs,
-               quilt,
                gnome-pkg-tools (>= 0.10),
                intltool (>= 0.35.0),
                libgtk3.0-dev (>= 2.20.0),
@@ -23,6 +22,7 @@
                libdbus-1-dev (>= 1.0),
                libgcrypt11-dev (>= 1.2.2),
                libpam0g-dev,
+               ca-certificates,
                libglib2.0-doc
 Standards-Version: 3.9.1
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/

Modified: desktop/experimental/gnome-keyring/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/control.in?rev=26109&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-keyring/debian/control.in [utf-8] Sun Jan  2 19:50:50 2011
@@ -6,7 +6,6 @@
 Build-Depends: debhelper (>= 5),
                dh-autoreconf,
                cdbs,
-               quilt,
                gnome-pkg-tools (>= 0.10),
                intltool (>= 0.35.0),
                libgtk3.0-dev (>= 2.20.0),
@@ -18,6 +17,7 @@
                libdbus-1-dev (>= 1.0),
                libgcrypt11-dev (>= 1.2.2),
                libpam0g-dev,
+               ca-certificates,
                libglib2.0-doc
 Standards-Version: 3.9.1
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/

Modified: desktop/experimental/gnome-keyring/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/rules?rev=26109&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-keyring/debian/rules [utf-8] Sun Jan  2 19:50:50 2011
@@ -5,14 +5,12 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
 include /usr/share/cdbs/1/rules/autoreconf.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 LDFLAGS := -Wl,-O1 -Wl,-z,defs -Wl,--as-needed
 
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-static --with-pam-dir=/lib/security \
-                             --with-root-certs=/etc/ssl/certs \
                              --with-gtk=3.0 \
                              --enable-gtk-doc