[Pkg-gnupg-commit] r294 - in /gnupg/trunk/debian: changelog rules

[thijs at users.alioth.debian.org]

Author: thijs
Date: Sat Oct 13 15:38:38 2012
New Revision: 294

URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=294
Log:
revert r231 'Build udebs with --enable-minimal.'

Not suitable while in freeze.

Modified:
    gnupg/trunk/debian/changelog
    gnupg/trunk/debian/rules

Modified: gnupg/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/changelog?rev=294&op=diff
==============================================================================
--- gnupg/trunk/debian/changelog (original)
+++ gnupg/trunk/debian/changelog Sat Oct 13 15:38:38 2012
@@ -1,7 +1,6 @@
 gnupg (1.4.12-5) UNRELEASED; urgency=low
 
   [ Thijs Kinkhorst ]
-  * Build udebs with --enable-minimal.
   * Add lintian override for gnupg-curl non-conflict.
 
   [ Daniel Leidert ]

Modified: gnupg/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/rules?rev=294&op=diff
==============================================================================
--- gnupg/trunk/debian/rules (original)
+++ gnupg/trunk/debian/rules Sat Oct 13 15:38:38 2012
@@ -19,10 +19,8 @@
 DEB_HOST_ARCH_OS  := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
 CONFARGS  = --prefix=/usr --libexecdir=/usr/lib/ \
+            --enable-mailto --with-mailprog=/usr/sbin/sendmail \
             --enable-noexecstack
-
-CONFARGS_FULL    = --enable-mailto --with-mailprog=/usr/sbin/sendmail
-CONFARGS_MINIMAL = --enable-minimal --disable-nls --disable-regex --disable-gnupg-iconv --disable-gettext --without-iconv --without-readline --without-zlib
 
 ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
 HOSTARG += --host=$(DEB_HOST_GNU_TYPE)
@@ -43,22 +41,24 @@
 build-deb/config.status:
 	dh_testdir
 	(mkdir -p $(@D); cd $(@D); \
-	    ../configure LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS_DEF)" CFLAGS="$(CFLAGS_DEF)" $(CONFARGS) $(CONFARGS_FULL) $(HOSTARG) --without-libcurl)
+	    ../configure LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS_DEF)" CFLAGS="$(CFLAGS_DEF)" $(CONFARGS) $(HOSTARG) --without-libcurl)
 
 build-deb-curl/config.status:
 	dh_testdir
 	(mkdir -p $(@D); cd $(@D); \
-	    ../configure LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS_DEF)" CFLAGS="$(CFLAGS_DEF)" $(CONFARGS) $(CONFARGS_FULL) $(HOSTARG))
+	    ../configure LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS_DEF)" CFLAGS="$(CFLAGS_DEF)" $(CONFARGS) $(HOSTARG))
 
 build-udeb/config.status:
 	dh_testdir
 	(mkdir -p $(@D); cd $(@D); CFLAGS="-g -Os" \
-	    ../configure $(CONFARGS) $(CONFARGS_MINIMAL) $(HOSTARG) )
+	    ../configure $(CONFARGS) $(HOSTARG) \
+	    --without-bzip2 --without-readline --without-libcurl)
 
 build-win32/config.status:
 	dh_testdir
 	(mkdir -p $(@D); cd $(@D); CFLAGS="-g -Os" \
-	    ../configure $(CONFARGS) $(CONFARGS_MINIMAL) --host i686-w64-mingw32 )
+	    ../configure $(CONFARGS) --host i686-w64-mingw32 \
+	    --disable-gnupg-iconv --without-bzip2 --without-readline --without-libcurl --disable-ldap)
 
 ##################################### build ##################################