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

[thijs at users.alioth.debian.org]

Author: thijs
Date: Mon Jun 30 13:26:54 2014
New Revision: 399

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

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=399&op=diff
==============================================================================
--- gnupg/trunk/debian/changelog	(original)
+++ gnupg/trunk/debian/changelog	Mon Jun 30 13:26:54 2014
@@ -3,6 +3,7 @@
   * New upstream release.
     - Drops obsolete Russian manpage (closes: #737033).
   * Add parcimonie to Suggests (closes: #752260).
+  * Build udebs with --enable-minimal.
 
  -- Thijs Kinkhorst <thijs at debian.org>  Mon, 30 Jun 2014 13:24:01 +0200
 

Modified: gnupg/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/rules?rev=399&op=diff
==============================================================================
--- gnupg/trunk/debian/rules	(original)
+++ gnupg/trunk/debian/rules	Mon Jun 30 13:26:54 2014
@@ -19,8 +19,10 @@
 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 --enable-rsa --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)
@@ -41,24 +43,22 @@
 build-deb/config.status:
 	dh_testdir
 	(mkdir -p $(@D); cd $(@D); \
-	    ../configure LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS_DEF)" CFLAGS="$(CFLAGS_DEF)" $(CONFARGS) $(HOSTARG) --without-libcurl)
+	    ../configure LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS_DEF)" CFLAGS="$(CFLAGS_DEF)" $(CONFARGS) $(CONFARGS_FULL) $(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) $(HOSTARG))
+	    ../configure LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS_DEF)" CFLAGS="$(CFLAGS_DEF)" $(CONFARGS) $(CONFARGS_FULL) $(HOSTARG))
 
 build-udeb/config.status:
 	dh_testdir
 	(mkdir -p $(@D); cd $(@D); CFLAGS="-g -Os" \
-	    ../configure $(CONFARGS) $(HOSTARG) \
-	    --without-bzip2 --without-readline --without-libcurl)
+	    ../configure $(CONFARGS) $(CONFARGS_MINIMAL) $(HOSTARG) )
 
 build-win32/config.status:
 	dh_testdir
 	(mkdir -p $(@D); cd $(@D); CFLAGS="-g -Os" \
-	    ../configure $(CONFARGS) --host i686-w64-mingw32 \
-	    --disable-gnupg-iconv --without-bzip2 --without-readline --without-libcurl --disable-ldap)
+	    ../configure $(CONFARGS) $(CONFARGS_MINIMAL) --host i686-w64-mingw32 )
 
 ##################################### build ##################################