[minpack] 02/09: * 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
Mon Nov 20 12:51:14 UTC 2017


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

sebastien pushed a commit to branch master
in repository minpack.

commit 98dc30ca2c23c349d516493b708d39e265b75eb3
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Thu Apr 3 16:48:53 2014 +0000

    * 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.
---
 debian/changelog                                   |  14 +++
 debian/compat                                      |   2 +-
 debian/control                                     |  16 +--
 debian/dirs                                        |   2 -
 debian/libminpack1.dirs                            |   1 -
 debian/libminpack1.files                           |   1 -
 debian/libminpack1.install                         |   1 +
 debian/minpack-dev.dirs                            |   2 -
 .../{doc-base.minpack-dev => minpack-dev.doc-base} |   0
 debian/{docs => minpack-dev.docs}                  |   0
 debian/minpack-dev.examples                        |   2 +
 debian/minpack-dev.files                           |   5 -
 debian/minpack-dev.install                         |   3 +
 debian/minpack-dev.manpages                        |   1 +
 debian/rules                                       | 107 ++-------------------
 15 files changed, 41 insertions(+), 116 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5fd38b5..c8e471f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index b0a931c..1f2f838 100644
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,18 @@ Source: minpack
 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 @@ Description: nonlinear equations and nonlinear least squares static library
  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
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index ca882bb..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
diff --git a/debian/libminpack1.dirs b/debian/libminpack1.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/libminpack1.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/libminpack1.files b/debian/libminpack1.files
deleted file mode 100644
index 8aa4466..0000000
--- a/debian/libminpack1.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/lib*.so*
diff --git a/debian/libminpack1.install b/debian/libminpack1.install
new file mode 100644
index 0000000..3ddde58
--- /dev/null
+++ b/debian/libminpack1.install
@@ -0,0 +1 @@
+usr/lib/*/lib*.so.*
diff --git a/debian/minpack-dev.dirs b/debian/minpack-dev.dirs
deleted file mode 100644
index 4418816..0000000
--- a/debian/minpack-dev.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib
-usr/include
diff --git a/debian/doc-base.minpack-dev b/debian/minpack-dev.doc-base
similarity index 100%
rename from debian/doc-base.minpack-dev
rename to debian/minpack-dev.doc-base
diff --git a/debian/docs b/debian/minpack-dev.docs
similarity index 100%
rename from debian/docs
rename to debian/minpack-dev.docs
diff --git a/debian/minpack-dev.examples b/debian/minpack-dev.examples
new file mode 100644
index 0000000..0390669
--- /dev/null
+++ b/debian/minpack-dev.examples
@@ -0,0 +1,2 @@
+debian/Makefile
+debian/t*.c
diff --git a/debian/minpack-dev.files b/debian/minpack-dev.files
deleted file mode 100644
index 96555c8..0000000
--- a/debian/minpack-dev.files
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.la 
-usr/lib/lib*.so
-usr/share/man/man3/*.3
diff --git a/debian/minpack-dev.install b/debian/minpack-dev.install
new file mode 100644
index 0000000..a3c8f6c
--- /dev/null
+++ b/debian/minpack-dev.install
@@ -0,0 +1,3 @@
+usr/include/*
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
diff --git a/debian/minpack-dev.manpages b/debian/minpack-dev.manpages
new file mode 100644
index 0000000..5cb6050
--- /dev/null
+++ b/debian/minpack-dev.manpages
@@ -0,0 +1 @@
+debian/*.3
diff --git a/debian/rules b/debian/rules
index 8bfb8ea..7301c82 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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 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)
+	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	MAKEFLAGS += -j$(NUMJOBS)
 endif
-# FIXME parallel builds don't work
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-
-	touch configure-stamp
 
-fresh:
-	autoreconf -v -i
+%:
+	dh $@ --with=autotools_dev
 
-build: build-stamp
-build-stamp: configure-stamp 
-	dh_testdir
-
-	# Add here commands to compile the package.
+override_dh_auto_configure:
 	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_auto_configure
 
-	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
-	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	
+override_dh_installdocs:
 	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
+	install -D -m 644 ex/file06 debian/minpack-dev/usr/share/doc/minpack-dev/minpack-documentation.txt

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



More information about the debian-science-commits mailing list