[blitz++] 09/31: * debian/control: - Standards-Version: 3.9.1 (no changes needed) - Build-Depends: doxygen-latex instead of several tex related files Closes: #616201 - Build-Depends: autotools-dev * debian/rules: simplified by using short dh syntax Using autotools-dev should hopefully solve the "Outdated config.{sub, guess}" issue, hopefully Closes: #548928 * debian/source/format: 3.0 (quilt) * debian/libblitz-doc.lintian-overrides: Removed because not needed any more

Jerome Benoit calculus-guest at moszumanska.debian.org
Tue Aug 2 00:52:02 UTC 2016 

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

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

commit 832f91f31ee56284daae13730b2263ce5244de6a
Author: Andreas Tille <tille at debian.org>
Date:   Mon Mar 7 13:12:57 2011 +0000

      * debian/control:
        - Standards-Version: 3.9.1 (no changes needed)
        - Build-Depends: doxygen-latex instead of several tex related files
          Closes: #616201
        - Build-Depends: autotools-dev
      * debian/rules: simplified by using short dh syntax
        Using autotools-dev should hopefully solve the "Outdated config.{sub,guess}"
        issue, hopefully Closes: #548928
      * debian/source/format: 3.0 (quilt)
      * debian/libblitz-doc.lintian-overrides: Removed because not needed any more
---
 debian/changelog                                   | 16 +++---
 debian/control                                     |  7 ++-
 debian/libblitz-doc.install                        |  5 +-
 debian/libblitz-doc.lintian-overrides              | 22 --------
 .../40_prevent_celetion_of_texi_files.patch        | 61 ++++++++++++++++++++++
 debian/patches/series                              |  2 +
 debian/rules                                       | 40 +++++++-------
 debian/source/format                               |  1 +
 8 files changed, 103 insertions(+), 51 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4133602..33e1238 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,17 @@
-blitz++ (1:0.9-11) UNRELEASED; urgency=low
+blitz++ (1:0.9-11) unstable; urgency=low
 
   * debian/control:
-    - Standards-Version: 3.8.4 (no changes needed)
-    - Depends: cdbs
-  * debian/rules: simplified by using cdbs
-    Using autotools.mk should hopefully solve the "Outdated config.{sub,guess}"
+    - Standards-Version: 3.9.1 (no changes needed)
+    - Build-Depends: doxygen-latex instead of several tex related files
+      Closes: #616201
+    - Build-Depends: autotools-dev
+  * debian/rules: simplified by using short dh syntax
+    Using autotools-dev should hopefully solve the "Outdated config.{sub,guess}"
     issue, hopefully Closes: #548928
+  * debian/source/format: 3.0 (quilt)
+  * debian/libblitz-doc.lintian-overrides: Removed because not needed any more
 
- -- Andreas Tille <tille at debian.org>  Thu, 27 May 2010 08:36:34 +0200
+ -- Andreas Tille <tille at debian.org>  Mon, 07 Mar 2011 14:00:41 +0100
 
 blitz++ (1:0.9-10) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index b91850c..eb72980 100644
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,10 @@ Priority: optional
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Andreas Tille <tille at debian.org>
-Build-Depends: gfortran | fortran-compiler, autotools-dev,
+Build-Depends: gfortran | fortran-compiler, autotools-dev, texinfo,
  libblas-dev | libatlas-base-dev, liblapack-dev | libatlas-base-dev,
- debhelper (>= 7.1), d-shlibs, texlive-latex-base, texlive-generic-recommended,
- texi2html, texinfo, doxygen, graphviz, cdbs, quilt
-Standards-Version: 3.8.4
+ debhelper (>= 7.1), d-shlibs, doxygen-latex, quilt
+Standards-Version: 3.9.1
 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/
 Homepage: http://oonumerics.org/blitz/
diff --git a/debian/libblitz-doc.install b/debian/libblitz-doc.install
index fd9cbb0..858e0da 100644
--- a/debian/libblitz-doc.install
+++ b/debian/libblitz-doc.install
@@ -1 +1,4 @@
-doc/doxygen/html/*   usr/share/doc/libblitz-doc/html/doxygen
+doc/doxygen/html/*	usr/share/doc/libblitz-doc/html/doxygen
+doc/*.html		usr/share/doc/libblitz-doc/html/
+doc/*.gif		usr/share/doc/libblitz-doc/html/
+doc/*.jpg		usr/share/doc/libblitz-doc/html/
diff --git a/debian/libblitz-doc.lintian-overrides b/debian/libblitz-doc.lintian-overrides
deleted file mode 100644
index 3b70be5..0000000
--- a/debian/libblitz-doc.lintian-overrides
+++ /dev/null
@@ -1,22 +0,0 @@
-# These are doxygen auto generated files which probably have their use
-libblitz-doc: zero-byte-file-in-doc-directory usr/share/doc/libblitz-doc/html/doxygen/classExtremum__coll__graph.map
-libblitz-doc: zero-byte-file-in-doc-directory usr/share/doc/libblitz-doc/html/doxygen/classF__coll__graph.map
-libblitz-doc: zero-byte-file-in-doc-directory usr/share/doc/libblitz-doc/html/doxygen/classIRNGWrapper_3_01IRNG_00_01independentState_01_4__coll__graph.map
-libblitz-doc: zero-byte-file-in-doc-directory usr/share/doc/libblitz-doc/html/doxygen/classIRNGWrapper_3_01IRNG_00_01sharedState_01_4__coll__graph.map
-libblitz-doc: zero-byte-file-in-doc-directory usr/share/doc/libblitz-doc/html/doxygen/classListInitializationSwitch__coll__graph.map
-libblitz-doc: zero-byte-file-in-doc-directory usr/share/doc/libblitz-doc/html/doxygen/classListInitializer__coll__graph.map
-libblitz-doc: zero-byte-file-in-doc-directory usr/share/doc/libblitz-doc/html/doxygen/classRandom__coll__graph.map
-libblitz-doc: zero-byte-file-in-doc-directory usr/share/doc/libblitz-doc/html/doxygen/classReduceMax__coll__graph.map
-libblitz-doc: zero-byte-file-in-doc-directory usr/share/doc/libblitz-doc/html/doxygen/classReduceMaxIndex__coll__graph.map
-libblitz-doc: zero-byte-file-in-doc-directory usr/share/doc/libblitz-doc/html/doxygen/classReduceMean__coll__graph.map
-libblitz-doc: zero-byte-file-in-doc-directory usr/share/doc/libblitz-doc/html/doxygen/classReduceMin__coll__graph.map
-libblitz-doc: zero-byte-file-in-doc-directory usr/share/doc/libblitz-doc/html/doxygen/classReduceMinIndex__coll__graph.map
-libblitz-doc: zero-byte-file-in-doc-directory usr/share/doc/libblitz-doc/html/doxygen/classReduceProduct__coll__graph.map
-libblitz-doc: zero-byte-file-in-doc-directory usr/share/doc/libblitz-doc/html/doxygen/classReduceSum__coll__graph.map
-libblitz-doc: zero-byte-file-in-doc-directory usr/share/doc/libblitz-doc/html/doxygen/classTinyVector__coll__graph.map
-libblitz-doc: zero-byte-file-in-doc-directory usr/share/doc/libblitz-doc/html/doxygen/classVectorIter__coll__graph.map
-libblitz-doc: zero-byte-file-in-doc-directory usr/share/doc/libblitz-doc/html/doxygen/classVectorIterConst__coll__graph.map
-libblitz-doc: zero-byte-file-in-doc-directory usr/share/doc/libblitz-doc/html/doxygen/compiler_8h__incl.map
-libblitz-doc: zero-byte-file-in-doc-directory usr/share/doc/libblitz-doc/html/doxygen/minmax_8h__incl.map
-libblitz-doc: zero-byte-file-in-doc-directory usr/share/doc/libblitz-doc/html/doxygen/prettyprint_8h__incl.map
-libblitz-doc: zero-byte-file-in-doc-directory usr/share/doc/libblitz-doc/html/doxygen/wrap-climits_8h__incl.map
diff --git a/debian/patches/40_prevent_celetion_of_texi_files.patch b/debian/patches/40_prevent_celetion_of_texi_files.patch
new file mode 100644
index 0000000..edf0905
--- /dev/null
+++ b/debian/patches/40_prevent_celetion_of_texi_files.patch
@@ -0,0 +1,61 @@
+--- blitz++-0.9.orig.orig/doc/stencils/Makefile.am
++++ blitz++-0.9.orig/doc/stencils/Makefile.am
+@@ -70,5 +70,5 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) stencils
+ 
+ clean-local:
+-	-rm -rf *.ii *.ti cxx_repository Template.dir ii_files ti_files dump-stencil *.texi
++	-rm -rf *.ii *.ti cxx_repository Template.dir ii_files ti_files dump-stencil
+ 
+--- blitz++-0.9.orig.orig/doc/stencils/Makefile.in
++++ blitz++-0.9.orig/doc/stencils/Makefile.in
+@@ -480,7 +480,7 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) stencils
+ 
+ clean-local:
+-	-rm -rf *.ii *.ti cxx_repository Template.dir ii_files ti_files dump-stencil *.texi
++	-rm -rf *.ii *.ti cxx_repository Template.dir ii_files ti_files dump-stencil
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+--- blitz++-0.9.orig.orig/doc/examples/Makefile.am
++++ blitz++-0.9.orig/doc/examples/Makefile.am
+@@ -75,6 +75,6 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) -i out
+ 
+ clean-local:
+-	-rm -rf *.ii *.ti cxx_repository Template.dir ii_files ti_files $(EXTRA_PROGRAMS) *.texi *.out core.[0-9]*
++	-rm -rf *.ii *.ti cxx_repository Template.dir ii_files ti_files $(EXTRA_PROGRAMS) core.[0-9]*
+ 
+ 
+--- blitz++-0.9.orig.orig/doc/examples/Makefile.in
++++ blitz++-0.9.orig/doc/examples/Makefile.in
+@@ -690,7 +690,7 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) -i out
+ 
+ clean-local:
+-	-rm -rf *.ii *.ti cxx_repository Template.dir ii_files ti_files $(EXTRA_PROGRAMS) *.texi *.out core.[0-9]*
++	-rm -rf *.ii *.ti cxx_repository Template.dir ii_files ti_files $(EXTRA_PROGRAMS) core.[0-9]*
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+--- blitz++-0.9.orig.orig/doc/Makefile.am
++++ blitz++-0.9.orig/doc/Makefile.am
+@@ -88,6 +88,3 @@
+ 
+ .PHONY: html
+ 
+-clean-local:
+-	-rm -rf blitz*.html 
+-
+--- blitz++-0.9.orig.orig/doc/Makefile.in
++++ blitz++-0.9.orig/doc/Makefile.in
+@@ -841,7 +841,7 @@
+ .PHONY: html
+ 
+ clean-local:
+-	-rm -rf blitz*.html 
++
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/debian/patches/series b/debian/patches/series
index 4b9d859..c7a114a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 01_gcc_43_missing_includes.patch
 01_gcc34_amd64.patch
+30_fix_doxygen_install_target.patch
+40_prevent_celetion_of_texi_files.patch
diff --git a/debian/rules b/debian/rules
index 7d2e1bb..4ae0239 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,6 @@
 #!/usr/bin/make -f
-# debian/rules for blitz++ using cdbs
-# 2009         Andreas Tille <tille at debian.org> 
-
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+# debian/rules for blitz++
+# 2011         Andreas Tille <tille at debian.org> 
 
 version=0.9
 libname=libblitz
@@ -12,25 +8,33 @@ pkgname=$(libname)0ldbl
 
 PREFIX = /usr
 
-DEB_CONFIGURE_INVOKE=mv doc/blitz.info doc/blitz.info.save; \
-                     F77=gfortran ./configure --prefix=$(PREFIX) --with-cxx=gcc --with-blas --enable-debug --enable-static --enable-64bit --enable-shared --enable-doxygen
+%:
+	dh --with autotools-dev $@
+	# dh --with autotools-dev --with autoreconf $@ # Needs Build-Depends: dh-autoreconf
+
+override_dh_auto_configure:
+	mv doc/blitz.info doc/blitz.info.save
+	# 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"
 
-DEB_MAKE_INVOKE := $(DEB_MAKE_INVOKE); cd doc && $(MAKE) all
+override_dh_auto_build:
+	mv doc/blitz.info.save doc/blitz.info
+	dh_auto_build
+	cd doc && $(MAKE) all
 
-DEB_INSTALL_INVOKE := mv doc/blitz.info.save doc/blitz.info; $(DEB_MAKE_INVOKE); cd doc && $(MAKE) all
 
-DEB_COMPRESS_EXCLUDE = examples testsuite pdf
+override_dh_compress:
+	dh_compress --exclude=examples --exclude=testsuite --exclude=.pdf
 
-common-binary-post-install-arch::
+override_dh_install:
+	dh_install
+	mkdir -p `pwd`/debian/tmp/$(PREFIX)/share/doc/libblitz-doc/html
 	for ext in html gif jpg ; do \
 	    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/include/*" usr/include \
 	            --movedev "debian/tmp/usr/lib/pkgconfig/*" usr/lib/pkgconfig \
-	            debian/tmp/usr/lib/$(libname).so
+	            --movedev "debian/tmp/usr/lib/*.la" usr/lib \
+	            lib/.libs/libblitz.so
 
-# binary-arch: build install
-#	...
-#	dh_makeshlibs -V  '$(pkgname) (>= $(version))'
-#	...
+##	            --movedev "debian/tmp/usr/include/*" usr/include \
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

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

More information about the debian-science-commits mailing list