[blitz++] 11/18: * debian/control: - Standards-Version: 3.9.3 (no changes needed) - Fixed Vcs fields - Do not build-depend quilt (redundant with source 3.0 (quilt)) * debhelper 9 (control+compat) * debian/rules: - make sure only correct pkgconfig file will be installed Closes: #623786 - save all docs from upstream source before clean target removes them automatically to build twice in a row successfully

[Jerome Benoit]

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

calculus-guest pushed a commit to annotated tag debian/0.10-1
in repository blitz++.

commit a1ade89077361a32e39931db5cb6d50c898dbdef
Author: Andreas Tille <tille at debian.org>
Date:   Fri Jun 15 11:22:17 2012 +0000

      * debian/control:
        - Standards-Version: 3.9.3 (no changes needed)
        - Fixed Vcs fields
        - Do not build-depend quilt (redundant with source 3.0 (quilt))
      * debhelper 9 (control+compat)
      * debian/rules:
        - make sure only correct pkgconfig file will be installed
          Closes: #623786
        - save all docs from upstream source before clean target removes
          them automatically to build twice in a row successfully
---
 changelog | 15 +++++++++++++++
 compat    |  2 +-
 control   |  8 ++++----
 rules     | 14 +++++++++++---
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/changelog b/changelog
index c36f278..34bba0c 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,18 @@
+blitz++ (1:0.9-13) UNRELEASED; urgency=low
+
+  * debian/control:
+    - Standards-Version: 3.9.3 (no changes needed)
+    - Fixed Vcs fields
+    - Do not build-depend quilt (redundant with source 3.0 (quilt))
+  * debhelper 9 (control+compat)
+  * debian/rules:
+    - make sure only correct pkgconfig file will be installed
+      Closes: #623786
+    - save all docs from upstream source before clean target removes
+      them automatically to build twice in a row successfully
+
+ -- Andreas Tille <tille at debian.org>  Fri, 15 Jun 2012 11:37:15 +0200
+
 blitz++ (1:0.9-12) unstable; urgency=low
 
   * debian/control:
diff --git a/compat b/compat
index 45a4fb7..ec63514 100644
--- a/compat
+++ b/compat
@@ -1 +1 @@
-8
+9
diff --git a/control b/control
index fe4a4a8..0674d88 100644
--- a/control
+++ b/control
@@ -6,10 +6,10 @@ DM-Upload-Allowed: yes
 Uploaders: Andreas Tille <tille at debian.org>
 Build-Depends: gfortran | fortran-compiler, autotools-dev, texinfo,
  libblas-dev | libatlas-base-dev, liblapack-dev | libatlas-base-dev,
- debhelper (>= 8), d-shlibs, doxygen-latex, quilt, texi2html
-Standards-Version: 3.9.2
-Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/libblitz/trunk/?rev=0&sc=0
-Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/libblitz/trunk/
+ debhelper (>= 9), d-shlibs, doxygen-latex, texi2html
+Standards-Version: 3.9.3
+Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/libblitz/trunk/
+Vcs-Svn: svn://svn.debian.org/debian-science/packages/libblitz/trunk/
 Homepage: http://oonumerics.org/blitz/
 
 Package: libblitz0ldbl
diff --git a/rules b/rules
index 1d4b1c8..3eb63c5 100755
--- a/rules
+++ b/rules
@@ -14,12 +14,13 @@ PREFIX = /usr
 	# dh --with autotools-dev --with autoreconf $@ # Needs Build-Depends: dh-autoreconf
 
 override_dh_auto_configure:
-	mv doc/blitz.info doc/blitz.info.save
+	mkdir -p doc_orig
+	cp -a doc/blitz.dvi doc/blitz.info doc/blitz.html doc/blitz.pdf doc/blitz.ps doc_orig/
 	# dh_autotools-dev_updateconfig
 	F77=gfortran ./configure --prefix=$(PREFIX) --with-cxx=gcc --with-blas --enable-debug --enable-static --enable-64bit --enable-shared --enable-doxygen CFLAGS="-g -O2 -DBZHAVE_STD" CXXFLAGS="-g -O2 -DBZ_HAVE_STD"
 
 override_dh_auto_build:
-	mv doc/blitz.info.save doc/blitz.info
+	cp -a doc_orig/* doc/
 	dh_auto_build
 	cd doc && $(MAKE) all
 
@@ -34,7 +35,7 @@ override_dh_install:
 	    mv `pwd`/debian/tmp/$(PREFIX)/share/doc/blitz-0.9/*.$${ext} `pwd`/debian/tmp/$(PREFIX)/share/doc/libblitz-doc/html ; \
 	done
 	d-shlibmove --ldbl --commit \
-	            --movedev "debian/tmp/usr/lib/pkgconfig/*" usr/lib/pkgconfig \
+	            --movedev "debian/tmp/usr/lib/pkgconfig/blitz.pc" usr/lib/pkgconfig \
 	            lib/.libs/libblitz.so
 
 	#######    --movedev "debian/tmp/usr/lib/*.la" usr/lib \
@@ -43,3 +44,10 @@ override_dh_install:
 
 	# Delete copy of jquery.js and replace it by a link (in dh_links) to libjs-jquery version
 	rm -f debian/$(docname)/usr/share/doc/$(docname)/html/doxygen/jquery.js
+
+override_dh_clean:
+	dh_clean
+	if [ -d doc_orig ] ; then \
+	    mv doc_orig/* doc/ ; \
+	    rmdir doc_orig ; \
+	fi

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