[Pkg-bitcoin-commits] [p2pool] 01/04: simplify get-orig-source in favour of Files-Excluded/repacksuffix.
Dmitry Smirnov
onlyjob at moszumanska.debian.org
Sat Jul 4 05:26:43 UTC 2015
This is an automated email from the git hooks/post-receive script.
onlyjob pushed a commit to branch master
in repository p2pool.
commit c43fc43
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date: Sat Jul 4 05:15:03 2015
simplify get-orig-source in favour of Files-Excluded/repacksuffix.
---
debian/copyright | 5 +++++
debian/rules | 27 ++++-----------------------
debian/watch | 6 +++---
3 files changed, 12 insertions(+), 26 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index 5048d11..c36fd23 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,11 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
Upstream-Name: p2pool
Upstream-Contact: ????????????
Source: https://github.com/forrestv/p2pool
+Files-Excluded:
+ fpconst.py
+ SOAPpy
+ wstools
+ web-static/d3.v2.min.js
Files: *
Copyright: ???????
diff --git a/debian/rules b/debian/rules
index 5b57c2b..3471496 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,35 +21,16 @@ p2pool.1:
-E 's{^\.SS\s+"optional\s+arguments:"}{\n.SH OPTIONS\n}; # create OPTIONS section' \
-pi $@
-override_dh_builddeb:
- dh_builddeb -- -Zxz
-
## http://wiki.debian.org/onlyjob/get-orig-source
PKD := $(abspath $(dir $(MAKEFILE_LIST)))
PKG = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
-VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{Version:\s*([\d\.]+)}')
-DTYPE = +dfsg
+VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s*([\d\.]+)}')
.PHONY: get-orig-source
get-orig-source: $(PKG)_$(VER)$(DTYPE).orig.tar.xz $(info I: $(PKG)_$(VER)$(DTYPE))
@
$(PKG)_$(VER)$(DTYPE).orig.tar.xz:
- @echo "# Downloading..."
- uscan --noconf --verbose --rename --destdir=$(CURDIR) --check-dirname-level=0 --force-download --download-version $(VER) $(PKD)
$(if $(wildcard $(PKG)-$(VER)),$(error $(PKG)-$(VER) exist, aborting..))
- @echo "# Extracting..."
- mkdir $(PKG)-$(VER) \
- && tar -xf $(PKG)_$(VER).orig.tar.* --directory $(PKG)-$(VER) --strip-components 1 \
- || $(RM) -r $(PKG)-$(VER)
- @echo "# Cleaning-up..."
- cd $(PKG)-$(VER) \
- && $(RM) -r -v \
- fpconst.py \
- SOAPpy \
- wstools \
- web-static/d3.v2.min.js
- #$(RM) -v $(PKG)_$(VER).orig.tar.*
- @echo "# Packing..."
- find -L "$(PKG)-$(VER)" -xdev -type f -print | sort \
- | XZ_OPT="-7v" tar -caf "$(PKG)_$(VER)$(DTYPE).orig.tar.xz" -T- --owner=root --group=root --mode=a+rX \
- && $(RM) -r "$(PKG)-$(VER)"
+ @echo "# Downloading..."
+ uscan --noconf --verbose --rename --repack --compression xz --destdir=$(CURDIR) \
+ --check-dirname-level=0 --force-download --download-version $(VER) $(PKD)
diff --git a/debian/watch b/debian/watch
index c4c7de8..d81c947 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,8 +1,8 @@
# uscan(1) configuration file.
version=3
-# Use 'debian/rules get-orig-source' command to generate DFSG-repackaged archive.
-
-opts=dversionmangle=s/\+dfsg\d*// \
+opts=\
+repacksuffix=+dfsg,\
+dversionmangle=s/\+dfsg\d*// \
https://github.com/forrestv/p2pool/releases \
.*/archive/(\d[\d\.]+)\.tar\.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/p2pool.git
More information about the Pkg-bitcoin-commits
mailing list