[cvxopt] 07/64: Imported Debian patch 0.9-3

[Andreas Tille]

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

tille pushed a commit to branch master
in repository cvxopt.

commit e86970c783858cacce206912cdcc26473d464b3e
Author: Torsten Werner <twerner at debian.org>
Date:   Wed Sep 19 20:57:04 2007 +0200

    Imported Debian patch 0.9-3
---
 debian/changelog                 | 10 ++++++++++
 debian/control                   |  2 +-
 debian/orig-tar.sh               |  2 ++
 debian/patches/doc-makefile.diff | 11 +++++++++++
 debian/patches/series            |  1 +
 debian/rules                     | 11 +++++++----
 6 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 071ba27..999e05c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+cvxopt (0.9-3) unstable; urgency=low
+
+  [ Soeren Sonnenburg ]
+  * Fix FTBFS if build twice in a row. (Closes: #442537)
+
+  [ Torsten Werner ]
+  * Change Build-Depends: gs-common to gs-gpl.
+
+ -- Torsten Werner <twerner at debian.org>  Wed, 19 Sep 2007 20:57:04 +0200
+
 cvxopt (0.9-2) unstable; urgency=low
 
   * add lapack3-dev to build depends for arm architecture
diff --git a/debian/control b/debian/control
index 050c6c2..566830c 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Torsten Werner <twerner at debian.org>
 Build-Depends: cdbs, debhelper, python-central (>= 0.5), python-all-dev,
  libglpk-dev, fftw3-dev, atlas3-base-dev [!arm], lapack3-dev [arm],
  refblas3-dev, quilt, texlive-latex-recommended, texlive-fonts-recommended,
- libdsdp-dev, gs-common
+ libdsdp-dev, gs-gpl
 XS-Python-Version: all
 XS-Vcs-Svn: https://bollin.googlecode.com/svn/cvxopt/trunk/
 XS-Vcs-Browser: http://bollin.googlecode.com/svn/cvxopt/trunk/
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 56c71cb..4b24ba5 100644
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -3,6 +3,8 @@
 # called by uscan with '--upstream-version' <version> <file>
 
 tar xf $3 --exclude '*.gif' --exclude '*.pdf' --exclude '*.html' 
+make -C cvxopt-$2/doc clean
+
 tar czf $3 cvxopt-$2
 rm -rf cvxopt-$2
 
diff --git a/debian/patches/doc-makefile.diff b/debian/patches/doc-makefile.diff
new file mode 100644
index 0000000..a27721a
--- /dev/null
+++ b/debian/patches/doc-makefile.diff
@@ -0,0 +1,11 @@
+diff -ur ../../doc.orig/Makefile ../../doc/Makefile
+--- ../../doc.orig/Makefile	2007-09-12 19:44:33.000000000 +0200
++++ ../../doc/Makefile	2007-09-12 19:44:39.000000000 +0200
+@@ -5,6 +5,7 @@
+ 
+ latex: Makefile $(SOURCES) 
+ 	latex cvxopt.tex
++	latex cvxopt.tex
+ 
+ html: Makefile $(SOURCES) 
+ 	latex cvxopt.tex
diff --git a/debian/patches/series b/debian/patches/series
index 5b6918c..b6949e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 setup.diff
 doc.diff
+doc-makefile.diff
diff --git a/debian/rules b/debian/rules
index fac0b7f..532b1e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #! /usr/bin/make -f 
 
 DEB_PYTHON_SYSTEM    := pycentral
-DEB_SRCDIR           := $(CURDIR)/src
+DEB_SRCDIR           := src
 DEB_COMPRESS_EXCLUDE := cvxopt.pdf
 
 include /usr/share/cdbs/1/rules/debhelper.mk
@@ -10,15 +10,18 @@ include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 build/python-cvxopt:: debian/stamp-docs
 debian/stamp-docs:
-	make -C $(CURDIR)/doc latex
-	cd $(CURDIR)/doc  && dvipdf cvxopt.dvi
+	make -C doc latex
+	cd doc  && dvipdf cvxopt.dvi
 	touch $@
 
 #install/python-cvxopt::
 #	dh_install -ppython-cvxopt doc/cvxopt/*.html doc/cvxopt/*.gif doc/cvxopt/*.css usr/share/doc/python-cvxopt/html
 
 clean::
-	$(RM) debian/stamp-docs
+	$(RM) debian/stamp-docs 
+	$(RM) doc/cvxopt.pdf
+	make -C doc clean
+	$(RM) -r src/build
 
 get-orig-source:
 	uscan --rename --upstream-version 0 || true

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