diff -u gpgme1.0-1.2.0/debian/rules gpgme1.0-1.2.0/debian/rules
--- gpgme1.0-1.2.0/debian/rules
+++ gpgme1.0-1.2.0/debian/rules
@@ -49,7 +49,8 @@
 	        --enable-static \
 	        --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
 		--with-gpg=/usr/bin/gpg \
-		--with-gpgsm=/usr/bin/gpgsm
+		--with-gpgsm=/usr/bin/gpgsm \
+		--with-gpgconf=/usr/bin/gpgconf
 
 	touch configure-stamp
 
diff -u gpgme1.0-1.2.0/debian/changelog gpgme1.0-1.2.0/debian/changelog
--- gpgme1.0-1.2.0/debian/changelog
+++ gpgme1.0-1.2.0/debian/changelog
@@ -1,3 +1,19 @@
+gpgme1.0 (1.2.0-1.2ubuntu1) lucid; urgency=low
+
+  * Merge from Debian testing (LP: #515092), remaining changes:
+    - Add gnupg2 build dep, promote it from suggests to alternative 
+      binary dep, for supporting gnupg2.
+    - debian/rules: Enable tests during build.
+
+ -- Ilya Barygin <barygin@gmail.com>  Sun, 31 Jan 2010 14:39:59 +0300
+
+gpgme1.0 (1.2.0-1.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Enable support for gpgconf (Closes: #510567)
+
+ -- Stefano Zacchiroli <zack@debian.org>  Wed, 02 Dec 2009 11:17:17 +0100
+
 gpgme1.0 (1.2.0-1.1ubuntu1) lucid; urgency=low
 
   * Merge from debian testing.  Remaining changes:
diff -u gpgme1.0-1.2.0/debian/control gpgme1.0-1.2.0/debian/control
--- gpgme1.0-1.2.0/debian/control
+++ gpgme1.0-1.2.0/debian/control
@@ -24,7 +24,7 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, gnupg (>= 1.4.6-2) | gnupg2 (>= 2.0.4)
-Suggests: gpgsm
+Suggests: gpgsm (>= 1.9.6)
 Description: GPGME - GnuPG Made Easy
  GPGME is a wrapper library which provides a C API to access some of the 
  GnuPG functions, such as encrypt, decrypt, sign, verify, ...