Package: gloox
Version: 1.0-1.1
Severity: important
Tags: patch
User: [email protected]
Usertags: arm64
gloox's config.guess/config.sub are out of date for the forthcoming
arm64 port. The attached patch sets things up so that you don't have to
be bothered by this type of bug for future ports, and removes a patch
that this approach renders obsolete.
* Use the autotools-dev dh addon to update config.guess/config.sub for
arm64.
diff -u gloox-1.0/debian/rules gloox-1.0/debian/rules
--- gloox-1.0/debian/rules
+++ gloox-1.0/debian/rules
@@ -36,6 +36,7 @@
config.status: configure
dh_testdir
+ dh_autotools-dev_updateconfig
CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
--mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
@@ -69,6 +70,7 @@
rm -rf api
[ ! -f Makefile ] || $(MAKE) distclean
+ dh_autotools-dev_restoreconfig
dh_clean
install: install-indep install-arch
diff -u gloox-1.0/debian/patches/00list gloox-1.0/debian/patches/00list
--- gloox-1.0/debian/patches/00list
+++ gloox-1.0/debian/patches/00list
@@ -3 +2,0 @@
-relibtoolize.dpatch
reverted:
--- gloox-1.0/debian/patches/relibtoolize.dpatch
+++ gloox-1.0.orig/debian/patches/relibtoolize.dpatch
@@ -1,128 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## relibtoolize.dpatch by Jose Carlos Garcia Sogo <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad gloox~/config.sub gloox/config.sub
---- gloox~/config.sub 2010-01-17 12:12:56.000000000 +0100
-+++ gloox/config.sub 2010-01-17 12:16:56.897859948 +0100
-@@ -178,6 +178,10 @@
- os=-sco5v6
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
-+ -sco6)
-+ os=-sco5v6
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
- -sco5)
- os=-sco3.2v5
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -198,6 +202,10 @@
- # Don't forget version if it is 3.2v4 or newer.
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
-+ -sco5v6*)
-+ # Don't forget version if it is 3.2v4 or newer.
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
- -sco*)
- os=-sco3.2v2
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -304,6 +312,9 @@
- ms1)
- basic_machine=mt-unknown
- ;;
-+ ms1)
-+ basic_machine=mt-unknown
-+ ;;
-
- # We use `pc' rather than `unknown'
- # because (1) that's what they normally are, and
-@@ -727,6 +738,10 @@
- basic_machine=arm-unknown
- os=-mingw32ce
- ;;
-+ mingw32ce)
-+ basic_machine=arm-unknown
-+ os=-mingw32ce
-+ ;;
- miniframe)
- basic_machine=m68000-convergent
- ;;
-@@ -755,6 +770,9 @@
- ms1-*)
- basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
- ;;
-+ ms1-*)
-+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-+ ;;
- mvs)
- basic_machine=i370-ibm
- os=-mvs
-@@ -876,6 +894,12 @@
- pc98-*)
- basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
-+ pc98)
-+ basic_machine=i386-pc
-+ ;;
-+ pc98-*)
-+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
- pentium | p5 | k5 | k6 | nexgen | viac3)
- basic_machine=i586-pc
- ;;
-@@ -936,6 +960,10 @@
- basic_machine=i386-pc
- os=-rdos
- ;;
-+ rdos)
-+ basic_machine=i386-pc
-+ os=-rdos
-+ ;;
- rom68k)
- basic_machine=m68k-rom68k
- os=-coff
-@@ -966,6 +994,10 @@
- basic_machine=mipsisa32-sde
- os=-elf
- ;;
-+ sde)
-+ basic_machine=mipsisa32-sde
-+ os=-elf
-+ ;;
- sei)
- basic_machine=mips-sei
- os=-seiux
-@@ -980,6 +1012,9 @@
- sh5el)
- basic_machine=sh5le-unknown
- ;;
-+ sh5el)
-+ basic_machine=sh5le-unknown
-+ ;;
- sh64)
- basic_machine=sh64-unknown
- ;;
-@@ -1484,6 +1519,9 @@
- mep-*)
- os=-elf
- ;;
-+ mep-*)
-+ os=-elf
-+ ;;
- mips*-cisco)
- os=-elf
- ;;
-@@ -1505,6 +1543,9 @@
- *-haiku)
- os=-haiku
- ;;
-+ *-haiku)
-+ os=-haiku
-+ ;;
- *-ibm)
- os=-aix
- ;;
Thanks,
--
Colin Watson [[email protected]]
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
