r36550 - in /packages/libblitz/trunk/debian: changelog control libblitz-doc.files libblitz-doc.install patches/series rules
tille at users.alioth.debian.org
tille at users.alioth.debian.org
Thu May 27 07:05:06 UTC 2010
Author: tille
Date: Thu May 27 07:04:57 2010
New Revision: 36550
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36550
Log:
Current state of packaging which does NOT build, asking for help on mailing list ...
Added:
packages/libblitz/trunk/debian/libblitz-doc.install
Removed:
packages/libblitz/trunk/debian/libblitz-doc.files
Modified:
packages/libblitz/trunk/debian/changelog
packages/libblitz/trunk/debian/control
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=36550&op=diff
==============================================================================
--- packages/libblitz/trunk/debian/changelog (original)
+++ packages/libblitz/trunk/debian/changelog Thu May 27 07:04:57 2010
@@ -1,3 +1,14 @@
+blitz++ (1:0.9-11) UNRELEASED; 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}"
+ issue, hopefully Closes: #548928
+
+ -- Andreas Tille <tille at debian.org> Thu, 27 May 2010 08:36:34 +0200
+
blitz++ (1:0.9-10) unstable; urgency=low
* Standards-Version: 3.8.3 (added README.source)
Modified: packages/libblitz/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/libblitz/trunk/debian/control?rev=36550&op=diff
==============================================================================
--- packages/libblitz/trunk/debian/control (original)
+++ packages/libblitz/trunk/debian/control Thu May 27 07:04:57 2010
@@ -7,8 +7,8 @@
Build-Depends: gfortran | fortran-compiler, autotools-dev,
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, quilt
-Standards-Version: 3.8.3
+ texi2html, texinfo, doxygen, graphviz, cdbs, quilt
+Standards-Version: 3.8.4
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/
Added: packages/libblitz/trunk/debian/libblitz-doc.install
URL: http://svn.debian.org/wsvn/debian-science/packages/libblitz/trunk/debian/libblitz-doc.install?rev=36550&op=file
==============================================================================
--- packages/libblitz/trunk/debian/libblitz-doc.install (added)
+++ packages/libblitz/trunk/debian/libblitz-doc.install Thu May 27 07:04:57 2010
@@ -1,0 +1,1 @@
+doc/doxygen/html/* usr/share/doc/libblitz-doc/html/doxygen
Modified: packages/libblitz/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/libblitz/trunk/debian/patches/series?rev=36550&op=diff
==============================================================================
--- packages/libblitz/trunk/debian/patches/series (original)
+++ packages/libblitz/trunk/debian/patches/series Thu May 27 07:04:57 2010
@@ -1,3 +1,2 @@
01_gcc_43_missing_includes.patch
01_gcc34_amd64.patch
-30_fix_doxygen_install_target.patch
Modified: packages/libblitz/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/libblitz/trunk/debian/rules?rev=36550&op=diff
==============================================================================
--- packages/libblitz/trunk/debian/rules (original)
+++ packages/libblitz/trunk/debian/rules Thu May 27 07:04:57 2010
@@ -1,14 +1,10 @@
#!/usr/bin/make -f
-# debian/rules for blitz++
-# GNU copyright
-# 1999 by John Lapeyre <lapeyre at physics.arizona.edu>
-# 2000 to 2007 Konstantinos Margaritis <markos at debian.org>
-# 2007 Andreas Tille <tille at debian.org>
+# debian/rules for blitz++ using cdbs
+# 2009 Andreas Tille <tille at debian.org>
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-include /usr/share/quilt/quilt.make
+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
version=0.9
libname=libblitz
@@ -16,91 +12,25 @@
PREFIX = /usr
-build: patch build-stamp
-build-stamp:
- dh_testdir
+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
- # Save original blitz.info to make sure compiling twice in a row will work
- cd doc; mv blitz.info blitz.info.save
- F77=gfortran ./configure --prefix=$(PREFIX) --with-cxx=gcc --with-blas --enable-debug --enable-static --enable-64bit --enable-shared --enable-doxygen
- $(MAKE) lib
- cd doc && $(MAKE) all
+DEB_MAKE_INVOKE := $(DEB_MAKE_INVOKE); cd doc && $(MAKE) all
- touch build-stamp
+DEB_INSTALL_INVOKE := mv doc/blitz.info.save doc/blitz.info; $(DEB_MAKE_INVOKE); cd doc && $(MAKE) all
-clean: unpatch
- dh_testdir
- dh_testroot
- rm -f build-stamp
+DEB_COMPRESS_EXCLUDE = examples testsuite pdf
- [ ! -f Makefile ] || $(MAKE) distclean
-
- rm -f blitz/blitz.info
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean
- dh_installdirs
- $(MAKE) install prefix=`pwd`/debian/tmp/$(PREFIX)
- # Move old blitz.info right into place
- cd doc; mv blitz.info.save blitz.info
- # instead of tweaking Upstream Makefile move docs into position
- # afterwards
- mkdir -p `pwd`/debian/tmp/$(PREFIX)/share/doc/libblitz-doc/html/doxygen
- mv `pwd`/doc/doxygen/html/* `pwd`/debian/tmp/$(PREFIX)/share/doc/libblitz-doc/html/doxygen
- # avoid bashism because package should build with dash
+common-binary-post-install-arch::
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
- # Care for dynamic library
- # . debian/
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
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir -i
- dh_testroot -i
- dh_installdirs -i
- dh_installchangelogs -i
- dh_installdocs -i
- dh_installexamples -i
- dh_movefiles -i
- dh_lintian -i
- dh_link -i
- dh_compress -i -Xexamples -Xtestsuite
- dh_fixperms -i
- dh_installdeb -i
- dh_shlibdeps -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir -a
- dh_testroot -a
- dh_installdirs -a
- dh_install -a
- dh_installdocs -a
- dh_installinfo -a
- dh_installexamples -a
- dh_installchangelogs -a ChangeLog
- dh_lintian -a
- dh_strip -a
- dh_compress -a -Xexamples -Xtestsuite -Xpdf
- dh_fixperms -a
- dh_makeshlibs -V '$(pkgname) (>= $(version))'
- dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+# binary-arch: build install
+# ...
+# dh_makeshlibs -V '$(pkgname) (>= $(version))'
+# ...
More information about the debian-science-commits
mailing list