[Pkg-gnutls-commits] r611 - in /packages/gnutls26/branches/branch2.5.x/debian: changelog control rules

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Thu Nov 13 19:09:09 2008
New Revision: 611

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=611
Log:
enable guile-gnutls on ia64, too.

Modified:
    packages/gnutls26/branches/branch2.5.x/debian/changelog
    packages/gnutls26/branches/branch2.5.x/debian/control
    packages/gnutls26/branches/branch2.5.x/debian/rules

Modified: packages/gnutls26/branches/branch2.5.x/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/branches/branch2.5.x/debian/changelog?rev=611&op=diff
==============================================================================
--- packages/gnutls26/branches/branch2.5.x/debian/changelog (original)
+++ packages/gnutls26/branches/branch2.5.x/debian/changelog Thu Nov 13 19:09:09 2008
@@ -3,6 +3,8 @@
   * New upstream version.
     + Fixes certification verifaction error CVE-2008-4989. Closes: #505360
     + Drop 20_fix_501077.diff.
+  * ia64 has guile-1.8 nowadays, let's try building the guile-gnutls wrappper
+    there.
 
  -- Andreas Metzler <ametzler at debian.org>  Thu, 13 Nov 2008 19:30:06 +0100
 

Modified: packages/gnutls26/branches/branch2.5.x/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/branches/branch2.5.x/debian/control?rev=611&op=diff
==============================================================================
--- packages/gnutls26/branches/branch2.5.x/debian/control (original)
+++ packages/gnutls26/branches/branch2.5.x/debian/control Thu Nov 13 19:09:09 2008
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian GnuTLS Maintainers <pkg-gnutls-maint at lists.alioth.debian.org>
 Uploaders: Andreas Metzler <ametzler at debian.org>, Eric Dorland <eric at debian.org>, James Westby <jw+debian at jameswestby.net>
-Build-Depends: debhelper (>= 5.0.0), libgcrypt11-dev (>= 1.3.2), zlib1g-dev, cdbs, gtk-doc-tools, texinfo (>= 4.8), libtasn1-3-dev (>= 0.3.4-0), autotools-dev, guile-1.8-dev [!ia64]
+Build-Depends: debhelper (>= 5.0.0), libgcrypt11-dev (>= 1.3.2), zlib1g-dev, cdbs, gtk-doc-tools, texinfo (>= 4.8), libtasn1-3-dev (>= 0.3.4-0), autotools-dev, guile-1.8-dev
 Build-Conflicts: libgnutls-dev
 Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnutls/packages/gnutls26/trunk
@@ -99,7 +99,7 @@
 
 Package: guile-gnutls
 Priority: optional
-Architecture: alpha amd64 arm armel hppa i386 kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel powerpc s390 sparc
+Architecture: any
 Section: libs
 Depends: ${misc:Depends},${shlibs:Depends}, guile-1.8
 Description: the GNU TLS library - GNU Guile bindings

Modified: packages/gnutls26/branches/branch2.5.x/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/branches/branch2.5.x/debian/rules?rev=611&op=diff
==============================================================================
--- packages/gnutls26/branches/branch2.5.x/debian/rules (original)
+++ packages/gnutls26/branches/branch2.5.x/debian/rules Thu Nov 13 19:09:09 2008
@@ -10,19 +10,14 @@
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS = --with-mcrypt=no --enable-ld-version-script --disable-cxx --without-lzo
+DEB_CONFIGURE_EXTRA_FLAGS = --with-mcrypt=no --enable-ld-version-script --disable-cxx --without-lzo --enable-guile --with-guile-site-dir=/usr/share/guile/site
 DEB_MAKE_CHECK_TARGET = check
 DEB_DH_STRIP_ARGS = --dbg-package=libgnutls26-dbg
 DEB_DH_MAKESHLIBS_ARGS_libgnutls26 := -V 'libgnutls26 (>=2.5.9-0)'
 DEB_DH_MAKESHLIBS_ARGS_guile-gnutls := -Xusr/lib/libguile-gnutls-
 DEB_COMPRESS_EXCLUDE := gnutls.pdf
 
-# No guile on ia64; do not build gnutls wrapper there.
-ifeq ($(DEB_BUILD_ARCH),ia64)
-	DEB_CONFIGURE_EXTRA_FLAGS += --disable-guile
-else
-	DEB_CONFIGURE_EXTRA_FLAGS += --enable-guile --with-guile-site-dir=/usr/share/guile/site
-endif
+
 
 #build/libgnutls-doc::
 #	$(DEB_MAKE_INVOKE) -C libextra/openpgp pgp-api.tex