[Pkg-bitcoin-commits] [SCM] libblkmaker packaging branch, master, updated. fa7380116d4c1f44f79cedf2c7213b6929fcc9ae

[Dmitry Smirnov]

The following commit has been merged in the master branch:
commit 25d44d0b7138a9df15a748e042e0837666790c04
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Fri Jun 21 09:20:41 2013 +1000

    reference get-orig-source implementation

diff --git a/debian/rules b/debian/rules
index 6abfb5a..2a03d35 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,26 +58,27 @@ override_dh_strip:
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
 
+## http://wiki.debian.org/onlyjob/get-orig-source
+VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\-\d+.*)};')
 .PHONY: get-orig-source
-VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{Version:\s*([\d\.+git]+)}')
 get-orig-source: $(PKG)_$(VER).orig.tar.xz
 	@
 
+UURL = git://gitorious.org/bitcoin/libblkmaker.git
 $(PKG)_$(VER).orig.tar.xz:
+	$(if $(wildcard $(PKG)-$(VER)),$(error $(PKG)-$(VER) exist, aborting..))
 	@echo "# Downloading..."
-	#uscan --noconf --verbose --rename --destdir=$(CURDIR) --check-dirname-level=0 --force-download --download-version $(VER) $(PKD)
-	git clone git://gitorious.org/bitcoin/libblkmaker.git $(PKG)-$(VER) \
+	git clone $(UURL) $(PKG)-$(VER) \
         || $(RM) -r $(PKG)-$(VER)
 	cd $(PKG)-$(VER) \
         && git checkout v$(VER) \
-        && [ -s ChangeLog ] || ( echo "# Generating ChangeLog..." \
-           ; git log --pretty="format:%ad  %aN  <%aE>%n%n%x09* %s%n" --date=short > ChangeLog ) \
         && echo "# Setting times..." \
         && for F in $$(git ls-tree -r --name-only HEAD); do touch --no-dereference -d "$$(git log -1 --format="%ai" -- $$F)" "$$F"; done \
-        && echo "# Cleaning-up..." \
-        && $(RM) -rv .git .git* \
-        && cd .. && echo "# Packing..." \
-        && find -L "$(PKG)-$(VER)" -xdev -type f -print \
-        | sort | XZ_OPT="-6v" tar -caf "$(PKG)_$(VER).orig.tar.xz" -T- --owner=root --group=root --mode=a+rX \
-        && tar -caf $(PKG)_$(VER).orig.tar.xz $(PKG)-$(VER) --owner=root --group=root --mode=a+rX
-	$(RM) -r $(PKG)-$(VER)
+        && [ -s ChangeLog ] || ( echo "# Generating ChangeLog..." \
+           ; git log --pretty="format:%ad  %aN  <%aE>%n%n%x09* %s%n" --date=short > ChangeLog \
+           ; touch -d "$$(git log -1 --format='%ci')" ChangeLog) \
+        && $(RM) -r .git .git*
+	@echo "# Packing..."
+	find -L "$(PKG)-$(VER)" -xdev -type f -print | sort \
+        | XZ_OPT="-6v" tar -caf "$(PKG)_$(VER).orig.tar.xz" -T- --owner=root --group=root --mode=a+rX \
+        && $(RM) -r "$(PKG)-$(VER)"

-- 
libblkmaker packaging