Package: guile-1.6
Version: 1.6.8-10
Severity: normal
Tags: patch pending
Dear maintainer,
I've prepared an NMU for guile-1.6 (versioned as 1.6.8-10.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Regards.
--
Hector Oron
reverted:
--- guile-1.6-1.6.8/config.log
+++ guile-1.6-1.6.8.orig/config.log
@@ -1,312 +0,0 @@
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by configure, which was
-generated by GNU Autoconf 2.64. Invocation command line was
-
- $ ./configure --host=i486-linux-gnu --build=i486-linux-gnu --prefix=/usr --with-gnu-ld --enable-dynamic-linking --with-threads=yes
-
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = raven
-uname -m = i686
-uname -r = 2.6.31-1-686-bigmem
-uname -s = Linux
-uname -v = #1 SMP Sun Nov 15 21:22:56 UTC 2009
-
-/usr/bin/uname -p = unknown
-/bin/uname -X = unknown
-
-/bin/arch = unknown
-/usr/bin/arch -k = unknown
-/usr/convex/getsysinfo = unknown
-/usr/bin/hostinfo = unknown
-/bin/machine = unknown
-/usr/bin/oslevel = unknown
-/bin/universe = unknown
-
-PATH: /home/rlb/bin
-PATH: /usr/sbin
-PATH: /sbin
-PATH: /usr/local/bin
-PATH: /usr/bin
-PATH: /bin
-PATH: /usr/bin/X11
-PATH: /usr/games
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-configure:2767: checking for a BSD-compatible install
-configure:2835: result: /usr/bin/install -c
-configure:2846: checking whether build environment is sane
-configure:2896: result: yes
-configure:3037: checking for a thread-safe mkdir -p
-configure:3076: result: /bin/mkdir -p
-configure:3089: checking for gawk
-configure:3105: found /usr/bin/gawk
-configure:3116: result: gawk
-configure:3127: checking whether make sets $(MAKE)
-configure:3149: result: yes
-configure:3221: checking whether to enable maintainer-specific portions of Makefiles
-configure:3230: result: no
-configure:3384: checking for i486-linux-gnu-gcc
-configure:3400: found /usr/bin/i486-linux-gnu-gcc
-configure:3411: result: i486-linux-gnu-gcc
-configure:3680: checking for C compiler version
-configure:3689: i486-linux-gnu-gcc --version >&5
-i486-linux-gnu-gcc (Debian 4.3.4-3) 4.3.4
-Copyright (C) 2008 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-configure:3700: $? = 0
-configure:3689: i486-linux-gnu-gcc -v >&5
-Using built-in specs.
-Target: i486-linux-gnu
-Configured with: ../src/configure -v --with-pkgversion='Debian 4.3.4-3' --with-bugurl=file:///usr/share/doc/gcc-4.3/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared --enable-multiarch --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --with-gxx-include-dir=/usr/include/c++/4.3 --program-suffix=-4.3 --enable-clocale=gnu --enable-libstdcxx-debug --enable-objc-gc --enable-mpfr --enable-targets=all --with-tune=generic --enable-checking=release --build=i486-linux-gnu --host=i486-linux-gnu --target=i486-linux-gnu
-Thread model: posix
-gcc version 4.3.4 (Debian 4.3.4-3)
-configure:3700: $? = 0
-configure:3689: i486-linux-gnu-gcc -V >&5
-i486-linux-gnu-gcc: '-V' option must have argument
-configure:3700: $? = 1
-configure:3689: i486-linux-gnu-gcc -qversion >&5
-i486-linux-gnu-gcc: unrecognized option '-qversion'
-i486-linux-gnu-gcc: no input files
-configure:3700: $? = 1
-configure:3722: checking for C compiler default output file name
-configure:3744: i486-linux-gnu-gcc -g -O2 conftest.c >&5
-
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-
-ac_cv_env_CC_set=
-ac_cv_env_CC_value=
-ac_cv_env_CFLAGS_set=set
-ac_cv_env_CFLAGS_value='-g -O2'
-ac_cv_env_CPPFLAGS_set=set
-ac_cv_env_CPPFLAGS_value=
-ac_cv_env_CPP_set=
-ac_cv_env_CPP_value=
-ac_cv_env_LDFLAGS_set=set
-ac_cv_env_LDFLAGS_value=
-ac_cv_env_LIBS_set=
-ac_cv_env_LIBS_value=
-ac_cv_env_build_alias_set=set
-ac_cv_env_build_alias_value=i486-linux-gnu
-ac_cv_env_host_alias_set=set
-ac_cv_env_host_alias_value=i486-linux-gnu
-ac_cv_env_target_alias_set=
-ac_cv_env_target_alias_value=
-ac_cv_path_install='/usr/bin/install -c'
-ac_cv_path_mkdir=/bin/mkdir
-ac_cv_prog_AWK=gawk
-ac_cv_prog_CC=i486-linux-gnu-gcc
-ac_cv_prog_make_make_set=yes
-
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-
-ACLOCAL='${SHELL} /home/rlb/deb/guile/1.6/sid/missing --run aclocal-1.11'
-ALLOCA=''
-AMDEPBACKSLASH=''
-AMDEP_FALSE=''
-AMDEP_TRUE=''
-AMTAR='${SHELL} /home/rlb/deb/guile/1.6/sid/missing --run tar'
-AR=''
-ARGZ_H=''
-AUTOCONF='${SHELL} /home/rlb/deb/guile/1.6/sid/missing --run autoconf'
-AUTOHEADER='${SHELL} /home/rlb/deb/guile/1.6/sid/missing --run autoheader'
-AUTOMAKE='${SHELL} /home/rlb/deb/guile/1.6/sid/missing --run automake-1.11'
-AWK='gawk'
-CC='i486-linux-gnu-gcc'
-CCDEPMODE=''
-CFLAGS='-g -O2'
-CONVENIENCE_LTDL_FALSE=''
-CONVENIENCE_LTDL_TRUE=''
-CPP=''
-CPPFLAGS=''
-CYGPATH_W='echo'
-DEFS=''
-DEPDIR=''
-DLPREOPEN=''
-DSYMUTIL=''
-DUMPBIN=''
-ECHO_C=''
-ECHO_N='-n'
-ECHO_T=''
-EGREP=''
-EXEEXT=''
-EXTRA_DOT_DOC_FILES=''
-EXTRA_DOT_X_FILES=''
-FGREP=''
-GREP=''
-GUILE_EFFECTIVE_VERSION='1.6'
-GUILE_LIBS=''
-GUILE_MAJOR_VERSION='1'
-GUILE_MICRO_VERSION='8'
-GUILE_MINOR_VERSION='6'
-GUILE_VERSION='1.6.8'
-HAVE_MAKEINFO_FALSE=''
-HAVE_MAKEINFO_TRUE=''
-HAVE_SOCKLEN_T=''
-INCLTDL=''
-INSTALL_DATA='${INSTALL} -m 644'
-INSTALL_LTDL_FALSE=''
-INSTALL_LTDL_TRUE=''
-INSTALL_PROGRAM='${INSTALL}'
-INSTALL_SCRIPT='${INSTALL}'
-INSTALL_STRIP_PROGRAM='$(install_sh) -c -s'
-LD=''
-LDFLAGS=''
-LIBADD_DL=''
-LIBADD_DLD_LINK=''
-LIBADD_DLOPEN=''
-LIBADD_SHL_LOAD=''
-LIBGUILE_INTERFACE='15:1:3'
-LIBGUILE_INTERFACE_AGE='3'
-LIBGUILE_INTERFACE_CURRENT='15'
-LIBGUILE_INTERFACE_REVISION='1'
-LIBGUILE_SRFI_SRFI_13_14_INTERFACE='1:1:0'
-LIBGUILE_SRFI_SRFI_13_14_INTERFACE_AGE='0'
-LIBGUILE_SRFI_SRFI_13_14_INTERFACE_CURRENT='1'
-LIBGUILE_SRFI_SRFI_13_14_INTERFACE_REVISION='1'
-LIBGUILE_SRFI_SRFI_13_14_MAJOR='1'
-LIBGUILE_SRFI_SRFI_4_INTERFACE='1:1:0'
-LIBGUILE_SRFI_SRFI_4_INTERFACE_AGE='0'
-LIBGUILE_SRFI_SRFI_4_INTERFACE_CURRENT='1'
-LIBGUILE_SRFI_SRFI_4_INTERFACE_REVISION='1'
-LIBGUILE_SRFI_SRFI_4_MAJOR='1'
-LIBLOBJS=''
-LIBLTDL=''
-LIBOBJS=''
-LIBQTHREADS_INTERFACE='15:1:3'
-LIBQTHREADS_INTERFACE_AGE='3'
-LIBQTHREADS_INTERFACE_CURRENT='15'
-LIBQTHREADS_INTERFACE_REVISION='1'
-LIBS=''
-LIBTOOL=''
-LIPO=''
-LN_S=''
-LTDLDEPS=''
-LTDLINCL=''
-LTDLOPEN=''
-LTLIBOBJS=''
-LT_CONFIG_H=''
-LT_DLLOADERS=''
-LT_DLPREOPEN=''
-MAINT='#'
-MAINTAINER_MODE_FALSE=''
-MAINTAINER_MODE_TRUE='#'
-MAKEINFO='${SHELL} /home/rlb/deb/guile/1.6/sid/missing --run makeinfo'
-MKDIR_P='/bin/mkdir -p'
-NM=''
-NMEDIT=''
-OBJDUMP=''
-OBJEXT=''
-OTOOL64=''
-OTOOL=''
-PACKAGE='guile'
-PACKAGE_BUGREPORT=''
-PACKAGE_NAME=''
-PACKAGE_STRING=''
-PACKAGE_TARNAME=''
-PACKAGE_URL=''
-PACKAGE_VERSION=''
-PATH_SEPARATOR=':'
-QTHREAD_LTLIBS=''
-RANLIB=''
-SED=''
-SET_MAKE=''
-SHELL='/bin/sh'
-STRIP=''
-THREAD_LIBS_INSTALLED=''
-THREAD_LIBS_LOCAL=''
-THREAD_PACKAGE=''
-VERSION='1.6.8'
-ac_ct_CC=''
-ac_ct_DUMPBIN=''
-am__EXEEXT_FALSE=''
-am__EXEEXT_TRUE=''
-am__fastdepCC_FALSE=''
-am__fastdepCC_TRUE=''
-am__include=''
-am__isrc=''
-am__leading_dot='.'
-am__quote=''
-am__tar='${AMTAR} chof - "$$tardir"'
-am__untar='${AMTAR} xf -'
-bindir='${exec_prefix}/bin'
-build='i486-linux-gnu'
-build_alias='i486-linux-gnu'
-build_cpu=''
-build_os=''
-build_vendor=''
-datadir='${datarootdir}'
-datarootdir='${prefix}/share'
-docdir='${datarootdir}/doc/${PACKAGE}'
-dvidir='${docdir}'
-exec_prefix='NONE'
-have_makeinfo=''
-host='i486-linux-gnu'
-host_alias='i486-linux-gnu'
-host_cpu=''
-host_os=''
-host_vendor=''
-htmldir='${docdir}'
-includedir='${prefix}/include'
-infodir='${datarootdir}/info'
-install_sh='${SHELL} /home/rlb/deb/guile/1.6/sid/install-sh'
-libdir='${exec_prefix}/lib'
-libexecdir='${exec_prefix}/libexec'
-localedir='${datarootdir}/locale'
-localstatedir='${prefix}/var'
-lt_ECHO='echo'
-ltdl_LIBOBJS=''
-ltdl_LTLIBOBJS=''
-mandir='${datarootdir}/man'
-mkdir_p='/bin/mkdir -p'
-oldincludedir='/usr/include'
-pdfdir='${docdir}'
-prefix='/usr'
-program_transform_name='s,x,x,'
-psdir='${docdir}'
-qtdmdb_s=''
-qthread_asflags=''
-qtmd_h=''
-qtmdc_c=''
-qtmds_s=''
-sbindir='${exec_prefix}/sbin'
-sharedstatedir='${prefix}/com'
-subdirs=' guile-readline'
-sys_symbol_underscore=''
-sysconfdir='${prefix}/etc'
-target_alias=''
-top_builddir_absolute=''
-top_srcdir_absolute=''
-
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-
-/* confdefs.h */
-#define PACKAGE_NAME ""
-#define PACKAGE_TARNAME ""
-#define PACKAGE_VERSION ""
-#define PACKAGE_STRING ""
-#define PACKAGE_BUGREPORT ""
-#define PACKAGE_URL ""
-#define SCM_DEBUG_DEPRECATED 0
-#define SCM_WARN_DEPRECATED_DEFAULT "summary"
-#define DEBUG_EXTENSIONS 1
-#define READER_EXTENSIONS 1
-
-configure: caught signal 2
-configure: exit 1
diff -u guile-1.6-1.6.8/debian/changelog guile-1.6-1.6.8/debian/changelog
--- guile-1.6-1.6.8/debian/changelog
+++ guile-1.6-1.6.8/debian/changelog
@@ -1,3 +1,14 @@
+guile-1.6 (1.6.8-10.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS (Closes: #621985). Thanks Philippe De Swert for patch.
+ - Set debian compat to 7
+ - Bump standards version to 3.8.4
+ - Various cleanups on debian rules
+ * Empty the dependency_libs field in .la files (Closes: #633331)
+
+ -- Hector Oron <zu...@debian.org> Wed, 22 Feb 2012 00:48:37 +0000
+
guile-1.6 (1.6.8-10) unstable; urgency=low
* Move the _GNU_SOURCE define to the top of stime.c so that it actually
diff -u guile-1.6-1.6.8/debian/rules guile-1.6-1.6.8/debian/rules
--- guile-1.6-1.6.8/debian/rules
+++ guile-1.6-1.6.8/debian/rules
@@ -14,12 +14,7 @@
upstream_archive_dir := guile-1.6.8
# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-export DH_COMPAT := 4
+# export DH_VERBOSE=1
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
@@ -283,19 +278,17 @@
dh_installman
# dh_installcron
dh_installinfo
- # handle http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=337215
- perl -wpi -e 's/\\Q//gmo; s/\\E//gmo' \
- debian/guile-1.6-doc.postinst.debhelper
- dh_strip
dh_link
+ dh_strip
dh_compress
dh_fixperms
dh_makeshlibs
- dh_installdeb
# dh_perl
dh_shlibdeps
+ dh_installdeb
dh_gencontrol
dh_md5sums
+ sed -i "/dependency_libs/ s/'.*'/''/" `find $(CURDIR)/debian/ -name '*.la'`
dh_builddeb
# Build architecture independant packages using the common target.
diff -u guile-1.6-1.6.8/debian/control guile-1.6-1.6.8/debian/control
--- guile-1.6-1.6.8/debian/control
+++ guile-1.6-1.6.8/debian/control
@@ -2,9 +2,9 @@
Section: interpreters
Priority: optional
Maintainer: Rob Browning <r...@defaultvalue.org>
-Build-Depends: libtool, debhelper (>= 4), libncurses5-dev, libreadline6-dev, libltdl-dev (>= 2.2.6b-1), quilt
+Build-Depends: libtool, debhelper (>= 4), libncurses5-dev, libreadline6-dev, libltdl-dev (>= 2.2.6b), quilt
Build-Conflicts: ash (<= 0.3.8-31), slib (<< 3a2-3)
-Standards-Version: 3.2.1.0
+Standards-Version: 3.8.4
Package: guile-1.6
Section: lisp
diff -u guile-1.6-1.6.8/debian/patches/series guile-1.6-1.6.8/debian/patches/series
--- guile-1.6-1.6.8/debian/patches/series
+++ guile-1.6-1.6.8/debian/patches/series
@@ -6,0 +7 @@
+guile-snarf-fix.diff
diff -u guile-1.6-1.6.8/debian/patches/use-system-libltdl.diff guile-1.6-1.6.8/debian/patches/use-system-libltdl.diff
--- guile-1.6-1.6.8/debian/patches/use-system-libltdl.diff
+++ guile-1.6-1.6.8/debian/patches/use-system-libltdl.diff
@@ -53,0 +54,12 @@
+@@ -88,8 +88,8 @@
+ {
+ #ifdef DYNAMIC_LINKING
+ /* libtool automagically inserts this variable into your executable... */
+- extern const scm_lt_dlsymlist lt_preloaded_symbols[];
+- scm_lt_dlpreload_default (lt_preloaded_symbols);
++ extern const lt_dlsymlist lt_preloaded_symbols[];
++ lt_dlpreload_default (lt_preloaded_symbols);
+ #endif
+ scm_boot_guile (argc, argv, inner_main, 0);
+ return 0; /* never reached */
+
only in patch2:
unchanged:
--- guile-1.6-1.6.8.orig/debian/compat
+++ guile-1.6-1.6.8/debian/compat
@@ -0,0 +1 @@
+7
only in patch2:
unchanged:
--- guile-1.6-1.6.8.orig/debian/patches/guile-snarf-fix.diff
+++ guile-1.6-1.6.8/debian/patches/guile-snarf-fix.diff
@@ -0,0 +1,8 @@
+--- a/libguile/guile-snarf-docs.in.orig 2011-06-02 11:49:24.423491408 +0300
++++ b/libguile/guile-snarf-docs.in 2011-06-02 11:49:26.174492567 +0300
+@@ -23,4 +23,4 @@
+ ## Let the user override the preprocessor autoconf found.
+ test -n "${CPP+set}" || CPP="@CPP@"
+
+-${CPP} -DSCM_MAGIC_SNARF_DOCS "$@"
++${CPP} -P -DSCM_MAGIC_SNARF_DOCS "$@"
