r46517 - in /packages/qrupdate/trunk/debian: changelog compat control libqrupdate-dev.dirs libqrupdate-dev.install libqrupdate1.dirs libqrupdate1.docs libqrupdate1.install patches/ patches/inject-ldflags.patch patches/series rules

sebastien at users.alioth.debian.org sebastien at users.alioth.debian.org
Wed Feb 12 19:47:43 UTC 2014


Author: sebastien
Date: Wed Feb 12 19:47:43 2014
New Revision: 46517

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46517
Log:
 * Upload to unstable.
 * Bump to debhelper 9.
 * Add myself to Uploaders.
 * Use canonical URLs for Vcs-* fields.
 * Ship docs only in the -dev package.
 * Bump to Standards-Version 3.9.5.
 * Multi-archify the package.
 * Inject compilation and linking flags from dpkg-buildflags.
 * Rewrite debian/rules using dh.


Added:
    packages/qrupdate/trunk/debian/patches/
    packages/qrupdate/trunk/debian/patches/inject-ldflags.patch
    packages/qrupdate/trunk/debian/patches/series
Removed:
    packages/qrupdate/trunk/debian/libqrupdate-dev.dirs
    packages/qrupdate/trunk/debian/libqrupdate1.dirs
    packages/qrupdate/trunk/debian/libqrupdate1.docs
Modified:
    packages/qrupdate/trunk/debian/changelog
    packages/qrupdate/trunk/debian/compat
    packages/qrupdate/trunk/debian/control
    packages/qrupdate/trunk/debian/libqrupdate-dev.install   (contents, props changed)
    packages/qrupdate/trunk/debian/libqrupdate1.install   (contents, props changed)
    packages/qrupdate/trunk/debian/rules

Modified: packages/qrupdate/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/qrupdate/trunk/debian/changelog?rev=46517&op=diff
==============================================================================
--- packages/qrupdate/trunk/debian/changelog	(original)
+++ packages/qrupdate/trunk/debian/changelog	Wed Feb 12 19:47:43 2014
@@ -1,3 +1,17 @@
+qrupdate (1.1.2-1) unstable; urgency=medium
+
+  * Upload to unstable.
+  * Bump to debhelper 9.
+  * Add myself to Uploaders.
+  * Use canonical URLs for Vcs-* fields.
+  * Ship docs only in the -dev package.
+  * Bump to Standards-Version 3.9.5.
+  * Multi-archify the package.
+  * Inject compilation and linking flags from dpkg-buildflags.
+  * Rewrite debian/rules using dh.
+
+ -- Sébastien Villemot <sebastien at debian.org>  Wed, 12 Feb 2014 20:45:46 +0100
+
 qrupdate (1.1.2-1~exp1) experimental; urgency=low
 
   * Team upload

Modified: packages/qrupdate/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-science/packages/qrupdate/trunk/debian/compat?rev=46517&op=diff
==============================================================================
--- packages/qrupdate/trunk/debian/compat	(original)
+++ packages/qrupdate/trunk/debian/compat	Wed Feb 12 19:47:43 2014
@@ -1 +1 @@
-7
+9

Modified: packages/qrupdate/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/qrupdate/trunk/debian/control?rev=46517&op=diff
==============================================================================
--- packages/qrupdate/trunk/debian/control	(original)
+++ packages/qrupdate/trunk/debian/control	Wed Feb 12 19:47:43 2014
@@ -1,16 +1,20 @@
 Source: qrupdate
 Priority: optional
-Maintainer:  Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
-Uploaders: Jordi Gutiérrez Hermoso <jordigh at gmail.com>
-Build-Depends: debhelper (>= 7), perl-base( >= 5.8.8), gfortran, libblas3gf, liblapack-dev
-Standards-Version: 3.9.3
+Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
+Uploaders: Jordi Gutiérrez Hermoso <jordigh at gmail.com>,
+           Sébastien Villemot <sebastien at debian.org>
+Build-Depends: debhelper (>= 9), perl-base (>= 5.8.8), gfortran, libblas-dev, liblapack-dev,
+               dh-exec, dpkg-dev (>= 1.16.1~)
+Standards-Version: 3.9.5
 Section: libs
 Homepage: http://qrupdate.sf.net
-Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/qrupdate/trunk/
-Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packagesqrupdate/
+Vcs-Svn: svn://anonscm.debian.org/debian-science/packages/qrupdate/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/debian-science/packages/qrupdate/trunk/
 
 Package: libqrupdate1
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Fast updates of QR and Cholesky decompositions
  qrupdate is a Fortran library for QR and Cholesky decompositions. It
@@ -21,6 +25,7 @@
 Package: libqrupdate-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libqrupdate1 (= ${binary:Version}), ${misc:Depends}
 Description: Fast updates of QR and Cholesky decompositions -- static library
  qrupdate is a Fortran library for QR and Cholesky decompositions. It

Modified: packages/qrupdate/trunk/debian/libqrupdate-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/qrupdate/trunk/debian/libqrupdate-dev.install?rev=46517&op=diff
==============================================================================
--- packages/qrupdate/trunk/debian/libqrupdate-dev.install	(original)
+++ packages/qrupdate/trunk/debian/libqrupdate-dev.install	Wed Feb 12 19:47:43 2014
@@ -1,2 +1,4 @@
-usr/lib/lib*.a
-usr/lib/lib*.so
+#!/usr/bin/dh-exec
+
+usr/lib/${DEB_HOST_MULTIARCH}/lib*.a
+usr/lib/${DEB_HOST_MULTIARCH}/lib*.so

Propchange: packages/qrupdate/trunk/debian/libqrupdate-dev.install
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/qrupdate/trunk/debian/libqrupdate1.install
URL: http://svn.debian.org/wsvn/debian-science/packages/qrupdate/trunk/debian/libqrupdate1.install?rev=46517&op=diff
==============================================================================
--- packages/qrupdate/trunk/debian/libqrupdate1.install	(original)
+++ packages/qrupdate/trunk/debian/libqrupdate1.install	Wed Feb 12 19:47:43 2014
@@ -1,2 +1,3 @@
-usr/lib/lib*.so.?.?
-usr/lib/lib*.so.?
+#!/usr/bin/dh-exec
+
+usr/lib/${DEB_HOST_MULTIARCH}/lib*.so.*

Propchange: packages/qrupdate/trunk/debian/libqrupdate1.install
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/qrupdate/trunk/debian/patches/inject-ldflags.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/qrupdate/trunk/debian/patches/inject-ldflags.patch?rev=46517&op=file
==============================================================================
--- packages/qrupdate/trunk/debian/patches/inject-ldflags.patch	(added)
+++ packages/qrupdate/trunk/debian/patches/inject-ldflags.patch	Wed Feb 12 19:47:43 2014
@@ -0,0 +1,17 @@
+Description: Inject LDFLAGS when linking shared library
+Author: Sébastien Villemot <sebastien at debian.org>
+Forwarded: no
+Last-Update: 2014-02-12
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -47,7 +47,7 @@ solib: ../libqrupdate$(SOEXT)
+ 	ar -cr $@ $(OBJS)
+ 
+ ../libqrupdate.so: $(OBJS)
+-	$(FC) $(FFLAGS) -shared -o $@ -Wl,-soname=libqrupdate.so.$(MAJOR) $(OBJS) \
++	$(FC) $(FFLAGS) $(LDFLAGS) -shared -o $@ -Wl,-soname=libqrupdate.so.$(MAJOR) $(OBJS) \
+ 		$(BLAS) $(LAPACK)
+ 
+ ../libqrupdate.dylib: $(OBJS)

Added: packages/qrupdate/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/qrupdate/trunk/debian/patches/series?rev=46517&op=file
==============================================================================
--- packages/qrupdate/trunk/debian/patches/series	(added)
+++ packages/qrupdate/trunk/debian/patches/series	Wed Feb 12 19:47:43 2014
@@ -0,0 +1 @@
+inject-ldflags.patch

Modified: packages/qrupdate/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/qrupdate/trunk/debian/rules?rev=46517&op=diff
==============================================================================
--- packages/qrupdate/trunk/debian/rules	(original)
+++ packages/qrupdate/trunk/debian/rules	Wed Feb 12 19:47:43 2014
@@ -1,54 +1,21 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
-export PREFIX=$(CURDIR)/debian/tmp/usr
+include /usr/share/dpkg/default.mk
 
-build: build-stamp
-build-stamp: 
-	dh_testdir
-	$(MAKE) lib
-	$(MAKE) solib
-	$(MAKE) test
+%:
+	dh $@
+
+override_dh_auto_build:
+	$(MAKE) lib FFLAGS="$(FFLAGS)" LDFLAGS="$(LDFLAGS)"
+	$(MAKE) solib FFLAGS="$(FFLAGS)" LDFLAGS="$(LDFLAGS)"
+	$(MAKE) test FFLAGS="$(FFLAGS)" LDFLAGS="$(LDFLAGS)"
 
 #extract docs from sources
 	cat src/*.f | perl debian/get-function-ref.pl > function-reference
 
-	touch $@
-
-clean: 
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
+override_dh_auto_clean: 
 	$(MAKE) clean
 	rm -f function-reference
-	dh_clean 
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep 
-	dh_installdirs
-	$(MAKE) install
-	dh_install
-
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs -A
-	dh_link
-	dh_makeshlibs
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+override_dh_auto_install:
+	$(MAKE) install DESTDIR=../debian/tmp PREFIX=/usr LIBDIR=lib/$(DEB_HOST_MULTIARCH)




More information about the debian-science-commits mailing list