r46609 - /packages/minpack/trunk/debian/

sebastien at users.alioth.debian.org sebastien at users.alioth.debian.org
Thu Apr 3 16:48:53 UTC 2014 

Author: sebastien
Date: Thu Apr  3 16:48:53 2014
New Revision: 46609

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46609
Log:
* Rewrite debian/rules using dh.
* Inject compilation and linking flags from dpkg-buildflags.
* Use autotools-dev to regenerate config.{sub,guess}. (Closes: #734575)
* Multi-archify the package.
* Remove incorrect dependency of minpack-dev on libc6-dev (the latter
  does not exist on !linux).
* Add myself to Uploaders.
* Bump to debhelper compat level 9.
* Bump to Standards-Version 3.9.5.


Added:
    packages/minpack/trunk/debian/libminpack1.install
      - copied, changed from r46586, packages/minpack/trunk/debian/libminpack1.files
    packages/minpack/trunk/debian/minpack-dev.doc-base
      - copied unchanged from r46586, packages/minpack/trunk/debian/doc-base.minpack-dev
    packages/minpack/trunk/debian/minpack-dev.docs
      - copied unchanged from r46586, packages/minpack/trunk/debian/docs
    packages/minpack/trunk/debian/minpack-dev.examples
    packages/minpack/trunk/debian/minpack-dev.install
      - copied, changed from r46586, packages/minpack/trunk/debian/minpack-dev.files
    packages/minpack/trunk/debian/minpack-dev.manpages
Removed:
    packages/minpack/trunk/debian/dirs
    packages/minpack/trunk/debian/doc-base.minpack-dev
    packages/minpack/trunk/debian/docs
    packages/minpack/trunk/debian/libminpack1.dirs
    packages/minpack/trunk/debian/libminpack1.files
    packages/minpack/trunk/debian/minpack-dev.dirs
    packages/minpack/trunk/debian/minpack-dev.files
Modified:
    packages/minpack/trunk/debian/changelog
    packages/minpack/trunk/debian/compat
    packages/minpack/trunk/debian/control
    packages/minpack/trunk/debian/rules

Modified: packages/minpack/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/minpack/trunk/debian/changelog?rev=46609&op=diff
==============================================================================
--- packages/minpack/trunk/debian/changelog	(original)
+++ packages/minpack/trunk/debian/changelog	Thu Apr  3 16:48:53 2014
@@ -1,3 +1,17 @@
+minpack (19961126+dfsg1-2) UNRELEASED; urgency=medium
+
+  * Rewrite debian/rules using dh.
+  * Inject compilation and linking flags from dpkg-buildflags.
+  * Use autotools-dev to regenerate config.{sub,guess}. (Closes: #734575)
+  * Multi-archify the package.
+  * Remove incorrect dependency of minpack-dev on libc6-dev (the latter
+    does not exist on !linux).
+  * Add myself to Uploaders.
+  * Bump to debhelper compat level 9.
+  * Bump to Standards-Version 3.9.5.
+
+ -- Sébastien Villemot <sebastien at debian.org>  Thu, 03 Apr 2014 17:28:18 +0200
+
 minpack (19961126+dfsg1-1) unstable; urgency=low
 
   * Team upload.

Modified: packages/minpack/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-science/packages/minpack/trunk/debian/compat?rev=46609&op=diff
==============================================================================
--- packages/minpack/trunk/debian/compat	(original)
+++ packages/minpack/trunk/debian/compat	Thu Apr  3 16:48:53 2014
@@ -1 +1 @@
-5
+9

Modified: packages/minpack/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/minpack/trunk/debian/control?rev=46609&op=diff
==============================================================================
--- packages/minpack/trunk/debian/control	(original)
+++ packages/minpack/trunk/debian/control	Thu Apr  3 16:48:53 2014
@@ -2,15 +2,18 @@
 Section: devel
 Priority: optional
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
-Build-Depends: debhelper (>> 5.0.0), gfortran, libtool
-Standards-Version: 3.9.2
+Uploaders: Sébastien Villemot <sebastien at debian.org>
+Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), autotools-dev, gfortran,
+               libtool
+Standards-Version: 3.9.5
 Homepage: http://www.netlib.org/minpack/
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/minpack/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/minpack/trunk/
 
 Package: minpack-dev
 Architecture: any
-Depends: libminpack1 (= ${binary:Version}), libc6-dev,${misc:Depends}
+Multi-Arch: same
+Depends: libminpack1 (= ${binary:Version}), ${misc:Depends}
 Description: nonlinear equations and nonlinear least squares static library
  Minpack includes software for solving nonlinear equations and
  nonlinear least squares problems.  Five algorithmic paths each include
@@ -24,10 +27,11 @@
  This package provides the headers, man pages, examples, and static library.
 
 Package: libminpack1
+Section: libs
 Architecture: any
-Depends: ${shlibs:Depends},${misc:Depends}
-Replaces: minpack1
-Conflicts: minpack1
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: nonlinear equations and nonlinear least squares shared library
  Minpack includes software for solving nonlinear equations and
  nonlinear least squares problems.  Five algorithmic paths each include

Copied: packages/minpack/trunk/debian/libminpack1.install (from r46586, packages/minpack/trunk/debian/libminpack1.files)
URL: http://svn.debian.org/wsvn/debian-science/packages/minpack/trunk/debian/libminpack1.install?rev=46609&op=diff
==============================================================================
--- packages/minpack/trunk/debian/libminpack1.files	(original)
+++ packages/minpack/trunk/debian/libminpack1.install	Thu Apr  3 16:48:53 2014
@@ -1 +1 @@
-usr/lib/lib*.so*
+usr/lib/*/lib*.so.*

Added: packages/minpack/trunk/debian/minpack-dev.examples
URL: http://svn.debian.org/wsvn/debian-science/packages/minpack/trunk/debian/minpack-dev.examples?rev=46609&op=file
==============================================================================
--- packages/minpack/trunk/debian/minpack-dev.examples	(added)
+++ packages/minpack/trunk/debian/minpack-dev.examples	Thu Apr  3 16:48:53 2014
@@ -0,0 +1,2 @@
+debian/Makefile
+debian/t*.c

Copied: packages/minpack/trunk/debian/minpack-dev.install (from r46586, packages/minpack/trunk/debian/minpack-dev.files)
URL: http://svn.debian.org/wsvn/debian-science/packages/minpack/trunk/debian/minpack-dev.install?rev=46609&op=diff
==============================================================================
--- packages/minpack/trunk/debian/minpack-dev.files	(original)
+++ packages/minpack/trunk/debian/minpack-dev.install	Thu Apr  3 16:48:53 2014
@@ -1,5 +1,3 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.la 
-usr/lib/lib*.so
-usr/share/man/man3/*.3
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so

Added: packages/minpack/trunk/debian/minpack-dev.manpages
URL: http://svn.debian.org/wsvn/debian-science/packages/minpack/trunk/debian/minpack-dev.manpages?rev=46609&op=file
==============================================================================
--- packages/minpack/trunk/debian/minpack-dev.manpages	(added)
+++ packages/minpack/trunk/debian/minpack-dev.manpages	Thu Apr  3 16:48:53 2014
@@ -0,0 +1 @@
+debian/*.3

Modified: packages/minpack/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/minpack/trunk/debian/rules?rev=46609&op=diff
==============================================================================
--- packages/minpack/trunk/debian/rules	(original)
+++ packages/minpack/trunk/debian/rules	Thu Apr  3 16:48:53 2014
@@ -3,109 +3,20 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# option 2, assuming the library is created as .libs/libfoo.so.2.0.5 or so
-version=`ls .libs/lib*.so.* | \
- awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-major=`ls .libs/lib*.so.* | \
- awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
+include /usr/share/dpkg/buildflags.mk
 
-FFLAGS = -Wall -g
-INSTALL = install
-INSTALL_FILE    = $(INSTALL) -p    -o root -g root  -m  644
-INSTALL_PROGRAM = $(INSTALL) -p    -o root -g root  -m  755
-INSTALL_SCRIPT  = $(INSTALL) -p    -o root -g root  -m  755
-INSTALL_DIR     = $(INSTALL) -p -d -o root -g root  -m  755
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	MAKEFLAGS += -j$(NUMJOBS)
+endif
 
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-    FFLAGS += -O0
-else
-    FFLAGS += -O2
-endif
-ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-    INSTALL_PROGRAM += -s
-endif
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-    NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))    MAKEFLAGS += -j$(NUMJOBS)
-endif
-# FIXME parallel builds don't work
+%:
+	dh $@ --with=autotools_dev
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
+override_dh_auto_configure:
+	chmod +x configure	# was added by Debian patch, so had wrong permissions
+	dh_auto_configure
 
-	touch configure-stamp
-
-fresh:
-	autoreconf -v -i
-
-build: build-stamp
-build-stamp: configure-stamp 
-	dh_testdir
-
-	# Add here commands to compile the package.
-	chmod +x configure	# was added by Debian patch, so had wrong permissions
-	F77=gfortran ./configure --prefix=/usr
-	$(MAKE) $(MAKEFLAGS) FFLAGS="$(FFLAGS)"
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp conftest
-
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	# Add here commands to install the package into debian/tmp
-	# (dh_movefiles moves them to the final locations)
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+override_dh_installdocs:
+	dh_installdocs
 	install -D -m 644 ex/file06 debian/minpack-dev/usr/share/doc/minpack-dev/minpack-documentation.txt
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_movefiles
-
-#	dh_installdebconf	
-	dh_installdocs
-	dh_installexamples debian/Makefile debian/t*.c
-	dh_installmenu
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-	dh_installcron
-	dh_installman debian/*.3
-	dh_installinfo
-#	dh_undocumented
-	dh_installchangelogs 
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-#	dh_perl
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure

More information about the debian-science-commits mailing list