r45211 - in /packages/libblitz/trunk/debian: ./ patches/

trophime-guest at users.alioth.debian.org trophime-guest at users.alioth.debian.org
Fri Jul 6 12:39:15 UTC 2012 

Author: trophime-guest
Date: Fri Jul  6 12:39:15 2012
New Revision: 45211

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45211
Log:
update to 0.10

Added:
    packages/libblitz/trunk/debian/patches/examples.patch
    packages/libblitz/trunk/debian/patches/testsuite.patch
Removed:
    packages/libblitz/trunk/debian/patches/01_gcc34_amd64.patch
    packages/libblitz/trunk/debian/patches/01_gcc_43_missing_includes.patch
    packages/libblitz/trunk/debian/patches/30_fix_doxygen_install_target.patch
    packages/libblitz/trunk/debian/patches/40_prevent_celetion_of_texi_files.patch
Modified:
    packages/libblitz/trunk/debian/changelog
    packages/libblitz/trunk/debian/control
    packages/libblitz/trunk/debian/libblitz-doc.install
    packages/libblitz/trunk/debian/patches/series
    packages/libblitz/trunk/debian/rules

Modified: packages/libblitz/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/libblitz/trunk/debian/changelog?rev=45211&op=diff
==============================================================================
--- packages/libblitz/trunk/debian/changelog (original)
+++ packages/libblitz/trunk/debian/changelog Fri Jul  6 12:39:15 2012
@@ -1,3 +1,21 @@
+blitz++ (1:0.10-1.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream release
+
+  * debian/rules:
+    - update for new release
+    - add override_dh_auto_test target
+    - regenerate configure and Makefile.am
+  * debian/control:
+    - add libtool, automake to BuildDepends
+  * debian/libblitz-doc.install
+    - modify path for html files
+  * remove uneeded patches
+  * add examples.patch
+  
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>  Fri, 06 Jul 2012 09:15:30 +0200
+
 blitz++ (1:0.9-13) unstable; urgency=low
 
   * debian/control:

Modified: packages/libblitz/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/libblitz/trunk/debian/control?rev=45211&op=diff
==============================================================================
--- packages/libblitz/trunk/debian/control (original)
+++ packages/libblitz/trunk/debian/control Fri Jul  6 12:39:15 2012
@@ -4,7 +4,7 @@
 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, texinfo,
+Build-Depends: gfortran | fortran-compiler, autotools-dev, libtool, automake, texinfo,
  libblas-dev | libatlas-base-dev, liblapack-dev | libatlas-base-dev,
  debhelper (>= 9), d-shlibs, doxygen-latex, texi2html, cfortran
 Standards-Version: 3.9.3

Modified: packages/libblitz/trunk/debian/libblitz-doc.install
URL: http://svn.debian.org/wsvn/debian-science/packages/libblitz/trunk/debian/libblitz-doc.install?rev=45211&op=diff
==============================================================================
--- packages/libblitz/trunk/debian/libblitz-doc.install (original)
+++ packages/libblitz/trunk/debian/libblitz-doc.install Fri Jul  6 12:39:15 2012
@@ -1,4 +1,4 @@
 doc/doxygen/html/*	usr/share/doc/libblitz-doc/html/doxygen
-doc/*.html		usr/share/doc/libblitz-doc/html/
+doc/blitz.html/*.html	usr/share/doc/libblitz-doc/html/
 doc/*.gif		usr/share/doc/libblitz-doc/html/
 doc/*.jpg		usr/share/doc/libblitz-doc/html/

Added: packages/libblitz/trunk/debian/patches/examples.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/libblitz/trunk/debian/patches/examples.patch?rev=45211&op=file
==============================================================================
--- packages/libblitz/trunk/debian/patches/examples.patch (added)
+++ packages/libblitz/trunk/debian/patches/examples.patch Fri Jul  6 12:39:15 2012
@@ -1,0 +1,13 @@
+Index: blitz++-0.10/examples/Makefile.am
+===================================================================
+--- blitz++-0.10.orig/examples/Makefile.am	2012-05-26 03:26:02.000000000 +0200
++++ blitz++-0.10/examples/Makefile.am	2012-07-06 11:06:55.000000000 +0200
+@@ -62,7 +62,7 @@
+ check-examples: $(EXTRA_PROGRAMS)
+ 	@echo Running examples...
+ 	@for prog in $(EXTRA_PROGRAMS) ; do \
+-		echo $$prog && (./$$prog > /dev/null 2>&1) || exit 1; \
++		echo -n $$prog && (./$$prog > /dev/null 2>&1) && echo "\tok" || echo "\tfailed"; \
+ 	done
+ 	@echo All tests passed.
+ 

Modified: packages/libblitz/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/libblitz/trunk/debian/patches/series?rev=45211&op=diff
==============================================================================
--- packages/libblitz/trunk/debian/patches/series (original)
+++ packages/libblitz/trunk/debian/patches/series Fri Jul  6 12:39:15 2012
@@ -1,4 +1,6 @@
-01_gcc_43_missing_includes.patch
-01_gcc34_amd64.patch
-30_fix_doxygen_install_target.patch
-40_prevent_celetion_of_texi_files.patch
+#01_gcc_43_missing_includes.patch
+#01_gcc34_amd64.patch
+#30_fix_doxygen_install_target.patch
+#40_prevent_celetion_of_texi_files.patch
+#testsuite.patch
+examples.patch

Added: packages/libblitz/trunk/debian/patches/testsuite.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/libblitz/trunk/debian/patches/testsuite.patch?rev=45211&op=file
==============================================================================
--- packages/libblitz/trunk/debian/patches/testsuite.patch (added)
+++ packages/libblitz/trunk/debian/patches/testsuite.patch Fri Jul  6 12:39:15 2012
@@ -1,0 +1,10 @@
+--- blitz++-0.10.orig/random/discrete-uniform.h.orig	2012-07-06 07:43:39.000000000 +0000
++++ blitz++-0.10/random/discrete-uniform.h	2012-07-06 07:44:30.000000000 +0000
+@@ -32,6 +32,7 @@
+ #ifndef BZ_RANDOM_DISCRETE_UNIFORM_H
+ #define BZ_RANDOM_DISCRETE_UNIFORM_H
+ 
++#include <blitz/bzdebug.h>
+ #include <random/default.h>
+ 
+ BZ_NAMESPACE(ranlib)

Modified: packages/libblitz/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/libblitz/trunk/debian/rules?rev=45211&op=diff
==============================================================================
--- packages/libblitz/trunk/debian/rules (original)
+++ packages/libblitz/trunk/debian/rules Fri Jul  6 12:39:15 2012
@@ -1,6 +1,11 @@
 #!/usr/bin/make -f
 # debian/rules for blitz++
 # 2011         Andreas Tille <tille at debian.org> 
+
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 
 version=0.9
 libname=libblitz
@@ -10,30 +15,52 @@
 PREFIX = /usr
 
 %:
-	dh $@ -with autotools-dev
+	dh $@ -with autotools-dev --parallel
 	# dh --with autotools-dev --with autoreconf $@ # Needs Build-Depends: dh-autoreconf
 
 override_dh_auto_configure:
-	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"
+	
+	libtoolize --automake
+	aclocal -Im4
+	autoreconf -i
+	automake
+	
+	F77=gfortran ./configure --prefix=$(PREFIX) --with-cxx=gcc --with-blas --enable-debug --enable-static --enable-64bit --enable-shared --enable-doxygen CFLAGS="${CFLAGS} -DBZHAVE_STD" CXXFLAGS="${CXXFLAGS} -DBZ_HAVE_STD"
 
 override_dh_auto_build:
-	cp -a doc_orig/* doc/
-	dh_auto_build
-	cd doc && $(MAKE) all
+	#dh_auto_build
+	#cd doc && $(MAKE) all
+	
+	# update doxigen conf file
+	cd doc/doxygen && doxygen -u
+	 
+	$(MAKE) lib
+	$(MAKE) info              #Build Blitz++ texinfo documentation
+	
+	mkdir -p doc/doxygen/html
+	$(MAKE) pdf              #Build Blitz++ pdf documentation
+	$(MAKE) html             #Build Blitz++ html documentation
 
+override_dh_auto_test:
+	#
+	# TODO find . -name \*.htmlneed to be patched to compile properly
+	#$(MAKE) check-testsuite  #Build and check the testsuite
+	
+	$(MAKE) check-examples   #Build and check the examples
+	
+	#$(MAKE) check-benchmarks #Build and check the benchmarks (long)
 
 override_dh_compress:
 	dh_compress --exclude=examples --exclude=testsuite --exclude=.pdf
 
 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
+	
+	#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/lib/pkgconfig/blitz.pc" usr/lib/pkgconfig \
 	            lib/.libs/libblitz.so
@@ -42,12 +69,6 @@
 	# Make sure there will be no *.la file created automagically by d-shlibmove
 	find debian -name "*.la" -delete
 
-	# 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

More information about the debian-science-commits mailing list