Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Control: affects -1 guile-1.6
Please unblock package guile-1.6
It fixes 2 RC bugs:
* relax-guardians-test.diff: Backport upstream changes to stop these
tests from failing. Fixes FTBFS on i386, kfreebsd-i386.
(Closes: #689687)
* Do not modify package content after calling dh_md5sums. (Closes: #688288)
unblock guile-1.6/1.6.8-10.3
Andreas
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,19 @@
+guile-1.6 (1.6.8-10.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * relax-guardians-test.diff: Backport upstream changes to stop these
+ tests from failing. Fixes FTBFS on i386, kfreebsd-i386.
+ (Closes: #689687)
+
+ -- Daniel Hartwig <mand...@gmail.com> Fri, 09 Nov 2012 15:00:16 +0800
+
+guile-1.6 (1.6.8-10.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Do not modify package content after calling dh_md5sums. (Closes: #688288)
+
+ -- Andreas Beckmann <deb...@abeckmann.de> Sat, 29 Sep 2012 20:08:15 +0200
+
guile-1.6 (1.6.8-10.1) unstable; urgency=low
* Non-maintainer upload.
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
@@ -287,8 +287,8 @@
dh_shlibdeps
dh_installdeb
dh_gencontrol
- dh_md5sums
sed -i "/dependency_libs/ s/'.*'/''/" `find $(CURDIR)/debian/ -name '*.la'`
+ dh_md5sums
dh_builddeb
# Build architecture independant packages using the common target.
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
@@ -7,0 +8 @@
+relax-guardians-test.diff
only in patch2:
unchanged:
--- guile-1.6-1.6.8.orig/debian/patches/relax-guardians-test.diff
+++ guile-1.6-1.6.8/debian/patches/relax-guardians-test.diff
@@ -0,0 +1,52 @@
+--- a/test-suite/tests/guardians.test 2012-11-08 21:42:40.109690325 +0800
++++ b/test-suite/tests/guardians.test 2012-11-08 22:42:13.185701083 +0800
+@@ -28,19 +28,21 @@
+ (gc)
+
+ (define g1 (make-guardian))
+-(define not-g1-garbage (list 'not-g1-garbage))
++(define not-g1-garbage (list (string-copy "not-g1-garbage")))
+ (g1 not-g1-garbage)
+-(g1 (list 'g1-garbage))
++(g1 (list (string-copy "g1-garbage")))
+ (pass-if "g1-garbage not collected yet" (equal? (g1) #f))
+ (gc)
+-(pass-if "g1-garbage saved" (equal? (g1) '(g1-garbage)))
++(pass-if "g1-garbage saved" (or (equal? (g1)
++ (list (string-copy "g1-garbage")))
++ (throw 'unresolved)))
+
+ ;;; Who guards the guardian?
+ (gc)
+ (define g2 (make-guardian))
+-(g2 (list 'g2-garbage))
++(g2 (list (string-copy "g2-garbage")))
+ (define g3 (make-guardian))
+-(g3 (list 'g3-garbage))
++(g3 (list (string-copy "g3-garbage")))
+ (g3 g2)
+ (pass-if "g2-garbage not collected yet" (equal? (g2) #f))
+ (pass-if "g3-garbage not collected yet" (equal? (g3) #f))
+@@ -54,12 +56,16 @@
+ (if saved
+ (begin
+ (cond
+- ((equal? saved '(g3-garbage)) (set! seen-g3-garbage #t))
++ ((equal? saved (list (string-copy "g3-garbage")))
++ (set! seen-g3-garbage #t))
+ ((procedure? saved) (set! seen-g2 saved))
+- (else (set! seen-something-else #t)))
++ (else (pk 'junk saved) (set! seen-something-else #t)))
+ (loop)))))
+- (pass-if "g3-garbage saved" seen-g3-garbage)
+- (pass-if "g2-saved" (procedure? seen-g2))
++ (pass-if "g3-garbage saved" (or seen-g3-garbage (throw 'unresolved)))
++ (pass-if "g2-saved" (or (procedure? seen-g2) (throw 'unresolved)))
+ (pass-if "nothing else saved" (not seen-something-else))
+- (pass-if "g2-garbage saved" (and (procedure? seen-g2)
+- (equal? (seen-g2) '(g2-garbage)))))
++ (pass-if "g2-garbage saved" (or (and (procedure? seen-g2)
++ (equal? (seen-g2)
++ (list (string-copy
++ "g2-garbage"))))
++ (throw 'unresolved))))
