[Pkg-electronics-commits] [gnucap] 02/03: libgnucap-dev package

[felix salfelder]

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

felix-guest pushed a commit to branch master
in repository gnucap.

commit e96c88ac0ee8557749a2d95694a241ce447b79d3
Author: Felix Salfelder <felix at salfelder.org>
Date:   Mon May 16 12:50:17 2016 +0100

    libgnucap-dev package
    
    - try to enable multiarch
    - fix library file name (- separator)
---
 debian/control               |  9 +++++----
 debian/gnucap-dev.install    |  2 --
 debian/libgnucap-dev.install |  2 ++
 debian/libgnucap0.install    |  2 +-
 debian/rules                 | 12 +++++++-----
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/debian/control b/debian/control
index 4ed7cf8..dbf217f 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Hamish Moffatt <hamish at debian.org>,
            أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>,
            Wesley J. Landaker <wjl at icecavern.net>
 Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 8), libreadline-dev
+Build-Depends: debhelper (>= 9), libreadline-dev
 #, hevea, texlive
 Homepage: http://gnucap.org
 Vcs-Git: git://git.debian.org/git/pkg-electronics/gnucap.git
@@ -15,7 +15,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-electronics/gnucap.git
 Package: gnucap
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libgnucap0
-Suggests: gnucap-dev
+Suggests: libgnucap-dev
 Description: GNU Circuit Analysis package
  GNUCAP is a general purpose circuit simulator. It performs nonlinear
  dc and transient analyses, Fourier analysis, and ac analysis
@@ -23,7 +23,7 @@ Description: GNU Circuit Analysis package
  command driven. It can also be run in batch mode or as a server.
  This package contains the main executable and gnucap-modelgen.
 
-Package: gnucap-dev
+Package: libgnucap-dev
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libgnucap0
 Description: GNU Circuit Analysis package
@@ -31,7 +31,7 @@ Description: GNU Circuit Analysis package
  dc and transient analyses, Fourier analysis, and ac analysis
  linearized at an operating point. It is fully interactive and
  command driven. It can also be run in batch mode or as a server.
- This package contains the development headers required to build plugins.
+ This package contains the development headers required.
 
 # maybe later.
 # Package: libgnucap-dev
@@ -40,6 +40,7 @@ Description: GNU Circuit Analysis package
 
 Package: libgnucap0
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: GNU Circuit Analysis package
  GNUCAP is a general purpose circuit simulator. It performs nonlinear
diff --git a/debian/gnucap-dev.install b/debian/gnucap-dev.install
deleted file mode 100644
index 3bdc0a5..0000000
--- a/debian/gnucap-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/include/gnucap/*.h
-usr/lib/lib*.so
diff --git a/debian/libgnucap-dev.install b/debian/libgnucap-dev.install
new file mode 100644
index 0000000..b3ddd68
--- /dev/null
+++ b/debian/libgnucap-dev.install
@@ -0,0 +1,2 @@
+/usr/include/gnucap/*.h
+/usr/lib/*/lib*.so
diff --git a/debian/libgnucap0.install b/debian/libgnucap0.install
index 892f959..41c45a8 100644
--- a/debian/libgnucap0.install
+++ b/debian/libgnucap0.install
@@ -1 +1 @@
-usr/lib/libgnucap0.so
+/usr/lib/*/libgnucap-*.so
diff --git a/debian/rules b/debian/rules
index 9c737b7..3a24099 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
 CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
 CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
@@ -7,7 +8,7 @@ LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
 
 LN_S = ln -sf
 
-pkglibdir=/usr/lib/gnucap
+pkglibdir=/usr/lib/$(DEB_HOST_MULTIARCH)/gnucap
 
 %:
 	dh $@
@@ -22,10 +23,10 @@ override_dh_auto_build:
 	$(MAKE) -C lib \
 	        LDFLAGS="-shared -Wl,--enable-new-dtags \
 	                         -Wl,-rpath -Wl,${pkglibdir}\
-	                         -Wl,-soname -Wl,libgnucap0.so" \
+	                         -Wl,-soname -Wl,libgnucap-0.so" \
 	        CPPFLAGS="$(CPPFLAGS)" \
 	        CXXFLAGS="$(CXXFLAGS)"
-	cd $(PWD)/lib/O; $(LN_S) libgnucap.so libgnucap0.so
+	cd $(PWD)/lib/O; $(LN_S) libgnucap.so libgnucap-0.so
 
 	dh_auto_build --parallel -- \
 	            notyet_LDFLAGS="$(LDFLAGS)" \
@@ -38,9 +39,10 @@ override_dh_auto_install:
 
 	$(MAKE) install -C lib \
 	        DESTDIR=$(PWD)/debian/tmp
+	mkdir -p $(PWD)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
 	mv $(PWD)/debian/tmp/usr/lib/libgnucap.so \
-	   $(PWD)/debian/tmp/usr/lib/libgnucap0.so
-	cd $(PWD)/debian/tmp/usr/lib/; $(LN_S) libgnucap0.so libgnucap.so
+	   $(PWD)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libgnucap-0.so
+	cd $(PWD)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH); $(LN_S) libgnucap-0.so libgnucap.so
 
 	$(MAKE) install -C modelgen \
 	        DESTDIR=$(PWD)/debian/tmp

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-electronics/gnucap.git