[Pkg-jed-commit] [SCM] Debian packaging of JED branch, jo-0.99.19, updated. 1%3A0.99.18+dfsg.1-10-178-gbb38541

[Jörg Sommer]

The following commit has been merged in the jo-0.99.19 branch:
commit 2f3d1f07efaa77840fe582b068f5b0d8cd62e2e7
Author: Jörg Sommer <joerg at alea.gnuu.de>
Date:   Sun May 18 02:48:28 2008 +0200

    Replace config.{guess,sub} by updated version from autotools-dev
    
    /usr/share/doc/autotools-dev/README.Debian.gz suggests to use the files
    from the package autotools-dev, because they might be more recent than
    the files shipped with the upstream source. This might be important for
    Debian, because the new files may include support for one of the
    different architectures Debian supports.

diff --git a/debian/control b/debian/control
index 6e2b8c4..5d4434f 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.7.3
 Build-Depends-Indep: hevea
 Build-Depends: debhelper (>= 4.1.16), dpatch, libslang2-dev (>= 2.0.7-2),
  libxft-dev, libgpmg1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
- libxt-dev, pkg-config, hardening-wrapper
+ libxt-dev, pkg-config, hardening-wrapper, autotools-dev
 Homepage: http://www.jedsoft.org/jed/
 Vcs-Git: git://git.debian.org/git/pkg-jed/jed.git
 Vcs-Browser: http://git.debian.org/?p=pkg-jed/jed.git
diff --git a/debian/patches/00list b/debian/patches/00list
index 3273ff1..28a0512 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -2,6 +2,7 @@ extend-manpage
 
 50_README
 50_jed-manpage
+config.guess+sub
 
 #if ! defined (DEB_BUILD_ARCH_hurd)
   /* The xrender extension is not supported on the hurd: #95843 */
diff --git a/debian/patches/config.guess+sub.dpatch b/debian/patches/config.guess+sub.dpatch
new file mode 100755
index 0000000..45e0c4f
--- /dev/null
+++ b/debian/patches/config.guess+sub.dpatch
@@ -0,0 +1,24 @@
+#! /bin/sh -e
+## config.guess+sub.dpatch © Ralf Treinen <treinen at debian.org>
+##
+## DP: replace all config.{guess,sub} by the vesion installed in
+## DP: /usr/share/misc
+
+dpatch_patch ()
+{
+	find . -name config.guess -o -name config.sub \
+		| tar vcf debian/patched/config.guess+sub.tar -T -
+	find . -name config.guess \
+		-exec ln -sfv /usr/share/misc/config.guess '{}' \;
+	find . -name config.sub \
+		-exec ln -sfv /usr/share/misc/config.sub '{}' \;
+}
+
+dpatch_unpatch ()
+{
+	tar xf debian/patched/config.guess+sub.tar
+}
+
+DPATCH_LIB_NO_DEFAULT=1
+
+. /usr/share/dpatch/dpatch.lib.sh

-- 
Debian packaging of JED