[SCM] libdvd-pkg/master: use `wget` to retrieve orig.tar to reduce dependencies;
onlyjob at users.alioth.debian.org
onlyjob at users.alioth.debian.org
Fri Sep 13 05:09:05 UTC 2013
The following commit has been merged in the master branch:
commit 0ed637cf026e92f9966c29949749c03e3c5d3c50
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date: Fri Sep 13 09:32:26 2013 +1000
use `wget` to retrieve orig.tar to reduce dependencies;
fallback to `uscan` in case of failure;
added "wget | devscripts" to Build-Depends.
diff --git a/debian/control b/debian/control
index 342ca78..616dbfb 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Package: libdvd-pkg
Architecture: all
Provides: ${guest:Provides}
Depends: ${misc:Depends} ,build-essential
+ ,wget | devscripts
,${guest:Build-Depends}
Recommends: ${guest:Recommends} ,libcap2-bin
Suggests: ${guest:Suggests}
diff --git a/libdvdcss/debian/rules b/libdvdcss/debian/rules
index b1308f7..724718b 100755
--- a/libdvdcss/debian/rules
+++ b/libdvdcss/debian/rules
@@ -21,6 +21,9 @@ override_dh_builddeb:
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+:)?(\d.*)(?:\-\d+.*)};')
.PHONY: get-orig-source
-get-orig-source:
- uscan --noconf --verbose --rename --destdir=$(CURDIR) --check-dirname-level=0 --force-download --download-current-version $(PKD)
+get-orig-source: $(info I: $(PKG)_$(VER))
+ wget --tries=3 --timeout=40 --read-timeout=40 --continue -O libdvdcss_$(VER).orig.tar.bz2 \
+ http://download.videolan.org/pub/libdvdcss/$(VER)/libdvdcss-$(VER).tar.bz2 \
+ || uscan --noconf --verbose --rename --destdir=$(CURDIR) --check-dirname-level=0 --force-download --download-current-version $(PKD)
--
libdvdcss-pkg packaging
More information about the pkg-multimedia-commits
mailing list