[SCM] ViennaCL packaging branch, master, updated. debian/1.1.2-6-15-g1630552

[Michael Wild]

The following commit has been merged in the master branch:
commit 1f69b21532bf1bcd897ce1bb3304fc5fe89cd985
Author: Michael Wild <themiwi at users.sourceforge.net>
Date:   Wed Feb 15 20:42:32 2012 +0100

    Reworked packaging for new build system
    
    Signed-off-by: Michael Wild <themiwi at users.sourceforge.net>

diff --git a/debian/libviennacl-dev.docs b/debian/libviennacl-dev.docs
deleted file mode 100644
index c348bb5..0000000
--- a/debian/libviennacl-dev.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-README
-debian/tmp/changelog
diff --git a/debian/libviennacl-dev.docs.in b/debian/libviennacl-dev.docs.in
new file mode 100644
index 0000000..d21a35c
--- /dev/null
+++ b/debian/libviennacl-dev.docs.in
@@ -0,0 +1,2 @@
+README
+ at BUILDDIR@/changelog
diff --git a/debian/libviennacl-doc.docs b/debian/libviennacl-doc.docs
deleted file mode 100644
index ac228b6..0000000
--- a/debian/libviennacl-doc.docs
+++ /dev/null
@@ -1,4 +0,0 @@
-README
-debian/tmp/changelog
-doc/viennacl.pdf
-doc/doxygen/html
diff --git a/debian/libviennacl-doc.docs.in b/debian/libviennacl-doc.docs.in
new file mode 100644
index 0000000..454193e
--- /dev/null
+++ b/debian/libviennacl-doc.docs.in
@@ -0,0 +1,4 @@
+README
+ at BUILDDIR@/changelog
+ at BUILDDIR@/doc/viennacl.pdf
+ at BUILDDIR@/doc/doxygen/html
diff --git a/debian/rules b/debian/rules
index 14065dc..d1e0f1c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,47 +4,27 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-%:
-	dh --sourcedirectory=tests --builddirectory=tests/build $@
-
-override_dh_auto_configure: custom_clean
+BUILDDIR := obj-$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-override_dh_auto_build:
-	@cd auxiliary && ./convert.sh
-	@cd doc && doxygen
-	@$(MAKE) -C doc/manual build
+%:
+	dh $@
 
-override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+override_dh_auto_configure:
+	rm -rf CL
 	dh_auto_configure
-	dh_auto_build -- VERBOSE=1
-	dh_auto_build -- ARGS="-VV" test || \
-	  echo "== ONE OR MORE TESTS FAILED! =="
-else
-	@echo "== SKIPPING TESTS (nocheck in DEB_BUILD_OPTIONS) =="
-endif
 
-override_dh_install:
-	dh_install
-	mkdir debian/tmp
-	pdftotext -f 47 -l 50 -nopgbrk -r 150                                 \
+override_dh_auto_install:
+	pdftotext -f 54 -l 58 -nopgbrk -r 150                                 \
 	  -x 130 -y 160 -W 980 -H 1440 -enc ASCII7                            \
-	  doc/viennacl.pdf - |                                                \
+	  $(BUILDDIR)/doc/viennacl.pdf - |                                    \
 	  sed -e 's/^Change Logs/= &\n/'                                      \
 	      -e '/^Version [0-9]\.[0-9]\.x/d'                                \
 	      -e 's/^Version [0-9]\./== &/'                                   \
 	      -e '/^\* / i \ ' |                                              \
 	  asciidoc -f /etc/asciidoc/text.conf - |                             \
-	  lynx -dump --stdin > debian/tmp/changelog
-
-custom_clean:
-	@rm -f  auxiliary/converter
-	@rm -f  auxiliary/generate-blas3-prod-align1
-	@rm -f  auxiliary/generate-blas3-solve-align1
-	@rm -rf CL
-	@rm -rf doc/doxygen
-	@rm -f  doc/viennacl.pdf
-	@rm -f  doc/manual/*.bbl doc/manual/*.blg
-	@rm -rf external
-	@rm -rf viennacl/linalg/kernels/*
-	@grep -rl 'file automatically generated' auxiliary/*/ | xargs rm -f
+	  lynx -dump --stdin > $(BUILDDIR)/changelog
+	for t in dev doc; do                                                  \
+	  sed 's|@BUILDDIR@|$(BUILDDIR)|g' debian/libviennacl-$$t.docs.in >   \
+	  debian/libviennacl-$$t.docs;                                        \
+	done
+	dh_auto_install

-- 
ViennaCL packaging