tags 728008 patch
thanks
The attached patch, derived from xmpi 2.2.3b8-13.1ubuntu4, switches xmpi
to dh-autoreconf.
It includes Adam Conrad's changes and additional changes by Daniel T Chen.
I intend to NMU these changes and a fix for #702438 in the next week or so.
There are several diffs to autogenerated files included in
debian/patches/3.0-quilt-source-init which I intend cleaning up as well.
diff -Nru xmpi-2.2.3b8/debian/control xmpi-2.2.3b8/debian/control
--- xmpi-2.2.3b8/debian/control 2013-09-14 18:59:16.000000000 +0200
+++ xmpi-2.2.3b8/debian/control 2014-05-29 13:57:50.000000000 +0200
@@ -2,7 +2,7 @@
Section: devel
Priority: extra
Maintainer: Camm Maguire <[email protected]>
-Build-Depends: debhelper ( >= 9 ),lam4-dev ( >= 7.1.1-5 ),libmotif-dev,texinfo,libx11-dev,libxt-dev,autotools-dev
+Build-Depends: debhelper ( >= 9 ),lam4-dev ( >= 7.1.1-5 ),libmotif-dev,texinfo,libx11-dev,libxt-dev,dh-autoreconf
Standards-Version: 3.9.3
Package: xmpi
diff -Nru xmpi-2.2.3b8/debian/rules xmpi-2.2.3b8/debian/rules
--- xmpi-2.2.3b8/debian/rules 2012-04-11 22:41:32.000000000 +0200
+++ xmpi-2.2.3b8/debian/rules 2014-05-30 11:38:39.000000000 +0200
@@ -16,37 +16,6 @@
ARCH:=$(shell dpkg --print-architecture)
-SUB:=$(shell find * -name config.sub |grep -v debian)
-GUESS:=$(shell find * -name config.guess |grep -v debian)
-#CONFIGURE:=$(shell find * -name configure)
-DSUB:=$(addprefix debian/conf/,$(SUB))
-DGUESS:=$(addprefix debian/conf/,$(GUESS))
-
-#$(DSUB):
-# mkdir -p $(@D)
-# cp $(subst debian/conf/,,$@) $@
-
-#$(SUB): $(DSUB)
-# chmod +w $@
-# cp /usr/share/misc/config.sub $@
-
-#$(DGUESS):
-# mkdir -p $(@D)
-# cp $(subst debian/conf/,,$@) $@
-
-#$(GUESS): $(DGUESS)
-# chmod +w $@
-# cp /usr/share/misc/config.guess $@
-
-#$(CONFIGURE): FORCE
-# ! [ -r $(@D)/configure.in ] || touch $(@D)/configure.in
-# sleep 2
-# ! [ -r $(@D)/aclocal.m4 ] || touch $(@D)/aclocal.m4
-# sleep 2
-# touch $@
-
-FORCE:
-
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -74,12 +43,10 @@
build: build-arch build-indep
build-arch: build-stamp
build-indep: build-stamp
-build-stamp: $(SUB) $(GUESS) build-stamp
+build-stamp:
dh_testdir
- -rm -f config.sub config.guess
- ln -s /usr/share/misc/config.sub config.sub
- ln -s /usr/share/misc/config.guess config.guess
+ dh_autoreconf
touch configure
touch -r configure $$(find -name "*.am") $$(find -name "*.in") $$(find -name "*.m4")
@@ -107,9 +74,9 @@
config/Makefile libtool Makefile
-cd debian/conf/ && find * -type f -exec mv {} ../../{} \;
rm -rf debian/conf
- rm -f config.sub config.guess
rm -rf debian/tmp src/libxmpi/nodeslist.loT src/xmpi/stamp-h1
+ dh_autoreconf_clean
dh_clean
install: install-stamp
@@ -129,8 +96,7 @@
cd src/xmpi && make -n | awk '/libtool/ {gsub("[^ ]*libxmpi.la","-L../../debian/tmp/usr/lib -lxmpi"); sub("^.* mpic","mpic");gsub("-o xmpi","-o ../../debian/tmp/usr/bin/xmpi"); print}' | bash -x -e
mkdir -p debian/tmp/etc/X11/app-defaults
install -m 0644 app-defaults/XMPI debian/tmp/etc/X11/app-defaults/XMPI
- mkdir debian/tmp/usr/share
- mv debian/tmp/usr/man debian/tmp/usr/share
+ mkdir -p debian/tmp/usr/share
dh_movefiles
touch install-stamp
