tag 444523 patch pending thanks Lucas Nussbaum <[EMAIL PROTECTED]> (29/09/2007): > Package: ebview > version: 0.3.6-3 > Severity: serious > Justification: FTBFS on i386
Hi. Please find attached the patch for the NMU I intent to send in DELAYED/5 within a few hours. Cheers, -- Cyril Brulebois
diff -u ebview-0.3.6/config.guess ebview-0.3.6/config.guess --- ebview-0.3.6/config.guess +++ ebview-0.3.6/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2007-03-06' +timestamp='2007-07-22' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -330,7 +330,7 @@ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; - i86pc:SunOS:5.*:*) + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) @@ -793,7 +793,7 @@ exit ;; *:Interix*:[3456]*) case ${UNAME_MACHINE} in - x86) + x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; EM64T | authenticamd) diff -u ebview-0.3.6/config.sub ebview-0.3.6/config.sub --- ebview-0.3.6/config.sub +++ ebview-0.3.6/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2007-01-18' +timestamp='2007-06-28' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -475,8 +475,8 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16c) - basic_machine=cr16c-unknown + cr16) + basic_machine=cr16-unknown os=-elf ;; crds | unos) @@ -683,6 +683,10 @@ basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; diff -u ebview-0.3.6/debian/changelog ebview-0.3.6/debian/changelog --- ebview-0.3.6/debian/changelog +++ ebview-0.3.6/debian/changelog @@ -1,3 +1,14 @@ +ebview (0.3.6-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Comment the â#define GTK_DISABLE_DEPRECATED 1â line in src/ebview.c to + avoid FTBFS due to the Gtk 2.12 transition (Closes: #444523). + * Move menu section from âApps/Textâ to âApplications/Textâ, due to the menu + transition. + * No longer ignore âmake distcleanâ errors, per lintian. + + -- Cyril Brulebois <[EMAIL PROTECTED]> Tue, 09 Oct 2007 01:52:26 +0200 + ebview (0.3.6-3) unstable; urgency=low * Maintainer upload. diff -u ebview-0.3.6/debian/menu ebview-0.3.6/debian/menu --- ebview-0.3.6/debian/menu +++ ebview-0.3.6/debian/menu @@ -1,4 +1,4 @@ -?package(ebview):needs="X11" section="Apps/Text"\ +?package(ebview):needs="X11" section="Applications/Text"\ longtitle="EPWING CD-ROM dictionary viewer"\ icon="/usr/share/pixmaps/ebview.xpm"\ title="EBView" command="/usr/bin/ebview" diff -u ebview-0.3.6/debian/rules ebview-0.3.6/debian/rules --- ebview-0.3.6/debian/rules +++ ebview-0.3.6/debian/rules @@ -43,7 +43,7 @@ rm -f build-stamp configure-stamp # Add here commands to clean up after the build process. - -$(MAKE) distclean + [ ! -f Makefile ] || $(MAKE) distclean -test -r /usr/share/misc/config.sub && \ cp -f /usr/share/misc/config.sub config.sub -test -r /usr/share/misc/config.guess && \ only in patch2: unchanged: --- ebview-0.3.6.orig/src/ebview.c +++ ebview-0.3.6/src/ebview.c @@ -15,7 +15,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define GTK_DISABLE_DEPRECATED 1 +//#define GTK_DISABLE_DEPRECATED 1 #define _GLOBAL #include <signal.h>
pgpZB2QsUVXDL.pgp
Description: PGP signature