--- Begin Message ---
Package: guile-1.8
Version: 1.8.7+1-3.1
Severity: normal
Tags: patch
Hi Rob!
As you've seen, I did it again; sorry for the lack of pre-notice, I did
upload to DELAYED/0-day as advised on IRC, and also new the package would
get stuck in NEW due to the new binary, but all went wrong: when I woke up
it was both out of delayed and new, so *shrug*.
Changelog is self explanatory. I just intended to fix the FTBFS, but got
caught by the BTS and went a bit farther.
THanks,
Jordi
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.38-2-amd64 (SMP w/2 CPU cores)
Locale: LANG=ca_ES.UTF-8@valencia, LC_CTYPE=ca_ES.UTF-8@valencia (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages guile-1.8 depends on:
ii guile-1.8-libs 1.8.7+1-3.1 Main Guile libraries
ii libc6 2.11.2-13 Embedded GNU C Library: Shared lib
ii libgmp10 2:5.0.1+dfsg-7 Multiprecision arithmetic library
ii libltdl7 2.4-2 A system independent dlopen wrappe
guile-1.8 recommends no packages.
Versions of packages guile-1.8 suggests:
pn guile-1.8-doc <none> (no description available)
-- no debconf information
diff -u guile-1.8-1.8.7+1/debian/guile-slib.prerm guile-1.8-1.8.7+1/debian/guile-slib.prerm
--- guile-1.8-1.8.7+1/debian/guile-slib.prerm
+++ guile-1.8-1.8.7+1/debian/guile-slib.prerm
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
set -e
diff -u guile-1.8-1.8.7+1/debian/changelog guile-1.8-1.8.7+1/debian/changelog
--- guile-1.8-1.8.7+1/debian/changelog
+++ guile-1.8-1.8.7+1/debian/changelog
@@ -1,3 +1,35 @@
+guile-1.8 (1.8.7+1-3.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Export HOME to $(CURDIR)/junkdir, to avoid build failures on buildds
+ where the homedir either doesn't exist or isn't writable.
+ * Remove obsolete bandaid (now broken) for #337215, and bump debhelper
+ requirement to 5.0.41.
+
+ -- Jordi Mallach <[email protected]> Fri, 22 Apr 2011 23:04:49 +0200
+
+guile-1.8 (1.8.7+1-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add doc_snarfing_new_gcc.patch: stolen from git; fix generation of
+ texinfo docs, accepting extra source location markers that match
+ output of recent gcc versions (closes: #616694).
+ * Tighten the dependency between guile-1.8 and guile-1.8-libs to ensure
+ they always upgrade together, avoiding crashes in apps due to version
+ mismatches (closes: #441241). Do the same for guile-1.8-dev.
+ * (Buiild-)Depend on libltdl-dev and libgmp-dev instead of the
+ transitional dummy packages.
+ * Conflict with old package guile1.4, some people still have it installed
+ (closes: #523949).
+ * Uncomment guile-1.8-slib bits from rules file, and build this package
+ again. slib support is now declared stable upstream (closes: #441110).
+ * Switch interpreter to /bin/sh for guile-1.8-slib maintainer scripts.
+ Delete obsolete debian/NOTES accordingly.
+ * Drop all .la files (wheezy release goal, closes: #621240).
+ * Add a Homepage URL.
+
+ -- Jordi Mallach <[email protected]> Fri, 22 Apr 2011 00:53:35 +0200
+
guile-1.8 (1.8.7+1-3) unstable; urgency=low
* Change debian/control sections to lisp to match Debian distribution
reverted:
--- guile-1.8-1.8.7+1/debian/NOTES
+++ guile-1.8-1.8.7+1.orig/debian/NOTES
@@ -1,13 +0,0 @@
-
-This is the control file entry which will be used once Guile 1.8 and
-SLIB are compatible.
-
-Package: guile-1.8-slib
-Section: devel
-Architecture: all
-Depends: guile-1.8, slib (>= 3a2-3)
-Description: Guile SLIB support
- SLIB is a portable scheme library meant to provide compatibility and
- utility functions for all standard scheme implementations. Once this
- package is installed SLIB should be available within Guile via
- (use-modules (ice-9 slib)).
diff -u guile-1.8-1.8.7+1/debian/guile-dev.install guile-1.8-1.8.7+1/debian/guile-dev.install
--- guile-1.8-1.8.7+1/debian/guile-dev.install
+++ guile-1.8-1.8.7+1/debian/guile-dev.install
@@ -4,7 +4,6 @@
debian/tmp/usr/include/*
debian/tmp/usr/lib/*.a
debian/tmp/usr/lib/*.so
-debian/tmp/usr/lib/libguile.la
debian/tmp/usr/lib/pkgconfig/guile-@[email protected]
debian/tmp/usr/share/aclocal/guile.m4
debian/tmp/usr/share/guile/*/scripts/*
diff -u guile-1.8-1.8.7+1/debian/rules guile-1.8-1.8.7+1/debian/rules
--- guile-1.8-1.8.7+1/debian/rules
+++ guile-1.8-1.8.7+1/debian/rules
@@ -85,6 +85,10 @@
INSTALL_PROGRAM += -s
endif
+# Work-around for upstream rules that try to use $(HOME), which should
+# never be touched during the package build.
+export HOME=$(CURDIR)/junkhome
+
configure_args = \
--host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
@@ -264,25 +268,25 @@
.PHONY: update-debhelper-files
update-debhelper-files:
- # guile
+ # guile
$(call deb_sub,guile.install,$(deb_pkg_basename).install)
$(call deb_sub,guile.menu,$(deb_pkg_basename).menu)
$(call deb_sub,guile.postinst,$(deb_pkg_basename).postinst)
$(call deb_sub,guile.prerm,$(deb_pkg_basename).prerm)
$(call deb_sub,guile.undocumented,$(deb_pkg_basename).undocumented)
- # guile-dev
+ # guile-dev
$(call deb_sub,guile-dev.install,$(deb_pkg_basename)-dev.install)
$(call deb_sub,guile-dev.lintian,$(deb_pkg_basename)-dev.lintian)
- # guile-doc
+ # guile-doc
$(call deb_sub,guile-doc.info,$(deb_pkg_basename)-doc.info)
$(call deb_sub,guile-doc.install,$(deb_pkg_basename)-doc.install)
- # guile-libs
+ # guile-libs
$(call deb_sub,guile-libs.README,$(deb_pkg_basename)-libs.README.Debian)
$(call deb_sub,guile-libs.install,$(deb_pkg_basename)-libs.install)
$(call deb_sub,guile-libs.lintian,$(deb_pkg_basename)-libs.lintian)
-# # guile-slib
-# $(call deb_sub,guile-slib.postinst,$(deb_pkg_basename)-slib.postinst)
-# $(call deb_sub,guile-slib.prerm,$(deb_pkg_basename)-slib.prerm)
+ # guile-slib
+ $(call deb_sub,guile-slib.postinst,$(deb_pkg_basename)-slib.postinst)
+ $(call deb_sub,guile-slib.prerm,$(deb_pkg_basename)-slib.prerm)
deb_trash += debian/$(deb_pkg_basename).install
deb_trash += debian/$(deb_pkg_basename).menu
@@ -296,8 +300,8 @@
deb_trash += debian/$(deb_pkg_basename)-libs.README.Debian
deb_trash += debian/$(deb_pkg_basename)-libs.install
deb_trash += debian/$(deb_pkg_basename)-libs.lintian
-#deb_trash += debian/$(deb_pkg_basename)-slib.postinst
-#deb_trash += debian/$(deb_pkg_basename)-slib.prerm
+deb_trash += debian/$(deb_pkg_basename)-slib.postinst
+deb_trash += debian/$(deb_pkg_basename)-slib.prerm
debian/stamp/config: debian/stamp/patch
CFLAGS="$(deb_cflags)" ./configure ${configure_args}
@@ -337,7 +341,10 @@
debian/$(deb_pkg_basename)-libs.lintian \
debian/tmp/usr/share/lintian/overrides/$(deb_pkg_basename)-libs
- # Ignore gds files for the moment.
+ # Remove unneeded .la files.
+ rm -f debian/tmp/usr/lib/libguile*.la
+
+ # Ignore gds files for the moment.
dh_install --fail-missing \
-Xusr/share/info/dir \
-Xusr/share/info/r5rs.info \
@@ -355,10 +362,10 @@
cd debian/$(deb_pkg_basename)/usr/bin/ \
&& mv guile guile-$(deb_src_eff_ver)
-# mkdir -p \
-# debian/$(deb_pkg_basename)-slib/usr/share/guile/$(deb_src_eff_ver)
-# cd debian/$(deb_pkg_basename)-slib/usr/share/guile/$(deb_src_eff_ver) \
-# && ln -s ../../slib .
+ mkdir -p \
+ debian/$(deb_pkg_basename)-slib/usr/share/guile/$(deb_src_eff_ver)
+ cd debian/$(deb_pkg_basename)-slib/usr/share/guile/$(deb_src_eff_ver) \
+ && ln -s ../../slib .
deb_trash += NEWS.gz
@@ -382,9 +389,6 @@
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.8-doc.postinst.debhelper
dh_strip
dh_link
dh_compress
diff -u guile-1.8-1.8.7+1/debian/guile-slib.postinst guile-1.8-1.8.7+1/debian/guile-slib.postinst
--- guile-1.8-1.8.7+1/debian/guile-slib.postinst
+++ guile-1.8-1.8.7+1/debian/guile-slib.postinst
@@ -1,8 +1,8 @@
-#!/bin/bash
+#!/bin/sh
set -e
-/usr/bin/guile-@DEB_SRC_EFF_VER@ \
+guile-@DEB_SRC_EFF_VER@ \
-c "(use-modules (ice-9 slib)) (require 'new-catalog)"
#DEBHELPER#
diff -u guile-1.8-1.8.7+1/debian/control guile-1.8-1.8.7+1/debian/control
--- guile-1.8-1.8.7+1/debian/control
+++ guile-1.8-1.8.7+1/debian/control
@@ -2,16 +2,17 @@
Section: interpreters
Priority: optional
Maintainer: Rob Browning <[email protected]>
-Build-Depends: libtool, debhelper (>= 5), quilt, libncurses5-dev, libreadline6-dev, libltdl3-dev, libgmp3-dev, texinfo
+Build-Depends: libtool, debhelper (>= 5.0.41~), quilt, libncurses5-dev, libreadline6-dev, libltdl-dev, libgmp-dev, texinfo
Build-Conflicts: ash (<= 0.3.8-31)
Standards-Version: 3.7.2
+Homepage: http://www.gnu.org/s/guile/
Package: guile-1.8
Section: lisp
Architecture: any
Provides: guile
-Conflicts: libguile-dev (<= 1:1.4-24)
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libguile-dev (<= 1:1.4-24), guile1.4
+Depends: guile-1.8-libs (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Suggests: guile-1.8-doc
Description: The GNU extension language and Scheme interpreter
Guile is a Scheme implementation designed for real world programming,
@@ -25,7 +26,7 @@
Architecture: any
Provides: libguile-dev
Conflicts: libguile-dev, guile-1.6 (<< 1.6.8-5)
-Depends: ${shlibs:Depends}, guile-1.8, libc6-dev, libncurses5-dev, libreadline6-dev, libltdl3-dev, libgmp3-dev, ${misc:Depends}
+Depends: ${shlibs:Depends}, guile-1.8 (= ${binary:Version}), libc6-dev, libncurses5-dev, libreadline6-dev, libltdl-dev, libgmp-dev, ${misc:Depends}
Description: Development files for Guile 1.8
This package contains files needed for development using Guile 1.8.
.
@@ -64,0 +66,11 @@
+
+Package: guile-1.8-slib
+Section: lisp
+Architecture: all
+Depends: guile-1.8, slib (>= 3a2-3), ${misc:Depends}
+Description: Guile SLIB support
+ SLIB is a portable scheme library meant to provide compatibility and
+ utility functions for all standard scheme implementations. Once this
+ package is installed SLIB should be available within Guile via
+ (use-modules (ice-9 slib)).
+
diff -u guile-1.8-1.8.7+1/debian/guile-libs.install guile-1.8-1.8.7+1/debian/guile-libs.install
--- guile-1.8-1.8.7+1/debian/guile-libs.install
+++ guile-1.8-1.8.7+1/debian/guile-libs.install
@@ -1,7 +1,5 @@
debian/tmp/usr/lib/libguile-srfi*.so.*
-debian/tmp/usr/lib/libguile-srfi-*.la
debian/tmp/usr/lib/libguile.so.*
-debian/tmp/usr/lib/libguilereadline-*.la
debian/tmp/usr/lib/libguilereadline-*.so.*
debian/tmp/usr/share/guile/@DEB_SRC_EFF_VER@/guile-procedures.txt
debian/tmp/usr/share/guile/@DEB_SRC_EFF_VER@/ice-9/*
diff -u guile-1.8-1.8.7+1/debian/patches/series guile-1.8-1.8.7+1/debian/patches/series
--- guile-1.8-1.8.7+1/debian/patches/series
+++ guile-1.8-1.8.7+1/debian/patches/series
@@ -6,2 +6,3 @@
fix-make-check-for-new-libltdl.diff
+doc_snarfing_new_gcc.patch
autofiles.diff
only in patch2:
unchanged:
--- guile-1.8-1.8.7+1.orig/debian/patches/doc_snarfing_new_gcc.patch
+++ guile-1.8-1.8.7+1/debian/patches/doc_snarfing_new_gcc.patch
@@ -0,0 +1,39 @@
+From 445f31fc06d338f0cafda188d0287f935c2edc3c Mon Sep 17 00:00:00 2001
+From: Andy Wingo <[email protected]>
+Date: Sun, 17 Jan 2010 18:22:51 +0100
+Subject: [PATCH] fix doc snarfing with fedora 12
+
+* module/scripts/snarf-check-and-output-texi.scm
+ (process-multiline-directive): Be more accepting of source location
+ markers in the preprocessed source, by adding a couple cases in which
+ they can appear. Not foolproof, but it does adapt to what new GCCs are
+ putting out (e.g. cpp (GCC) 4.4.2 20091222 (Red Hat 4.4.2-20)).
+---
+ module/scripts/snarf-check-and-output-texi.scm | 11 +++++++++++
+ 1 files changed, 11 insertions(+), 0 deletions(-)
+
+diff --git a/scripts/snarf-check-and-output-texi b/scripts/snarf-check-and-output-texi
+index 0e7efae..f92c833 100644
+--- a/scripts/snarf-check-and-output-texi
++++ b/scripts/snarf-check-and-output-texi
+@@ -262,6 +262,17 @@
+ (set! *file* file)
+ (set! *line* line))
+
++ ;; newer gccs like to throw around more location markers into the
++ ;; preprocessed source; these (hash . hash) bits are what they translate to
++ ;; in snarfy terms.
++ (('location ('string . file) ('int . line) ('hash . 'hash))
++ (set! *file* file)
++ (set! *line* line))
++
++ (('location ('hash . 'hash) ('string . file) ('int . line) ('hash . 'hash))
++ (set! *file* file)
++ (set! *line* line))
++
+ (('arglist rest ...)
+ (set! *args* (do-arglist rest)))
+
+--
+1.7.2.5
+
--- End Message ---
