tags 607396 + pending tags 625068 + pending thanks Dear maintainer,
I've prepared an NMU for liborigin (versioned as 20080225-2.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key ID: 0x8649AA06 : :' : Debian GNU/Linux user, admin, & developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe `- NP: Roy Orbison
diff -u liborigin-20080225/debian/changelog liborigin-20080225/debian/changelog --- liborigin-20080225/debian/changelog +++ liborigin-20080225/debian/changelog @@ -1,3 +1,19 @@ +liborigin (20080225-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "FTBFS with linker flag --as-needed" and "FTBFS: tree.hh:138:21: + error: 'ptrdiff_t' does not name a type": Apply patches from Ubuntu: + + [ Stefan Potyra ] + * debian/patches/02_makefile_as_needed.patch: Adjust link order in Makefile + to fix a FTBFS with --as-needed linker flag (closes: #607396). + + [ Colin Watson ] + * debian/patches/cstddef.patch: Include <cstddef> for ptrdiff_t + (closes: #625068, LP: #771110). + + -- gregor herrmann <gre...@debian.org> Fri, 07 Oct 2011 13:58:38 +0200 + liborigin (20080225-2) unstable; urgency=low * Use versioned conflicts for labplot. (Closes: #469047) diff -u liborigin-20080225/debian/patches/series liborigin-20080225/debian/patches/series --- liborigin-20080225/debian/patches/series +++ liborigin-20080225/debian/patches/series @@ -1,0 +2,2 @@ +02_makefile_as_needed.patch +03_cstddef.patch only in patch2: unchanged: --- liborigin-20080225.orig/debian/patches/03_cstddef.patch +++ liborigin-20080225/debian/patches/03_cstddef.patch @@ -0,0 +1,20 @@ +Description: Include <cstddef> for ptrdiff_t + G++ 4.6 is stricter about header namespacing. +Author: Colin Watson <cjwat...@ubuntu.com> +Bug-Debian: http://bugs.debian.org/625068 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/771110 +Forwarded: no +Last-Update: 2011-09-13 + +Index: b/tree.hh +=================================================================== +--- a/tree.hh ++++ b/tree.hh +@@ -67,6 +67,7 @@ + #include <set> + #include <queue> + #include <iostream> ++#include <cstddef> + + // HP-style construct/destroy have gone from the standard, + // so here is a copy. only in patch2: unchanged: --- liborigin-20080225.orig/debian/patches/02_makefile_as_needed.patch +++ liborigin-20080225/debian/patches/02_makefile_as_needed.patch @@ -0,0 +1,13 @@ +Index: liborigin-20080225/Makefile.LINUX +=================================================================== +--- liborigin-20080225.orig/Makefile.LINUX 2010-12-17 22:07:51.030175732 +0100 ++++ liborigin-20080225/Makefile.LINUX 2010-12-17 22:08:03.970175732 +0100 +@@ -23,7 +23,7 @@ + ln -sf $(TARGET3) $(TARGET2)) + + $(OPJ2DAT): $(OPJ2DAT).cpp +- $(CC) $(CFLAGS) -L lib/ -o $(OPJ2DAT) -lorigin $(OPJ2DAT).cpp ++ $(CC) $(CFLAGS) -L lib/ -o $(OPJ2DAT) $(OPJ2DAT).cpp -lorigin + + clean : + rm -f *~ *.o $(OPJ2DAT) $(TARGET0)*
signature.asc
Description: Digital signature
