[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#688409: marked as done (unblock: gforth/0.7.0+ds1-7)

Your message dated Sun, 23 Sep 2012 21:09:16 +0100
with message-id <1348430956.21568.42.camel@jacala.jungle.funky-badger.org>
and subject line Re: Bug#688409: unblock: gforth/0.7.0+ds1-7
has caused the Debian Bug report #688409,
regarding unblock: gforth/0.7.0+ds1-7
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
688409: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=688409
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

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).

Attached is a debdiff from -6 to -7.

unblock gforth/0.7.0+ds1-7

-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'stable')
Architecture: i386 (i686)

Kernel: Linux 3.2.0-3-686-pae (SMP w/4 CPU cores)
Locale: LANG=bg_BG.UTF-8, LC_CTYPE=bg_BG.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 17:51:23.000000000 +0300
+++ gforth-0.7.0+ds1/debian/changelog	2012-09-06 15:23:58.000000000 +0300
@@ -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 15:47:13.000000000 +0300
+++ gforth-0.7.0+ds1/debian/control	2012-09-04 16:00:05.000000000 +0300
@@ -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 02:00:00.000000000 +0200
+++ gforth-0.7.0+ds1/debian/patches/11-static-newline.patch	2012-09-04 16:39:49.000000000 +0300
@@ -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 16:49:38.000000000 +0300
+++ gforth-0.7.0+ds1/debian/patches/series	2012-08-27 13:46:23.000000000 +0300
@@ -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 14:59:45.000000000 +0300
+++ gforth-0.7.0+ds1/debian/rules	2012-09-04 17:50:05.000000000 +0300
@@ -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

Attachment: signature.asc
Description: Digital signature


--- 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 ---
Reply to: