tag 444501 patch pending thanks Lucas Nussbaum <[EMAIL PROTECTED]> (29/09/2007): > Justification: FTBFS on i386
Hi. Please find attached the patch for my NMU, uploaded to DELAYED/5. Cheers, -- Cyril Brulebois
diff -u xlog-1.5/debian/changelog xlog-1.5/debian/changelog --- xlog-1.5/debian/changelog +++ xlog-1.5/debian/changelog @@ -1,3 +1,16 @@ +xlog (1.5-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Enable compatibility mode by removing the â-DGTK_DISABLE_DEPRECATEDâ macro + from src/Makefile.{am,in} to solve FTBFS with Gtk 2.12 (Closes: #444501). + * Move the menu file from âApps/Hamradioâ to âApplications/Amateur Radioâ, + due to the menu transition. + * Move the âCategoriesâ of the desktop file from âApplication;HamRadioâ to + âAudio;HamRadio;â, per lintian. + * No longer ignore âmake distcleanâ errors, per lintian. + + -- Cyril Brulebois <[EMAIL PROTECTED]> Mon, 08 Oct 2007 23:39:04 +0200 + xlog (1.5-1) unstable; urgency=low * New upstream release. diff -u xlog-1.5/debian/menu xlog-1.5/debian/menu --- xlog-1.5/debian/menu +++ xlog-1.5/debian/menu @@ -1,4 +1,4 @@ -?package(xlog):needs="X11" section="Apps/Hamradio" \ +?package(xlog):needs="X11" section="Applications/Amateur Radio" \ title="Xlog" command="/usr/bin/xlog" \ icon="/usr/share/pixmaps/xlog/mini-xlog.xpm" \ longtitle="Xlog: Amateur Radio logging program" diff -u xlog-1.5/debian/rules xlog-1.5/debian/rules --- xlog-1.5/debian/rules +++ xlog-1.5/debian/rules @@ -46,7 +46,7 @@ rm -f build-stamp debian/substvars config.log # Add here commands to clean up after the build process. - -$(MAKE) distclean + [ ! -f Makefile ] || $(MAKE) distclean ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub endif only in patch2: unchanged: --- xlog-1.5.orig/config.sub +++ xlog-1.5/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2006-09-20' +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 @@ -245,12 +245,12 @@ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore \ + | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -324,7 +324,7 @@ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ @@ -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 ;; @@ -925,6 +929,9 @@ basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -1219,7 +1226,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1414,6 +1421,9 @@ m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; only in patch2: unchanged: --- xlog-1.5.orig/data/desktop/xlog.desktop +++ xlog-1.5/data/desktop/xlog.desktop @@ -8,5 +8,5 @@ Icon=xlog-icon.png Terminal=false Type=Application -Categories=Application;HamRadio; +Categories=Audio;HamRadio; MimeType=text/x-xlog only in patch2: unchanged: --- xlog-1.5.orig/src/Makefile.am +++ xlog-1.5/src/Makefile.am @@ -8,7 +8,6 @@ -DG_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \ -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ -DDATADIR=\""$(datadir)"\" \ -DXLOG_LOCALEDIR=\""$(datadir)/locale"\" \ -DXLOG_DATADIR=\""$(datadir)/xlog"\" only in patch2: unchanged: --- xlog-1.5.orig/src/Makefile.in +++ xlog-1.5/src/Makefile.in @@ -231,7 +231,6 @@ -DG_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \ -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ -DDATADIR=\""$(datadir)"\" \ -DXLOG_LOCALEDIR=\""$(datadir)/locale"\" \ -DXLOG_DATADIR=\""$(datadir)/xlog"\" only in patch2: unchanged: --- xlog-1.5.orig/config.guess +++ xlog-1.5/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2006-07-02' +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 @@ -161,6 +161,7 @@ arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -329,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*:*) @@ -780,7 +781,7 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - i*:MINGW*:*) + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -790,12 +791,15 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[3456]*) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T:Interix*:[3456]*) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -950,6 +954,9 @@ x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; + xtensa:Linux:*:*) + echo xtensa-unknown-linux-gnu + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -1208,6 +1215,15 @@ SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;;
pgpi01K7oZIEU.pgp
Description: PGP signature