[Pkg-electronics-commits] [gnucap] 43/43: adjust to 20171003, some cleanup

[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 372e45e5446fd12749c6fec19224d8f6bfc197cc
Author: Felix Salfelder <felix at salfelder.org>
Date:   Wed Oct 4 04:04:50 2017 +0100

    adjust to 20171003, some cleanup
---
 debian/changelog |  8 ++++++--
 debian/rules     | 12 ++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3f3bcc1..61875e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-gnucap (1:0.36.20160724~0d0887b8-1) unstable; urgency=medium
+gnucap (1:0.36~20171003-1) unstable; urgency=medium
 
   * Non-maintainer upload.
   * get-orig-source, snapshotting upstream git
@@ -8,8 +8,12 @@ gnucap (1:0.36.20160724~0d0887b8-1) unstable; urgency=medium
   * default plugins package
   * defuse SYSTEMSTARTPATH, use GNUCAP_SSP
   * gnucap-conf + man page
+  * TODO:
+   - useless dependency
+   - can't extract version from library..
+   - testing
 
- -- Felix Salfelder <felix at salfelder.org>  Sun, 25 Sep 2016 11:20:19 +0100
+ -- Felix Salfelder <felix at salfelder.org>  Wed, 04 Oct 2017 04:02:08 +0100
 
 gnucap (1:0.36~20091207-2) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 0088519..375fc80 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ SONAME=libgnucap-d0
 # 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
+ORIG_TARBALL=../gnucap_${tarball_version}.orig.tar.gz
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
@@ -42,8 +42,6 @@ EXEC_LDFLAGS = -rdynamic -L../../lib/O
 override_dh_auto_build:
 	$(MAKE) -C lib \
 	        LDFLAGS="$(LIB_LDFLAGS) \
-	                 -Wl,--enable-new-dtags \
-	                 -Wl,-rpath -Wl,${pkglibdir} \
 	                 -Wl,-soname -Wl,${SONAME}.so \
 	                  $(LDFLAGS)" \
 	        CPPFLAGS="$(CPPFLAGS)" \
@@ -96,6 +94,8 @@ override_dh_auto_clean:
 	#-rm man/gnucap-man.pdf
 	#-rm -rf man/html
 	rm -rf main/gnucap-conf
+	rm -rf main/gnucap.conf
+	rm -rf main/config.h
 	rm -rf */Makefile -f
 	rm -rf */Make2 -f
 	rm -rf */O/ -rf
@@ -113,9 +113,13 @@ override_dh_installdocs:
 override_dh_compress:
 	dh_compress -X.pdf -X.ckt
 
+# create tarball equivalent to upstream. use
+# tar -xOzf ../gnucap-20171003.tar.gz | sort | sha1sum
+# to check.
 get-orig-source:
+	@echo creating tarball from ${upstream_commit}
 	[ -d .git ] && git archive ${upstream_commit} | \
-	               bzip2 > $(ORIG_TARBALL) || :
+	               gzip > $(ORIG_TARBALL) || :
 	[ -d .git ] || git archive --format=tar \
 		--remote=$(UPSTREAM_REPO) ${upstream_commit}  | \
 	             tar -xzf > $(ORIG_TARBALL)

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