[SCM] ViennaCL packaging branch, master, updated. debian/1.1.2-6-32-g333e537
Michael Wild
themiwi at users.sourceforge.net
Fri Mar 23 09:48:00 UTC 2012
The following commit has been merged in the master branch:
commit 8cf95b23a50a6a277d61cb55ef4eec8bb8d2f7dd
Author: Michael Wild <themiwi at users.sourceforge.net>
Date: Fri Mar 23 10:31:09 2012 +0100
Don't auto-generate changelog anymore, upstream added it
Signed-off-by: Michael Wild <themiwi at users.sourceforge.net>
diff --git a/debian/libviennacl-dev.docs b/debian/libviennacl-dev.docs
new file mode 100644
index 0000000..ce47544
--- /dev/null
+++ b/debian/libviennacl-dev.docs
@@ -0,0 +1,2 @@
+README
+changelog
diff --git a/debian/libviennacl-dev.docs.in b/debian/libviennacl-dev.docs.in
deleted file mode 100644
index d21a35c..0000000
--- a/debian/libviennacl-dev.docs.in
+++ /dev/null
@@ -1,2 +0,0 @@
-README
- at BUILDDIR@/changelog
diff --git a/debian/libviennacl-doc.docs.in b/debian/libviennacl-doc.docs.in
index 454193e..046a116 100644
--- a/debian/libviennacl-doc.docs.in
+++ b/debian/libviennacl-doc.docs.in
@@ -1,4 +1,4 @@
README
- at BUILDDIR@/changelog
+changelog
@BUILDDIR@/doc/viennacl.pdf
@BUILDDIR@/doc/doxygen/html
diff --git a/debian/rules b/debian/rules
index 72f6c18..54782f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,19 +25,8 @@ override_dh_auto_test: $(BUILDDIR)/test_compute_capability
fi
override_dh_auto_install:
- pdftotext -f 54 -l 58 -nopgbrk -r 150 \
- -x 130 -y 160 -W 980 -H 1440 -enc ASCII7 \
- $(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 > $(BUILDDIR)/changelog
- for t in dev doc; do \
- sed 's|@BUILDDIR@|$(BUILDDIR)|g' debian/libviennacl-$$t.docs.in > \
- debian/libviennacl-$$t.docs; \
- done
+ sed 's|@BUILDDIR@|$(BUILDDIR)|g' debian/libviennacl-doc.docs.in > \
+ debian/libviennacl-doc.docs; \
dh_auto_install
$(BUILDDIR)/test_compute_capability: debian/test_compute_capability.c
--
ViennaCL packaging
More information about the debian-science-commits
mailing list