[Pkg-gnutls-commits] r336 - in /packages/libgcrypt11/branches/branch1.3.0/debian: changelog patches/14_udiv_asm_fix_1253.diff patches/50_re_autofoo.diff

Sun May 20 07:21:31 UTC 2007

Author: ametzler
Date: Sun May 20 07:21:30 2007
New Revision: 336

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=336
Log:
fix ftbfs on hppa with 14_udiv_asm_fix_1253.diff and rerunning auto*  #424616

Added:
    packages/libgcrypt11/branches/branch1.3.0/debian/patches/14_udiv_asm_fix_1253.diff
Modified:
    packages/libgcrypt11/branches/branch1.3.0/debian/changelog
    packages/libgcrypt11/branches/branch1.3.0/debian/patches/50_re_autofoo.diff

Modified: packages/libgcrypt11/branches/branch1.3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libgcrypt11/branches/branch1.3.0/debian/changelog?rev=336&op=diff
==============================================================================

--- packages/libgcrypt11/branches/branch1.3.0/debian/changelog (original)
+++ packages/libgcrypt11/branches/branch1.3.0/debian/changelog Sun May 20 07:21:30 2007
@@ -1,8 +1,11 @@
 libgcrypt11 (1.3.0-2) experimental; urgency=low
 
   * UNRELEASED
-
- -- Andreas Metzler <ametzler at debian.org>  Sun, 13 May 2007 11:58:14 +0200
+  * 14_udiv_asm_fix_1253: Pulled from upstream SVN 1252:1253. Fix
+    build-failure on hppa. (Closes: #424616)
+  * 50_re_autofoo.diff regenerated and renamed.
+
+ -- Andreas Metzler <ametzler at debian.org>  Sun, 20 May 2007 09:12:06 +0200
 
 libgcrypt11 (1.3.0-1) experimental; urgency=low
 

Added: packages/libgcrypt11/branches/branch1.3.0/debian/patches/14_udiv_asm_fix_1253.diff
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libgcrypt11/branches/branch1.3.0/debian/patches/14_udiv_asm_fix_1253.diff?rev=336&op=file
==============================================================================
--- packages/libgcrypt11/branches/branch1.3.0/debian/patches/14_udiv_asm_fix_1253.diff (added)
+++ packages/libgcrypt11/branches/branch1.3.0/debian/patches/14_udiv_asm_fix_1253.diff Sun May 20 07:21:30 2007
@@ -1,0 +1,39 @@
+Index: configure.ac
+===================================================================
+--- configure.ac	(Revision 1252)
++++ configure.ac	(Revision 1253)
+@@ -690,8 +690,8 @@
+ AM_CONDITIONAL(MPI_MOD_ASM_MPIH_MUL3, test "$mpi_mod_asm_mpih_mul3" = yes)
+ AM_CONDITIONAL(MPI_MOD_ASM_MPIH_LSHIFT, test "$mpi_mod_asm_mpih_lshift" = yes)
+ AM_CONDITIONAL(MPI_MOD_ASM_MPIH_RSHIFT, test "$mpi_mod_asm_mpih_rshift" = yes)
+-AM_CONDITIONAL(MPI_MOD_ASM_UDIV, test "$mpi_mod_asm_mpih_udiv" = yes)
+-AM_CONDITIONAL(MPI_MOD_ASM_UDIV_QRNND, test "$mpi_mod_asm_mpih_udiv_qrnnd" = yes)
++AM_CONDITIONAL(MPI_MOD_ASM_UDIV, test "$mpi_mod_asm_udiv" = yes)
++AM_CONDITIONAL(MPI_MOD_ASM_UDIV_QRNND, test "$mpi_mod_asm_udiv_qrnnd" = yes)
+ AM_CONDITIONAL(MPI_MOD_C_MPIH_ADD1, test "$mpi_mod_c_mpih_add1" = yes)
+ AM_CONDITIONAL(MPI_MOD_C_MPIH_SUB1, test "$mpi_mod_c_mpih_sub1" = yes)
+ AM_CONDITIONAL(MPI_MOD_C_MPIH_MUL1, test "$mpi_mod_c_mpih_mul1" = yes)
+@@ -699,8 +699,8 @@
+ AM_CONDITIONAL(MPI_MOD_C_MPIH_MUL3, test "$mpi_mod_c_mpih_mul3" = yes)
+ AM_CONDITIONAL(MPI_MOD_C_MPIH_LSHIFT, test "$mpi_mod_c_mpih_lshift" = yes)
+ AM_CONDITIONAL(MPI_MOD_C_MPIH_RSHIFT, test "$mpi_mod_c_mpih_rshift" = yes)
+-AM_CONDITIONAL(MPI_MOD_C_UDIV, test "$mpi_mod_c_mpih_udiv" = yes)
+-AM_CONDITIONAL(MPI_MOD_C_UDIV_QRNND, test "$mpi_mod_c_mpih_udiv_qrnnd" = yes)
++AM_CONDITIONAL(MPI_MOD_C_UDIV, test "$mpi_mod_c_udiv" = yes)
++AM_CONDITIONAL(MPI_MOD_C_UDIV_QRNND, test "$mpi_mod_c_udiv_qrnnd" = yes)
+ 
+ # Allow users to append something to the version string without
+ # flagging it as development version.  The user version part is
+Index: ChangeLog
+===================================================================
+--- ChangeLog	(Revision 1252)
++++ ChangeLog	(Revision 1253)
+@@ -1,3 +1,8 @@
++2007-05-19  Marcus Brinkmann  <marcus at g10code.de>
++
++	* configure.ac: Fix test for optional UDIV and UDIV_QRNND MPI
++	modules.
++
+ 2007-05-09  Marcus Brinkmann  <marcus at g10code.de>
+ 
+ 	* configure.ac (ac_cv_mpi_config_done): Unused variable removed.

Modified: packages/libgcrypt11/branches/branch1.3.0/debian/patches/50_re_autofoo.diff
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libgcrypt11/branches/branch1.3.0/debian/patches/50_re_autofoo.diff?rev=336&op=diff
==============================================================================
--- packages/libgcrypt11/branches/branch1.3.0/debian/patches/50_re_autofoo.diff (original)
+++ packages/libgcrypt11/branches/branch1.3.0/debian/patches/50_re_autofoo.diff Sun May 20 07:21:30 2007
@@ -1,6 +1,6 @@
-diff -Nur libgcrypt11-1.3.0.orig/cipher/Makefile.in libgcrypt11-1.3.0/cipher/Makefile.in
---- libgcrypt11-1.3.0.orig/cipher/Makefile.in	2007-05-04 11:58:24.000000000 +0200
-+++ libgcrypt11-1.3.0/cipher/Makefile.in	2007-05-13 11:11:16.000000000 +0200
+diff -Nur libgcrypt11-1.3.0.oldauto/cipher/Makefile.in libgcrypt11-1.3.0/cipher/Makefile.in
+--- libgcrypt11-1.3.0.oldauto/cipher/Makefile.in	2007-05-04 11:58:24.000000000 +0200
++++ libgcrypt11-1.3.0/cipher/Makefile.in	2007-05-20 08:54:01.000000000 +0200
 @@ -163,8 +163,6 @@
  MAINT = @MAINT@
  MAKEINFO = @MAKEINFO@
@@ -10,9 +10,9 @@
  MPI_SFLAGS = @MPI_SFLAGS@
  NOEXECSTACK_FLAGS = @NOEXECSTACK_FLAGS@
  OBJDUMP = @OBJDUMP@
-diff -Nur libgcrypt11-1.3.0.orig/configure libgcrypt11-1.3.0/configure
---- libgcrypt11-1.3.0.orig/configure	2007-05-04 11:58:29.000000000 +0200
-+++ libgcrypt11-1.3.0/configure	2007-05-13 11:11:16.000000000 +0200
+diff -Nur libgcrypt11-1.3.0.oldauto/configure libgcrypt11-1.3.0/configure
+--- libgcrypt11-1.3.0.oldauto/configure	2007-05-04 11:58:29.000000000 +0200
++++ libgcrypt11-1.3.0/configure	2007-05-20 08:54:04.000000000 +0200
 @@ -1,7 +1,7 @@
  #! /bin/sh
  # From configure.ac Revision: 1248 .
@@ -408,7 +408,7 @@
 +  MPI_MOD_ASM_MPIH_RSHIFT_FALSE=
 +fi
 +
-+ if test "$mpi_mod_asm_mpih_udiv" = yes; then
++ if test "$mpi_mod_asm_udiv" = yes; then
 +  MPI_MOD_ASM_UDIV_TRUE=
 +  MPI_MOD_ASM_UDIV_FALSE='#'
 +else
@@ -416,7 +416,7 @@
 +  MPI_MOD_ASM_UDIV_FALSE=
 +fi
 +
-+ if test "$mpi_mod_asm_mpih_udiv_qrnnd" = yes; then
++ if test "$mpi_mod_asm_udiv_qrnnd" = yes; then
 +  MPI_MOD_ASM_UDIV_QRNND_TRUE=
 +  MPI_MOD_ASM_UDIV_QRNND_FALSE='#'
 +else
@@ -480,7 +480,7 @@
 +  MPI_MOD_C_MPIH_RSHIFT_FALSE=
 +fi
 +
-+ if test "$mpi_mod_c_mpih_udiv" = yes; then
++ if test "$mpi_mod_c_udiv" = yes; then
 +  MPI_MOD_C_UDIV_TRUE=
 +  MPI_MOD_C_UDIV_FALSE='#'
 +else
@@ -488,7 +488,7 @@
 +  MPI_MOD_C_UDIV_FALSE=
 +fi
 +
-+ if test "$mpi_mod_c_mpih_udiv_qrnnd" = yes; then
++ if test "$mpi_mod_c_udiv_qrnnd" = yes; then
 +  MPI_MOD_C_UDIV_QRNND_TRUE=
 +  MPI_MOD_C_UDIV_QRNND_FALSE='#'
 +else
@@ -704,9 +704,9 @@
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-diff -Nur libgcrypt11-1.3.0.orig/doc/Makefile.in libgcrypt11-1.3.0/doc/Makefile.in
---- libgcrypt11-1.3.0.orig/doc/Makefile.in	2007-05-04 11:58:24.000000000 +0200
-+++ libgcrypt11-1.3.0/doc/Makefile.in	2007-05-13 11:11:16.000000000 +0200
+diff -Nur libgcrypt11-1.3.0.oldauto/doc/Makefile.in libgcrypt11-1.3.0/doc/Makefile.in
+--- libgcrypt11-1.3.0.oldauto/doc/Makefile.in	2007-05-04 11:58:24.000000000 +0200
++++ libgcrypt11-1.3.0/doc/Makefile.in	2007-05-20 08:54:01.000000000 +0200
 @@ -154,8 +154,6 @@
  MAINT = @MAINT@
  MAKEINFO = @MAKEINFO@
@@ -716,9 +716,9 @@
  MPI_SFLAGS = @MPI_SFLAGS@
  NOEXECSTACK_FLAGS = @NOEXECSTACK_FLAGS@
  OBJDUMP = @OBJDUMP@
-diff -Nur libgcrypt11-1.3.0.orig/m4/Makefile.in libgcrypt11-1.3.0/m4/Makefile.in
---- libgcrypt11-1.3.0.orig/m4/Makefile.in	2007-05-04 11:58:24.000000000 +0200
-+++ libgcrypt11-1.3.0/m4/Makefile.in	2007-05-13 11:11:16.000000000 +0200
+diff -Nur libgcrypt11-1.3.0.oldauto/m4/Makefile.in libgcrypt11-1.3.0/m4/Makefile.in
+--- libgcrypt11-1.3.0.oldauto/m4/Makefile.in	2007-05-04 11:58:24.000000000 +0200
++++ libgcrypt11-1.3.0/m4/Makefile.in	2007-05-20 08:54:01.000000000 +0200
 @@ -115,8 +115,6 @@
  MAINT = @MAINT@
  MAKEINFO = @MAKEINFO@
@@ -728,9 +728,9 @@
  MPI_SFLAGS = @MPI_SFLAGS@
  NOEXECSTACK_FLAGS = @NOEXECSTACK_FLAGS@
  OBJDUMP = @OBJDUMP@
-diff -Nur libgcrypt11-1.3.0.orig/Makefile.in libgcrypt11-1.3.0/Makefile.in
---- libgcrypt11-1.3.0.orig/Makefile.in	2007-05-04 11:58:25.000000000 +0200
-+++ libgcrypt11-1.3.0/Makefile.in	2007-05-13 11:11:16.000000000 +0200
+diff -Nur libgcrypt11-1.3.0.oldauto/Makefile.in libgcrypt11-1.3.0/Makefile.in
+--- libgcrypt11-1.3.0.oldauto/Makefile.in	2007-05-04 11:58:25.000000000 +0200
++++ libgcrypt11-1.3.0/Makefile.in	2007-05-20 08:54:02.000000000 +0200
 @@ -160,8 +160,6 @@
  MAINT = @MAINT@
  MAKEINFO = @MAKEINFO@
@@ -753,9 +753,9 @@
  
  DIST_SUBDIRS = m4 mpi cipher src doc tests
  SUBDIRS = mpi cipher src doc tests
-diff -Nur libgcrypt11-1.3.0.orig/mpi/Makefile.in libgcrypt11-1.3.0/mpi/Makefile.in
---- libgcrypt11-1.3.0.orig/mpi/Makefile.in	2007-05-04 11:58:24.000000000 +0200
-+++ libgcrypt11-1.3.0/mpi/Makefile.in	2007-05-13 11:11:16.000000000 +0200
+diff -Nur libgcrypt11-1.3.0.oldauto/mpi/Makefile.in libgcrypt11-1.3.0/mpi/Makefile.in
+--- libgcrypt11-1.3.0.oldauto/mpi/Makefile.in	2007-05-04 11:58:24.000000000 +0200
++++ libgcrypt11-1.3.0/mpi/Makefile.in	2007-05-20 08:54:02.000000000 +0200
 @@ -68,17 +68,46 @@
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -1078,9 +1078,9 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-diff -Nur libgcrypt11-1.3.0.orig/src/Makefile.in libgcrypt11-1.3.0/src/Makefile.in
---- libgcrypt11-1.3.0.orig/src/Makefile.in	2007-05-04 11:58:25.000000000 +0200
-+++ libgcrypt11-1.3.0/src/Makefile.in	2007-05-13 11:11:16.000000000 +0200
+diff -Nur libgcrypt11-1.3.0.oldauto/src/Makefile.in libgcrypt11-1.3.0/src/Makefile.in
+--- libgcrypt11-1.3.0.oldauto/src/Makefile.in	2007-05-04 11:58:25.000000000 +0200
++++ libgcrypt11-1.3.0/src/Makefile.in	2007-05-20 08:54:02.000000000 +0200
 @@ -203,8 +203,6 @@
  MAINT = @MAINT@
  MAKEINFO = @MAKEINFO@
@@ -1090,9 +1090,9 @@
  MPI_SFLAGS = @MPI_SFLAGS@
  NOEXECSTACK_FLAGS = @NOEXECSTACK_FLAGS@
  OBJDUMP = @OBJDUMP@
-diff -Nur libgcrypt11-1.3.0.orig/tests/Makefile.in libgcrypt11-1.3.0/tests/Makefile.in
---- libgcrypt11-1.3.0.orig/tests/Makefile.in	2007-05-04 11:58:25.000000000 +0200
-+++ libgcrypt11-1.3.0/tests/Makefile.in	2007-05-13 11:11:16.000000000 +0200
+diff -Nur libgcrypt11-1.3.0.oldauto/tests/Makefile.in libgcrypt11-1.3.0/tests/Makefile.in
+--- libgcrypt11-1.3.0.oldauto/tests/Makefile.in	2007-05-04 11:58:25.000000000 +0200
++++ libgcrypt11-1.3.0/tests/Makefile.in	2007-05-20 08:54:02.000000000 +0200
 @@ -237,8 +237,6 @@
  MAINT = @MAINT@
  MAKEINFO = @MAKEINFO@


