[Pkg-electronics-commits] [gnucap] 01/01: misc

Sun Aug 7 00:34:13 UTC 2016

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

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

commit f8d1b15f0ce0c3e884779a6aef804d31059f919d
Author: Felix Salfelder <felix at salfelder.org>
Date:   Fri Aug 5 14:31:58 2016 +0100

    misc
    
    - gnucap-conf man page
    - version bump
    - put sections in d/control
    - better get-orig-source
    - lintian stuff
    - fix some details
---
 debian/changelog                                   | 10 ++---
 debian/control                                     | 15 +++----
 debian/gnucap-conf.1                               | 50 ++++++++++++++++++++++
 debian/{libgnucap0.install => libgnucap-0.install} |  0
 debian/libgnucap-dev.install                       |  2 +-
 debian/rules                                       | 24 +++++++----
 6 files changed, 79 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b50bba0..527edea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,14 @@
-gnucap (1:0.36~20160500.fbf55cc8-1) UNRELEASED; urgency=medium
+gnucap (1:0.36~20160724.b2f0e646-1) UNRELEASED; urgency=medium
 
   * Non-maintainer upload.
-  * library package
-  * gnucap-dev package
+  * library package, libgnucap-0
+  * libgnucap-dev package (Close #693267)
   * bump compat to 9
   * default plugins package
   * defuse SYSTEMSTARTPATH, use GNUCAP_SSP
+  * gnucap-conf + man page
   * TODO:
-    - gnucap-conf
-    - upstream tarball
+    - lintian...
 
  -- Felix Salfelder <felix at salfelder.org>  Tue, 02 Feb 2016 22:06:23 +0100
 
diff --git a/debian/control b/debian/control
index dbf217f..5b487a5 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-electronics/gnucap.git
 
 Package: gnucap
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libgnucap0
+Section: electronics
+Depends: ${shlibs:Depends}, ${misc:Depends}, libgnucap-0
 Suggests: libgnucap-dev
 Description: GNU Circuit Analysis package
  GNUCAP is a general purpose circuit simulator. It performs nonlinear
@@ -25,7 +26,9 @@ Description: GNU Circuit Analysis package
 
 Package: libgnucap-dev
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libgnucap0
+Section: libdevel
+Priority: extra
+Depends: ${shlibs:Depends}, ${misc:Depends}, libgnucap-0
 Description: GNU Circuit Analysis package
  GNUCAP is a general purpose circuit simulator. It performs nonlinear
  dc and transient analyses, Fourier analysis, and ac analysis
@@ -33,14 +36,10 @@ Description: GNU Circuit Analysis package
  command driven. It can also be run in batch mode or as a server.
  This package contains the development headers required.
 
-# maybe later.
-# Package: libgnucap-dev
-# Architecture: any
-# Depends: ${shlibs:Depends}, ${misc:Depends}, libgnucap0
-
-Package: libgnucap0
+Package: libgnucap-0
 Architecture: any
 Multi-Arch: same
+Section: libs
 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-conf.1 b/debian/gnucap-conf.1
new file mode 100644
index 0000000..859c9d5
--- /dev/null
+++ b/debian/gnucap-conf.1
@@ -0,0 +1,50 @@
+.\" Hey, Emacs!  This is an -*- nroff -*- source file.
+.TH GNUCAP-conf 1 "August 2016" "Debian Project" "Debian GNU"
+
+.SH NAME
+gnucap-conf \- GNU Circuit Analysis Package, configuration
+.SH SYNOPSIS
+.B gnucap-conf [what]
+.br
+.SH DESCRIPTION
+.I GNUCAP-CONF
+
+Print various configuration variables that are useful for building extensions. The approach is
+close to pkg-config but without the dependency.
+
+.SH OPTIONS
+
+.TP
+what is one of
+.TP
+\fI  --cppflags
+.TP
+\fI  --cxxflags
+.TP
+\fI  --cxx
+.TP
+\fI  --ldflags
+.TP
+\fI  --pkglibdir
+.TP
+\fI  --libdir
+.TP
+\fI  --libs
+.TP
+\fI  --exec-prefix
+.TP
+\fI  --data
+
+.SH FILES
+.B /usr/share/doc/gnucap/bugs
+for a list of known bugs in this release.
+.PP
+GNUCAP is an ongoing research project.  It is being released in a
+preliminary phase in hopes that it will be useful and that others
+will use it as a thrust or base for their research.
+
+.SH AUTHOR
+GNUCAP is being written by Albert Davis <ad211 at freeelectron.net>
+.PP
+This manual page was written by Felix Salfelder for the Debian package of
+gnucap. See also .B /usr/share/doc/gnucap/manual.
diff --git a/debian/libgnucap0.install b/debian/libgnucap-0.install
similarity index 100%
rename from debian/libgnucap0.install
rename to debian/libgnucap-0.install
diff --git a/debian/libgnucap-dev.install b/debian/libgnucap-dev.install
index b3ddd68..ff74e71 100644
--- a/debian/libgnucap-dev.install
+++ b/debian/libgnucap-dev.install
@@ -1,2 +1,2 @@
 /usr/include/gnucap/*.h
-/usr/lib/*/lib*.so
+/usr/lib/*/libgnucap.so
diff --git a/debian/rules b/debian/rules
index 600931d..f4e64f0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,15 @@
 #!/usr/bin/make -f
 
-upstream_commit = fbf55cc8fb8afa3e5f74231cb3761c294f5b687d
+export DH_VERBOSE=1
+
+upstream_commit = b2f0e646a9478b4475d8803198d92eb04b5b7b47
 # must match changelog (fetch from there?)
 tarball_version = 0.36~20160500.fbf55cc8
 
 # upstream_commit_short = $(shell echo $(upstream_commit) | sed -e 's/\(........\).*/\1/')
+#
+UPSTREAM_REPO=git://git.savannah.gnu.org/gnucap.git
+ORIG_TARBALL=../gnucap_${tarball_version}.orig.tar.bz2
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
@@ -21,6 +26,8 @@ pkglibdir=/usr/lib/$(DEB_HOST_MULTIARCH)/gnucap
 
 override_dh_auto_configure:
 	./configure --prefix=/usr
+	sed -i 's/-lterminfo//' lib/Make2
+
 
 	grep GNUCAP_SSP include/md.h || \
 	sed -i '/SYSTEMSTARTPATH/s/"PATH"/"GNUCAP_SSP"/' include/md.h
@@ -40,9 +47,10 @@ override_dh_auto_build:
 	            CXXFLAGS="$(CXXFLAGS)"
 #	#$(MAKE) -C man html/index.html
 
-override_dh_auto_install:
-	# dh_auto_install # not yet.
+# pick subdirectories one by one. options do not propagate correctly
+# (this is a terrible mess...)
 
+override_dh_auto_install:
 	$(MAKE) install -C lib \
 	        DESTDIR=$(PWD)/debian/tmp
 	mkdir -p $(PWD)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
@@ -85,10 +93,10 @@ override_dh_compress:
 	dh_compress -X.pdf -X.ckt
 
 get-orig-source:
-	git clone git://git.savannah.gnu.org/gnucap.git gnucap-${tarball_version}
-	cd gnucap-${tarball_version}; git checkout ${upstream_commit}
-	rm -rf gnucap-${tarball_version}.git
-	tar -cjf ../gnucap_${tarball_version}.orig.tar.bz2 gnucap-${tarball_version}
-	rm -rf gnucap-${tarball_version}
+	[ -d .git ] && git archive ${upstream_commit} | \
+	               bzip2 > $(ORIG_TARBALL) || :
+	[ -d .git ] || git archive --format=tar \
+		--remote=$(UPSTREAM_REPO) ${upstream_commit}  | \
+	             tar -xzf > $(ORIG_TARBALL)
 
 .PHONY: get-orig-source

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

