[tachyon] 01/01: Imported Debian patch 0.99~b6+dsx-3

Jerome Benoit calculus-guest at moszumanska.debian.org
Wed Dec 2 02:06:47 UTC 2015 

This is an automated email from the git hooks/post-receive script.

calculus-guest pushed a commit to branch master
in repository tachyon.

commit c55924436f1d31891df39d899db26c14f329a95f
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Wed Dec 2 02:42:47 2015 +0100

    Imported Debian patch 0.99~b6+dsx-3
---
 debian/changelog            | 10 ++++++++++
 debian/control              |  2 +-
 debian/rules                | 19 ++++++++++++-------
 debian/templates/control.in |  6 +++---
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8c69620..0a95c44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tachyon (0.99~b6+dsx-3) unstable; urgency=medium
+
+  * FTBFS bug fix release (Closes: #806115):
+    - arch/indep build scheme, harden.
+  * Debianization:
+    - debian/rules, see FTBFS bug fix above;
+    - debian/templates/control.in, Vcs-Browser field correction.
+
+ -- Jerome Benoit <calculus at rezozer.net>  Wed, 02 Dec 2015 01:38:35 +0000
+
 tachyon (0.99~b6+dsx-2) unstable; urgency=medium
 
   * Debianization:
diff --git a/debian/control b/debian/control
index ad836e4..0ae0b02 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends-Indep:
 Standards-Version: 3.9.6
 Homepage: http://jedi.ks.uiuc.edu/~johns/raytracer/
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/tachyon.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/tachyon.git
+Vcs-Browser: http://anonscm.debian.org/cgit/debian-science/packages/tachyon.git
 
 Package: libtachyon-serial-0
 Provides: libtachyon
diff --git a/debian/rules b/debian/rules
index 87b0650..08ad8d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 DEB_PKG_DIR = $(abspath $(dir $(filter %rules, $(MAKEFILE_LIST))))
-export DEB_PKG_VERSION = $(shell dpkg-parsechangelog -l$(DEB_PKG_DIR)/changelog | sed -n -e '/^Version:/s/Version: //p')
+export DEB_PKG_VERSION = $(shell dpkg-parsechangelog -l$(DEB_PKG_DIR)/changelog -S Version)
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
@@ -65,15 +65,15 @@ override_dh_auto_configure:
 		dh_auto_configure -B _build/$(lf) -- --srcdir=../.. --with-libflavour=$(lf) CFLAGS="$(CFLAGS)" CC=$(CC_$(lf)) ;\
 		)
 
-override_dh_auto_build-indep:
-	$(MAKE) -C docs all
-
 override_dh_auto_build-arch:
 	$(foreach lf, $(DEB_VIRT_LIBTACHYON_LISTOF_FLAVOUR), dh_auto_build -a -B _build/$(lf) ;)
 
+override_dh_auto_build-indep:
+	$(MAKE) -C docs all
+
 override_dh_auto_test-indep:
+	true
 
-DEB_ADHOC_SCENES_ACTION_SH := debian/adhoc/scenes/action.sh
 override_dh_prep-arch:
 	$(foreach lf, $(DEB_VIRT_LIBTACHYON_LISTOF_FLAVOUR), \
 		$(foreach dhf, $(DEB_VIRT_LIBTACHYON_FLAVOUR_LISTOF_DHFILE), \
@@ -106,16 +106,21 @@ override_dh_prep-arch:
 				debian/templates/tachyon-bin-VARIANT$(dhf).in > debian/tachyon-bin-$(vt)$(dhf) ;\
 			) \
 		)
+	dh_prep -a
+
+DEB_ADHOC_SCENES_ACTION_SH := debian/adhoc/scenes/action.sh
+override_dh_prep-indep:
 	sed -e "s+ at DEB_VIRT_TACHYON_LISTOF_VARIANT@+$(subst $(EMPTY),\|,$(strip $(DEB_VIRT_TACHYON_LISTOF_VARIANT)))+" \
 		$(DEB_ADHOC_SCENES_ACTION_SH).in > $(DEB_ADHOC_SCENES_ACTION_SH)
 	chmod --reference $(DEB_ADHOC_SCENES_ACTION_SH).in $(DEB_ADHOC_SCENES_ACTION_SH)
-	dh_prep -a
+	dh_prep -i
 
 override_dh_auto_install-arch:
 	$(foreach lf, $(DEB_VIRT_LIBTACHYON_LISTOF_FLAVOUR), dh_auto_install -a -B _build/$(lf) ;)
 
 DEB_AUTO_INSTALL_MAKEFLAGS = TOPSRCDIR=$(CURDIR) DESTDIR=$(CURDIR)/debian/tmp
 override_dh_auto_install-indep:
+	$(MAKE) -C _build/$(lastword $(DEB_VIRT_LIBTACHYON_LISTOF_FLAVOUR))/src install-data-am $(DEB_AUTO_INSTALL_MAKEFLAGS)
 	$(MAKE) -C docs install $(DEB_AUTO_INSTALL_MAKEFLAGS)
 	$(MAKE) -C pkgextra/volpack/data install $(DEB_AUTO_INSTALL_MAKEFLAGS)
 	$(MAKE) -C pkgextra/virtual-reality/graphics install $(DEB_AUTO_INSTALL_MAKEFLAGS)
@@ -134,12 +139,12 @@ override_dh_auto_clean-arch:
 	dh_auto_clean -a
 	rm -rf _build
 	rm -f config_tachyon.h.in
-	rm -f $(DEB_ADHOC_SCENES_ACTION_SH)
 	rm -f $(foreach vt, $(DEB_VIRT_TACHYON_LISTOF_VARIANT), $(foreach dhf, $(DEB_VIRT_TACHYON_LISTOF_DHFILE), debian/tachyon-bin-$(vt)$(dhf) ))
 	rm -f $(foreach lf, $(DEB_VIRT_LIBTACHYON_LISTOF_FLAVOUR), $(foreach dhf, $(DEB_VIRT_LIBTACHYON_FLAVOUR_LISTOF_DHFILE), debian/libtachyon-$(lf)-$(DEB_PKG_LT_CURRENT)$(dhf) ))
 
 override_dh_auto_clean-indep:
 	dh_auto_clean -i
+	rm -f $(DEB_ADHOC_SCENES_ACTION_SH)
 	$(MAKE) -C docs clean
 	$(MAKE) -C docs distclean || true
 	$(MAKE) -C pkgextra/volpack/data distclean || true
diff --git a/debian/templates/control.in b/debian/templates/control.in
index 5c9227f..c3f1931 100644
--- a/debian/templates/control.in
+++ b/debian/templates/control.in
@@ -5,10 +5,10 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
 Uploaders: Jerome Benoit <calculus at rezozer.net>
 Build-Depends:
  debhelper (>= 9),
- autotools-dev, autoconf-archive, autoconf-gl-macros, dh-autoreconf, libtool, pkg-config, help2man,
+ autotools-dev, autoconf-archive, dh-autoreconf, libtool, pkg-config, help2man,
  mpi-default-dev,
  libmpich-dev,
- libjpeg-dev (>=1:1.3.1-10),
+ libjpeg-dev,
  libpng-dev,
  libgl1-mesa-dev | libgl-dev
 Build-Conflicts:
@@ -21,7 +21,7 @@ Build-Depends-Indep:
 Standards-Version: 3.9.6
 Homepage: http://jedi.ks.uiuc.edu/~johns/raytracer/
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/tachyon.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/tachyon.git
+Vcs-Browser: http://anonscm.debian.org/cgit/debian-science/packages/tachyon.git
 
 Package: libtachyon-serial- at LT_CURRENT@
 Provides: libtachyon

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tachyon.git

More information about the debian-science-commits mailing list