[Pkg-gnutls-commits] r1735 - in /packages/gnutls26/branches/branch2.12.20-1+wheezy/debian: changelog control rules

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Sun Mar 31 10:21:31 2013
New Revision: 1735

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1735
Log:
Since guile support would require building with --disable-largefile on
armel armhf mipsel we do not provide the package there.

Modified:
    packages/gnutls26/branches/branch2.12.20-1+wheezy/debian/changelog
    packages/gnutls26/branches/branch2.12.20-1+wheezy/debian/control
    packages/gnutls26/branches/branch2.12.20-1+wheezy/debian/rules

Modified: packages/gnutls26/branches/branch2.12.20-1+wheezy/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/branches/branch2.12.20-1%2Bwheezy/debian/changelog?rev=1735&op=diff
==============================================================================
--- packages/gnutls26/branches/branch2.12.20-1+wheezy/debian/changelog (original)
+++ packages/gnutls26/branches/branch2.12.20-1+wheezy/debian/changelog Sun Mar 31 10:21:31 2013
@@ -5,6 +5,8 @@
     shipping would mean a lot less work for the security team if there was a
     GnuTLS vulnerability. If wanted, it can be re-introduced via backports.
     The versioning trick has been copied from Ubuntu.
+  * Since guile support would require building with --disable-largefile on
+    armel armhf mipsel we do not provide the package there.
 
  -- Andreas Metzler <ametzler at debian.org>  Mon, 04 Feb 2013 19:48:31 +0100
 

Modified: packages/gnutls26/branches/branch2.12.20-1+wheezy/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/branches/branch2.12.20-1%2Bwheezy/debian/control?rev=1735&op=diff
==============================================================================
--- packages/gnutls26/branches/branch2.12.20-1+wheezy/debian/control (original)
+++ packages/gnutls26/branches/branch2.12.20-1+wheezy/debian/control Sun Mar 31 10:21:31 2013
@@ -8,7 +8,8 @@
  Simon Josefsson <simon at josefsson.org>
 Build-Depends: debhelper (>= 8.1.3), libgcrypt11-dev (>= 1.4.0), zlib1g-dev,
  cdbs (>= 0.4.93), gtk-doc-tools, texinfo (>= 4.8),
- libtasn1-3-dev (>= 0.3.4-0), autotools-dev, guile-1.8-dev, datefudge, 
+ libtasn1-3-dev (>= 0.3.4-0), autotools-dev, 
+ guile-1.8-dev[!armel !armhf !mipsel], datefudge, 
  libp11-kit-dev (>= 0.11), pkg-config, chrpath
 Build-Conflicts: libgnutls-dev
 Standards-Version: 3.9.3
@@ -142,7 +143,7 @@
  This package contains the documentation for the GnuTLS 2.x legacy version.
 
 Package: guile-gnutls
-Architecture: any
+Architecture: amd64 hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips powerpc s390 s390x sparc
 Section: lisp
 Depends: ${misc:Depends},${shlibs:Depends}, guile-1.8
 Pre-Depends: ${misc:Pre-Depends}

Modified: packages/gnutls26/branches/branch2.12.20-1+wheezy/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/branches/branch2.12.20-1%2Bwheezy/debian/rules?rev=1735&op=diff
==============================================================================
--- packages/gnutls26/branches/branch2.12.20-1+wheezy/debian/rules (original)
+++ packages/gnutls26/branches/branch2.12.20-1+wheezy/debian/rules Sun Mar 31 10:21:31 2013
@@ -5,8 +5,7 @@
 include /usr/share/cdbs/1/class/autotools.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS = --enable-ld-version-script --enable-cxx \
-	--without-lzo --enable-guile \
-	--with-guile-site-dir=/usr/share/guile/site \
+	--without-lzo \
 	--cache-file=$(CURDIR)/config.cache --with-libgcrypt \
 	--with-packager=Debian \
 	--with-packager-bug-reports=http://bugs.debian.org/ \
@@ -18,9 +17,13 @@
 DEB_DH_MAKESHLIBS_ARGS_guile-gnutls := -V 'guile-gnutls (>= 2.12.17-0)'
 DEB_COMPRESS_EXCLUDE := gnutls.pdf
 
-# workaround for guile testsuite failure.
-ifneq (,$(filter $(DEB_BUILD_ARCH),armel armhf mipsel))
-	DEB_CONFIGURE_EXTRA_FLAGS += --disable-largefile
+# Do not build guile-gnutls on these archs, as we would need to build with
+# --disable-largefile
+ifeq (,$(filter $(DEB_BUILD_ARCH),armel armhf mipsel))
+	DEB_CONFIGURE_EXTRA_FLAGS += --enable-guile \
+		--with-guile-site-dir=/usr/share/guile/site
+else
+	DEB_CONFIGURE_EXTRA_FLAGS += --disable-guile
 endif
 
 # pre-clean rule: save gnutls.pdf since it is expensive to regenerate.