tag 444509 patch thanks Lucas Nussbaum <[EMAIL PROTECTED]> (29/09/2007): > Justification: FTBFS on i386
Hi, please find attached the patch for my NMU. Mentors, please someone checks and uploads grig with the attached debdiff, e.g. to DELAYED/5. I'm requesting it here since the IRC channel is quite quiet today. TIA. Cheers, -- Cyril Brulebois
diff -u grig-0.7.2/config.sub grig-0.7.2/config.sub
--- grig-0.7.2/config.sub
+++ grig-0.7.2/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
;;
diff -u grig-0.7.2/debian/changelog grig-0.7.2/debian/changelog
--- grig-0.7.2/debian/changelog
+++ grig-0.7.2/debian/changelog
@@ -1,3 +1,18 @@
+grig (0.7.2-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove â-DGTK_DISABLE_DEPRECATEDâ from src/Makefile.{am,in} to avoid FTBFS
+ due to the transition to Gtk 2.12 (Closes: #444514).
+ * Move the menu section from âApps/Hamradioâ to âApplications/Amateur Radioâ
+ as part of the menu transition.
+ * No longer ignore âmake distcleanâ errors, per lintian.
+ * Improve the copyright by adding the GPLv2 blurb, add a link to the exact
+ location of the license, and add copyright years.
+ * Also modify Makefile.{am,in} not to ship COPYING.
+ * Add a âHomepageâ field in the control file.
+
+ -- Cyril Brulebois <[EMAIL PROTECTED]> Tue, 09 Oct 2007 16:25:48 +0200
+
grig (0.7.2-1) unstable; urgency=low
* New upstream release
diff -u grig-0.7.2/debian/menu grig-0.7.2/debian/menu
--- grig-0.7.2/debian/menu
+++ grig-0.7.2/debian/menu
@@ -1,2 +1,2 @@
-?package(grig):needs="X11" section="Apps/Hamradio"\
+?package(grig):needs="X11" section="Applications/Amateur Radio"\
title="grig" command="/usr/bin/grig"
diff -u grig-0.7.2/debian/rules grig-0.7.2/debian/rules
--- grig-0.7.2/debian/rules
+++ grig-0.7.2/debian/rules
@@ -47,7 +47,7 @@
rm -f build-stamp
# 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
diff -u grig-0.7.2/debian/control grig-0.7.2/debian/control
--- grig-0.7.2/debian/control
+++ grig-0.7.2/debian/control
@@ -4,6 +4,7 @@
Maintainer: Joop Stakenborg <[EMAIL PROTECTED]>
Standards-Version: 3.7.2
Build-Depends: debhelper (>> 3.0.0), libhamlib-dev, libgtk2.0-dev (>=2.4.0), libxml-parser-perl, autotools-dev
+Homepage: http://groundstation.sourceforge.net/grig/
Package: grig
Architecture: any
diff -u grig-0.7.2/debian/copyright grig-0.7.2/debian/copyright
--- grig-0.7.2/debian/copyright
+++ grig-0.7.2/debian/copyright
@@ -7,4 +7,22 @@
+Upstream Author and Copyright Holder:
+ Alexandru Csete <[EMAIL PROTECTED]>, 2001-2006.
+
Copyright:
-Gnome RIG is copyright by Alexandru Csete <[EMAIL PROTECTED]>
-and is published under the GNU GPL License. There should be a copy
-of the GPL on youe system under /usr/share/common-licenses.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+On Debian systems, the complete text of the GNU General Public License
+version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
only in patch2:
unchanged:
--- grig-0.7.2.orig/src/Makefile.am
+++ grig-0.7.2/src/Makefile.am
@@ -5,7 +5,6 @@
-DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
- -DGTK_DISABLE_DEPRECATED \
-DDATADIR=\""$(datadir)"\" \
-DPACKAGE_DATA_DIR=\""$(datadir)/grig"\" \
-DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/grig"\" \
only in patch2:
unchanged:
--- grig-0.7.2.orig/src/Makefile.in
+++ grig-0.7.2/src/Makefile.in
@@ -236,7 +236,6 @@
-DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
- -DGTK_DISABLE_DEPRECATED \
-DDATADIR=\""$(datadir)"\" \
-DPACKAGE_DATA_DIR=\""$(datadir)/grig"\" \
-DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/grig"\" \
only in patch2:
unchanged:
--- grig-0.7.2.orig/config.guess
+++ grig-0.7.2/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 ;;
only in patch2:
unchanged:
--- grig-0.7.2.orig/Makefile.am
+++ grig-0.7.2/Makefile.am
@@ -7,7 +7,6 @@
$(INSTALL_DATA) ChangeLog $(DESTDIR)$(pkgdatadir)
$(INSTALL_DATA) NEWS $(DESTDIR)$(pkgdatadir)
$(INSTALL_DATA) README $(DESTDIR)$(pkgdatadir)
- $(INSTALL_DATA) COPYING $(DESTDIR)$(pkgdatadir)
EXTRA_DIST = \
autogen.sh \
only in patch2:
unchanged:
--- grig-0.7.2.orig/Makefile.in
+++ grig-0.7.2/Makefile.in
@@ -677,7 +677,6 @@
$(INSTALL_DATA) ChangeLog $(DESTDIR)$(pkgdatadir)
$(INSTALL_DATA) NEWS $(DESTDIR)$(pkgdatadir)
$(INSTALL_DATA) README $(DESTDIR)$(pkgdatadir)
- $(INSTALL_DATA) COPYING $(DESTDIR)$(pkgdatadir)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
pgpv6MSiY58ZQ.pgp
Description: PGP signature
