[levmar] 01/01: Adjust for newer Debian rules

Tue Apr 1 09:48:03 UTC 2014

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

olebole-guest pushed a commit to branch debian
in repository levmar.

commit 505cc30b267371ddf533ab04bb1251a45a1f1fa1
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Apr 1 11:47:51 2014 +0200

    Adjust for newer Debian rules
---
 debian/changelog                     |  2 +-
 debian/compat                        |  2 +-
 debian/control                       |  9 +++++++--
 debian/copyright                     |  4 ++--
 debian/liblevmar-dev.install         |  3 ++-
 debian/liblevmar2.install            |  3 ++-
 debian/patches/fix_makefile_so.patch | 22 +++++++++++++++-------
 7 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c529586..22c702a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,4 @@ levmar (2.6-1) unstable; urgency=low
 
   * Initial package. Closes: #546202
 
- -- Ole Streicher <debian at liska.ath.cx>  Mon, 16 Apr 2012 13:45:00 +0200
+ -- Ole Streicher <debian at liska.ath.cx>  Tue, 01 Apr 2014 09:45:00 +0200
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 118b3d5..9b10e27 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,18 @@ Source: levmar
 Priority: extra
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Ole Streicher <debian at liska.ath.cx>
-Build-Depends: autotools-dev, debhelper (>= 7.0.50), libf2c2-dev, liblapack-dev
-Standards-Version: 3.9.3
+Build-Depends: autotools-dev,
+               debhelper (>= 9),
+               dh-exec (>= 0.1),
+               liblapack-dev
+Standards-Version: 3.9.5
 Section: science
 Homepage: http://www.ics.forth.gr/~lourakis/levmar/
 
 Package: liblevmar-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: foreign
 Depends: liblevmar2 (= ${binary:Version}), ${misc:Depends}
 Description: Levenberg-Marquardt nonlinear least squares algorithm (devel)
  levmar is a native ANSI C implementation of the Levenberg-Marquardt
@@ -29,6 +33,7 @@ Description: Levenberg-Marquardt nonlinear least squares algorithm (devel)
 Package: liblevmar2
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Levenberg-Marquardt nonlinear least squares algorithm
  levmar is a native ANSI C implementation of the Levenberg-Marquardt
diff --git a/debian/copyright b/debian/copyright
index 55d28e5..a8c9a5d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,10 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: levmar
-Upstream-Author: Manolis Lourakis <lourakis (at) ics (dot) forth (dot) gr>
+Upstream-Author: Manolis Lourakis <lourakis at ics.forth.gr>
 Source: http://www.ics.forth.gr/~lourakis/levmar/
 
 Files: *
-Copyright: Copyright (C) 2004-2009  Manolis Lourakis (lourakis at ics forth gr)
+Copyright: Copyright (C) 2004-2009  Manolis Lourakis
  Institute of Computer Science, Foundation for Research & Technology - Hellas
  Heraklion, Crete, Greece.
 License: GPLv2+
diff --git a/debian/liblevmar-dev.install b/debian/liblevmar-dev.install
old mode 100644
new mode 100755
index 7a88298..e7c2c1a
--- a/debian/liblevmar-dev.install
+++ b/debian/liblevmar-dev.install
@@ -1,2 +1,3 @@
+#! /usr/bin/dh-exec
 levmar.h usr/include/
-sobj/liblevmar.so usr/lib/
+sobj/liblevmar.so usr/lib/${DEB_HOST_MULTIARCH}/
diff --git a/debian/liblevmar2.install b/debian/liblevmar2.install
old mode 100644
new mode 100755
index f825eea..c826f1d
--- a/debian/liblevmar2.install
+++ b/debian/liblevmar2.install
@@ -1 +1,2 @@
-sobj/liblevmar.so.* usr/lib/
+#! /usr/bin/dh-exec
+sobj/liblevmar.so.* usr/lib/${DEB_HOST_MULTIARCH}/
diff --git a/debian/patches/fix_makefile_so.patch b/debian/patches/fix_makefile_so.patch
index 5013161..7ad2c42 100644
--- a/debian/patches/fix_makefile_so.patch
+++ b/debian/patches/fix_makefile_so.patch
@@ -1,9 +1,11 @@
-Author: Daniil Ivanov <daniil.ivanov at gmail.com>
-Description: Actually use LIBS, not just define them; add math library to LIBS;
- remove end line comment
+Author: Daniil Ivanov <daniil.ivanov at gmail.com>, 
+ Ole Streicher <debian at liska.ath.cx>
+Description: Fix the makefile to produce a nice shared lib.
+ Actually use LIBS, not just define them; add math library to LIBS;
+ remove end line comment; uses CPPFLAGS, CFLAGS, and LDFLAGS
 --- a/Makefile.so
 +++ b/Makefile.so
-@@ -6,7 +6,7 @@
+@@ -6,26 +6,33 @@
  # major & minor shared lib numbers
  MAJ=2
  MIN=2
@@ -12,12 +14,13 @@ Description: Actually use LIBS, not just define them; add math library to LIBS;
  CC=gcc
  CONFIGFLAGS=-ULINSOLVERS_RETAIN_MEMORY
  #ARCHFLAGS=-march=pentium4 # YOU MIGHT WANT TO UNCOMMENT THIS FOR P4
-@@ -14,14 +14,21 @@
+-CFLAGS=-fPIC $(CONFIGFLAGS) $(ARCHFLAGS) -O3 -funroll-loops -Wall #-pg
++CFLAGS+=-fPIC $(CONFIGFLAGS)
  LAPACKLIBS_PATH=/usr/local/lib # WHEN USING LAPACK, CHANGE THIS TO WHERE YOUR COMPILED LIBS ARE!
  LIBOBJS=$(ODIR)/lm.o $(ODIR)/Axb.o $(ODIR)/misc.o $(ODIR)/lmlec.o $(ODIR)/lmbc.o $(ODIR)/lmblec.o $(ODIR)/lmbleic.o
  LIBSRCS=lm.c Axb.c misc.c lmlec.c lmbc.c lmblec.c lmbleic.c
 -LAPACKLIBS=-llapack -lblas -lf2c # comment this line if you are not using LAPACK.
-+LAPACKLIBS=-llapack -lblas -lf2c -lm # comment this line if you are not using LAPACK.
++LAPACKLIBS=-llapack -lblas -lm # comment this line if you are not using LAPACK.
                                   # On systems with a FORTRAN (not f2c'ed) version of LAPACK, -lf2c is
                                   # not necessary; on others, -lf2c is equivalent to -lF77 -lI77
  
@@ -26,7 +29,7 @@ Description: Actually use LIBS, not just define them; add math library to LIBS;
 +all: $(ODIR)/liblevmar.so.$(MAJ).$(MIN) $(ODIR)/liblevmar.so.$(MAJ) $(ODIR)/liblevmar.so
  $(ODIR)/liblevmar.so.$(MAJ).$(MIN): $(LIBOBJS)
 -	$(CC) -shared -Wl,-soname,liblevmar.so.$(MAJ) -o $(ODIR)/liblevmar.so.$(MAJ).$(MIN) $(LIBOBJS) #-llapack -lblas -lf2c
-+	$(CC) -shared -Wl,-soname,liblevmar.so.$(MAJ) -o $@ $(LIBOBJS) $(LIBS)
++	$(CC) -shared -Wl,-soname,liblevmar.so.$(MAJ) -o $@ $(LIBOBJS) $(LDFLAGS) $(LIBS)
 +
 +$(ODIR)/liblevmar.so.$(MAJ):
 +	ln -s liblevmar.so.$(MAJ).$(MIN) $@
@@ -36,3 +39,8 @@ Description: Actually use LIBS, not just define them; add math library to LIBS;
  
  # implicit rule for generating *.o files in ODIR from *.c files
  $(ODIR)/%.o : %.c
+-	$(CC) $(CFLAGS) -c $< -o $@
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
+ 
+ 
+ $(ODIR)/lm.o: lm.c lm_core.c levmar.h misc.h compiler.h

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

