Change heuristics of dpkg-buildpackage's gpg check to allow for

more complex setups (Julian Gilbey). Closes: #163061

ChangeLog

@@ -4,6 +4,10 @@
 	file even if signing .dsc file fails to make it
 	easier to just sign the package later.
 
+	* scripts/dpkg-buildpackage.sh: Change heuristics
+	of gpg check so that it allows for more complex
+	setups.
+
 2006-01-29  Anand Kumria  <wildfire@progsoc.org>
 
 	* scripts/dpkg-source.pl (checkdiff): Ignore comments

debian/changelog

@@ -9,6 +9,8 @@ dpkg (1.13.14~) UNRELEASED; urgency=low
   * Let dpkg-buildpackage create a .changes file even if signing the
     .dsc file failed. This makes it easier to just sign the package
     later (Julian Gilbey). Closes: #217963
+  * Change heuristics of dpkg-buildpackage's gpg check to allow for
+    more complex setups (Julian Gilbey). Closes: #163061
 
  -- Guillem Jover <guillem@debian.org>  Sun, 29 Jan 2006 06:02:58 +0200
 

scripts/dpkg-buildpackage.sh

@@ -48,7 +48,7 @@ END
 
 rootcommand=''
 signcommand=""
-if ( [ -e $GNUPGHOME/secring.gpg ] || [ -e $HOME/.gnupg/secring.gpg ] ) && \
+if (( [ -n "$GNUPGHOME" ] && [ -e "$GNUPGHOME" ] ) || [ -e "$HOME/.gnupg" ] ) && \
 		command -v gpg > /dev/null 2>&1; then
 	signcommand=gpg
 elif command -v pgp > /dev/null 2>&1 ; then