[Pkg-jed-commit] [SCM] Debian packaging of JED branch, master, updated. 1%3A0.99.18+dfsg.1-10-22-g46f3153

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit 46f3153f38cc147bff197a63ff1c72cf95b28d63
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Mon Jun 22 13:40:31 2009 +0200

    Replace the ancient config.{guess,sub} files by modern ones
    
    The files are taken from the autotools-dev package.  For that, a
    build-dependency on the autotools-dev package has been added.  (This fixes
    a Lintian warning).

diff --git a/debian/changelog b/debian/changelog
index 825f5c9..725e824 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
 jed (1:0.99.18+dfsg.1-13) UNRELEASED; urgency=low
 
-  * debian/rules: Add info-dir-section and menu entry to jed.info (closes:
-    #528877)
+  * debian/rules:
+    + Add info-dir-section and menu entry to jed.info (closes: #528877)
+    + Replace the ancient config.{guess,sub} files by modern ones from the
+      autotools-dev package (fix Lintian warning)
   * debian/info-dir: New file containing the information above
   * debian/jed-common.{postinst, prerm}: Remove calls to install-info, as
     per the dpkg -> GNU install-info transition
@@ -10,6 +12,7 @@ jed (1:0.99.18+dfsg.1-13) UNRELEASED; urgency=low
   * debian/control:
     + Suggests info-browser
     + Bump Standards-Version to 3.8.2 (no changes needed)
+    + Build-depends on autotools-dev
 
  -- Rafael Laboissiere <rafael at debian.org>  Sat, 16 May 2009 18:31:36 +0200
 
diff --git a/debian/control b/debian/control
index d9f7d2a..af41b06 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.8.2
 Build-Depends-Indep: hevea
 Build-Depends: debhelper (>= 7), dpatch, libslang2-dev (>= 2.0.7-2),
  libxft-dev, libgpmg1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
- libxt-dev, pkg-config
+ libxt-dev, pkg-config, 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/rules b/debian/rules
index 4d53d0c..60e651d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,16 +25,31 @@ temp=debian/tmp
 UPSTREAM_VERSION=0.99-18
 DEBIAN_UPSTREAM_VERSION=$(subst -,.,$(UPSTREAM_VERSION)).dfsg.1
 
+AUTOTOOLS_FILES = config.guess config.sub
+
 clean: unpatch
 	dh_testdir
 	dh_clean
 	[ ! -f Makefile ] || $(MAKE) distclean
+	# Restore autotools files
+	for f in $(AUTOTOOLS_FILES) ; do			\
+		if [ -f autoconf/$$f-orig ] ; then		\
+			mv autoconf/$$f-orig autoconf/$$f ;	\
+		fi ;						\
+	done
 	rm -f build-stamp install-stamp
 	# fixme-upstream
 	rm -f src/config.h
 
 config.status: patch-stamp
 	dh_testdir
+	# Replace deprecated autotools files
+	for f in $(AUTOTOOLS_FILES) ; do			\
+		if [ ! -f autoconf/$$f-orig ] ; then		\
+			mv autoconf/$$f autoconf/$$f-orig ; 	\
+		fi ;						\
+		cp /usr/share/misc/$$f autoconf ;		\
+	done
 	./configure "CFLAGS=$(CFLAGS)" --prefix=/usr/share --exec-prefix=/usr --with-x
 
 build: build-stamp

-- 
Debian packaging of JED