debian/rules | 26 +++++++++++++++++++++++++- debian/watch | 10 +++++++--- 2 files changed, 32 insertions(+), 4 deletions(-)
New commits: commit b9e464fd073b2133952f870f3cd98401de3d8753 Author: Christopher James Halse Rogers <[email protected]> Date: Wed May 19 18:41:45 2010 +1000 get-orig-source: Now more make-y, with less debugging output! diff --git a/debian/rules b/debian/rules index 356e6a0..063c646 100755 --- a/debian/rules +++ b/debian/rules @@ -278,15 +278,17 @@ TARBALL = $(shell echo mesa_$(UPVERSION).orig.tar.gz | tr -d ' ') DEMOS_SOURCE = $(shell echo MesaDemos-$(UPVERSION).tar.gz | tr -d ' ') LIBS_SOURCE = $(shell echo MesaLib-$(UPVERSION).tar.gz | tr -d ' ') -get-orig-source: - echo \"$(VERSION)\" - echo \"$(UPVERSION)\" +$(DEMOS_SOURCE) $(LIBS_SOURCE): uscan --download --destdir $(CURDIR) \ --no-symlink --force-download --download-version $(UPVERSION) + +$(TARBALL): $(DEMOS_SOURCE) $(LIBS_SOURCE) tar xzf $(DEMOS_SOURCE) tar xzf $(LIBS_SOURCE) mv Mesa-$(UPVERSION) mesa-$(UPVERSION) - tar czf $(TARBALL) mesa-$(UPVERSION) + tar czf $(TARBALL) mesa-$(UPVERSION) + +get-orig-source: $(TARBALL) rm -r mesa-$(UPVERSION) rm $(DEMOS_SOURCE) rm $(LIBS_SOURCE) commit c3562d71a4320f26e892b7754d072c668e850243 Author: Christopher James Halse Rogers <[email protected]> Date: Wed May 19 18:32:34 2010 +1000 Add get-orig-source to document the multiple-tarball orig.tar.gz diff --git a/debian/rules b/debian/rules index 46aba11..356e6a0 100755 --- a/debian/rules +++ b/debian/rules @@ -270,4 +270,26 @@ endif dh_builddeb -s -- -Zlzma binary: binary-indep binary-arch -.PHONY: configs build clean binary-indep binary-arch binary install + + +VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d" " -f2) +UPVERSION = $(shell echo $(VERSION) | sed 's,-.*,,') +TARBALL = $(shell echo mesa_$(UPVERSION).orig.tar.gz | tr -d ' ') +DEMOS_SOURCE = $(shell echo MesaDemos-$(UPVERSION).tar.gz | tr -d ' ') +LIBS_SOURCE = $(shell echo MesaLib-$(UPVERSION).tar.gz | tr -d ' ') + +get-orig-source: + echo \"$(VERSION)\" + echo \"$(UPVERSION)\" + uscan --download --destdir $(CURDIR) \ + --no-symlink --force-download --download-version $(UPVERSION) + tar xzf $(DEMOS_SOURCE) + tar xzf $(LIBS_SOURCE) + mv Mesa-$(UPVERSION) mesa-$(UPVERSION) + tar czf $(TARBALL) mesa-$(UPVERSION) + rm -r mesa-$(UPVERSION) + rm $(DEMOS_SOURCE) + rm $(LIBS_SOURCE) + + +.PHONY: configs build clean binary-indep binary-arch binary install get-orig-source diff --git a/debian/watch b/debian/watch index ee95ce2..60680b0 100644 --- a/debian/watch +++ b/debian/watch @@ -1,6 +1,13 @@ +# NOTE: This provides version information only. +# uscan on its own will not download the correct tarball. +# See debian/rules get-orig-source +# version=3 opts="uversionmangle=s/-rc/~rc/" \ http://sf.net/mesa3d/MesaLib-(.*)\.tar\.gz opts="uversionmangle=s/-rc/~rc/" \ ftp://freedesktop.org/pub/mesa/([\d\.]*)/ MesaLib-(.*)\.tar\.gz + +opts="uversionmangle=s/-rc/~rc/" \ +ftp://freedesktop.org/pub/mesa/([\d\.]*)/ MesaDemos-(.*)\.tar\.gz commit 73b21553da35195dec17e3d84d09a33100bc9c54 Author: Christopher James Halse Rogers <[email protected]> Date: Wed May 19 17:18:52 2010 +1000 Revert "Update watchfile to grab the tarball we actually use" This, it turns out, *isn't* the tarball we actually use. We actually smush together three upstream tarballs to create the .orig.tar.gz. This reverts commit c166235a109c779996aede1296e6b968e2da954e. diff --git a/debian/watch b/debian/watch index eea9557..ee95ce2 100644 --- a/debian/watch +++ b/debian/watch @@ -2,8 +2,5 @@ version=3 opts="uversionmangle=s/-rc/~rc/" \ http://sf.net/mesa3d/MesaLib-(.*)\.tar\.gz -#opts="uversionmangle=s/-rc/~rc/" \ -#ftp://freedesktop.org/pub/mesa/([\d\.]*)/ MesaLib-(.*)\.tar\.gz - opts="uversionmangle=s/-rc/~rc/" \ -http://cgit.freedesktop.org/mesa/mesa /mesa/mesa/snapshot/mesa-(.*).tar.gz +ftp://freedesktop.org/pub/mesa/([\d\.]*)/ MesaLib-(.*)\.tar\.gz -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
