--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package gforth
FTBS bug. #672616
Diff attached either now or later
unblock gforth/0.7.0+ds1-7
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 3.2.0-1-686-pae (SMP w/1 CPU core)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru gforth-0.7.0+ds1/debian/changelog gforth-0.7.0+ds1/debian/changelog
--- gforth-0.7.0+ds1/debian/changelog 2011-07-18 15:51:23.000000000 +0100
+++ gforth-0.7.0+ds1/debian/changelog 2012-09-06 13:23:58.000000000 +0100
@@ -1,3 +1,14 @@
+gforth (0.7.0+ds1-7) unstable; urgency=low
+
+ * Apply an upstream patch to fix a FTBFS; Closes: #672616
+ - add the 11-static-newline patch to define the system newline
+ string as static
+ - temporarily build-depend on the GForth interpreter to be able to
+ rebuild the kernel images properly after applying the patch
+ - stash and restore the generated files affected by the patch
+
+ -- Peter Pentchev <roam@ringlet.net> Tue, 04 Sep 2012 17:52:59 +0300
+
gforth (0.7.0+ds1-6) unstable; urgency=low
* Fix the watch file syntax so the +ds1 part is properly stripped off.
diff -Nru gforth-0.7.0+ds1/debian/control gforth-0.7.0+ds1/debian/control
--- gforth-0.7.0+ds1/debian/control 2011-07-12 13:47:13.000000000 +0100
+++ gforth-0.7.0+ds1/debian/control 2012-09-04 14:00:05.000000000 +0100
@@ -4,7 +4,7 @@
Maintainer: Peter Pentchev <roam@ringlet.net>
Build-Depends: debhelper (>= 8.1.3~), autoconf, automake,
autotools-dev (>= 20100122.1), dpkg-dev (>= 1.15.7~),
- libffcall1-dev, libtool, libltdl-dev
+ gforth, libffcall1-dev, libtool, libltdl-dev
Standards-Version: 3.9.2
Homepage: http://www.complang.tuwien.ac.at/projects/forth.html
Vcs-Git: git://gitorious.org/gforth/pkg-debian.git
diff -Nru gforth-0.7.0+ds1/debian/patches/11-static-newline.patch gforth-0.7.0+ds1/debian/patches/11-static-newline.patch
--- gforth-0.7.0+ds1/debian/patches/11-static-newline.patch 1970-01-01 01:00:00.000000000 +0100
+++ gforth-0.7.0+ds1/debian/patches/11-static-newline.patch 2012-09-04 14:39:49.000000000 +0100
@@ -0,0 +1,17 @@
+Description: Define the system newline string as static.
+Bug-Debian: http://bugs.debian.org/672616
+Origin: upstream; http://www.complang.tuwien.ac.at/viewcvs/cgi-bin/viewcvs.cgi/gforth/prim?sortby=date&r1=1.270&r2=1.271
+Author: Andrew Haley <aph@redhat.com>
+Last-Update: 2012-09-04
+
+--- a/prim
++++ b/prim
+@@ -1950,7 +1950,7 @@
+
+ newline ( -- c_addr u ) gforth
+ ""String containing the newline sequence of the host OS""
+-char newline[] = {
++static char newline[] = {
+ #if DIRSEP=='/'
+ /* Unix */
+ '\n'
diff -Nru gforth-0.7.0+ds1/debian/patches/series gforth-0.7.0+ds1/debian/patches/series
--- gforth-0.7.0+ds1/debian/patches/series 2011-07-11 14:49:38.000000000 +0100
+++ gforth-0.7.0+ds1/debian/patches/series 2012-08-27 11:46:23.000000000 +0100
@@ -8,3 +8,4 @@
08-qrnnd-build.patch
09-elisp-auto-mode.patch
10-engine-subst.patch
+11-static-newline.patch
diff -Nru gforth-0.7.0+ds1/debian/rules gforth-0.7.0+ds1/debian/rules
--- gforth-0.7.0+ds1/debian/rules 2011-07-12 12:59:45.000000000 +0100
+++ gforth-0.7.0+ds1/debian/rules 2012-09-04 15:50:05.000000000 +0100
@@ -29,6 +29,8 @@
save-dir=frog$(shellout)
override_dh_auto_configure:
+ [ -f prim.b.backup ] || cp -p prim.b prim.b.backup
+ [ -f engine/prim.i.backup ] || cp -p engine/prim.i engine/prim.i.backup
ifeq ($(save-dir),frog)
install -d debian/kernl-save
cp kernl*.fi debian/kernl-save
@@ -41,6 +43,8 @@
cp debian/kernl-save/* .
rm -r debian/kernl-save
endif
+ [ ! -f prim.b.backup ] || mv prim.b.backup prim.b
+ [ ! -f engine/prim.i.backup ] || mv engine/prim.i.backup engine/prim.i
override_dh_auto_install:
touch $D/usr/lib/gforth/site-forth/site-init.fs
--- End Message ---
--- Begin Message ---
On Sat, 2012-09-22 at 20:11 +0300, Peter Pentchev wrote:
> On Sat, Sep 22, 2012 at 05:55:29PM +0100, Adam D. Barratt wrote:
> > On Sat, 2012-09-22 at 17:22 +0300, Peter Pentchev wrote:
> > > Please unblock package gforth-0.7.0+ds1-7. It fixes an RC FTBFS
> > > (#672616) with a minimal change and the addition of a somewhat weird
> > > dependency on itself needed for bootstrapping, which will hopefully go
> > > away with the next upstream version (this way of fixing the bug was
> > > proposed by the upstream author in the bug discussion).
> >
> > This looks the same as #687329?
>
> Oof, of course you're right! Thanks!
Unblocked.
Regards,
Adam
--- End Message ---