r19872 - in /tools/gnome-pkg-tools: 1/rules/gnome-get-source.mk debian/changelog
dedu-guest at users.alioth.debian.org
dedu-guest at users.alioth.debian.org
Thu Apr 30 13:20:42 UTC 2009
Author: dedu-guest
Date: Thu Apr 30 13:20:42 2009
New Revision: 19872
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19872
Log:
GNOME has switched to git, update get-orig-source to use git instead of svn
Modified:
tools/gnome-pkg-tools/1/rules/gnome-get-source.mk
tools/gnome-pkg-tools/debian/changelog
Modified: tools/gnome-pkg-tools/1/rules/gnome-get-source.mk
URL: http://svn.debian.org/wsvn/pkg-gnome/tools/gnome-pkg-tools/1/rules/gnome-get-source.mk?rev=19872&op=diff
==============================================================================
--- tools/gnome-pkg-tools/1/rules/gnome-get-source.mk (original)
+++ tools/gnome-pkg-tools/1/rules/gnome-get-source.mk Thu Apr 30 13:20:42 2009
@@ -7,10 +7,10 @@
# compute the major.minor part of the upstream version
DEB_UPSTREAM_VERSION_MAJOR_MINOR := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -r -n 's/^([0-9]+\.[0-9]+).*/\1/p')
-# search for a SVN revision in the version of the changelog
-# accepted formats: foo.svn.r42, foo.svn.42, foo.svn.r42.20070512,
-# foo.svn.42.20070512
-DEB_UPSTREAM_SVN_REV ?= $(shell echo $(DEB_UPSTREAM_VERSION) | sed -rn 's/^.*[\.~\d]+svn\.r?([0-9]+)(\.[0-9]+)?$$/\1/p')
+# search for a GIT revision in the version of the changelog
+# accepted formats: foo.git.r42ad43, foo.git.42ad43, foo.git.r42ad43.20090430,
+# foo.git.42ad43.20090430
+DEB_UPSTREAM_GIT_REV ?= $(shell echo $(DEB_UPSTREAM_VERSION) | sed -rn 's/^.*[\.~\d]+git\.r?([0-9a-f]+)(\.[0-9]+)?$$/\1/p')
# where to store the resulting .orig tarball
DEB_TARBALL_DOWNLOAD_DIR ?= ../tarballs
@@ -26,8 +26,7 @@
GNOME_DOWNLOAD_URL ?= http://ftp.gnome.org/pub/GNOME/sources/$(GNOME_MODULE)/$(DEB_UPSTREAM_VERSION_MAJOR_MINOR)/$(GNOME_TARBALL)
GNOME_DOWNLOAD_COMMAND ?= wget -nv -T10 -t3 -O $(if $(DEB_USE_DBS_TARBALL_LAYOUT),$(DEB_TARBALL_DOWNLOAD_DIR)/$(GNOME_TARBALL),$(DEB_TARBALL_DOWNLOAD_DIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.$(TARBALL_EXT)) $(GNOME_DOWNLOAD_URL)
-GNOME_SVN_BRANCH ?= trunk
-GNOME_SVN_URL ?= http://svn.gnome.org/svn/$(GNOME_MODULE)/$(GNOME_SVN_BRANCH)
+GNOME_GIT_URL ?= git://git.gnome.org/$(GNOME_MODULE)
get-orig-source:
dh_testdir
@@ -37,7 +36,7 @@
@@echo 'Upstream version (for orig tarball): $(DEB_UPSTREAM_VERSION)'
# create tarball dir
mkdir -p $(DEB_TARBALL_DOWNLOAD_DIR)
-ifeq ($(DEB_UPSTREAM_SVN_REV),)
+ifeq ($(DEB_UPSTREAM_GIT_REV),)
$(GNOME_DOWNLOAD_COMMAND)
case "$(TARBALL_EXT)" in \
tar.bz2|tbz) \
@@ -65,18 +64,18 @@
@# remove the original tarball if necessary
$(if $(DEB_USE_DBS_TARBALL_LAYOUT),rm -f $(DEB_TARBALL_DOWNLOAD_DIR)/$(GNOME_TARBALL))
else
- @@echo 'Upstream SVN rev: $(DEB_UPSTREAM_SVN_REV)'
- @@echo 'Upstream SVN repo: $(GNOME_SVN_URL)'
- @@svn -q co -r$(DEB_UPSTREAM_SVN_REV) $(GNOME_SVN_URL) \
- $(DEB_TARBALL_DOWNLOAD_DIR)/$(GNOME_MODULE)-$(DEB_UPSTREAM_VERSION).tmp
- @@svn -q export $(DEB_TARBALL_DOWNLOAD_DIR)/$(GNOME_MODULE)-$(DEB_UPSTREAM_VERSION).tmp\
+ @@echo 'Upstream GIT rev: $(DEB_UPSTREAM_GIT_REV)'
+ @@echo 'Upstream GIT repo: $(GNOME_GIT_URL)'
+ @@git clone $(GNOME_GIT_URL) \
$(DEB_TARBALL_DOWNLOAD_DIR)/$(GNOME_MODULE)-$(DEB_UPSTREAM_VERSION)
+ @@cd $(DEB_TARBALL_DOWNLOAD_DIR)/$(GNOME_MODULE)-$(DEB_UPSTREAM_VERSION); \
+ git checkout $(DEB_UPSTREAM_GIT_REV); \
+ rm -rf .git
@@(cd $(DEB_TARBALL_DOWNLOAD_DIR);\
tar cfz $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz \
$(GNOME_MODULE)-$(DEB_UPSTREAM_VERSION) \
)
- @@$(RM) -rf $(DEB_TARBALL_DOWNLOAD_DIR)/$(GNOME_MODULE)-$(DEB_UPSTREAM_VERSION).tmp\
- $(DEB_TARBALL_DOWNLOAD_DIR)/$(GNOME_MODULE)-$(DEB_UPSTREAM_VERSION)
+ @@$(RM) -rf $(DEB_TARBALL_DOWNLOAD_DIR)/$(GNOME_MODULE)-$(DEB_UPSTREAM_VERSION)
endif
.PHONY: get-orig-source
Modified: tools/gnome-pkg-tools/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/tools/gnome-pkg-tools/debian/changelog?rev=19872&op=diff
==============================================================================
--- tools/gnome-pkg-tools/debian/changelog (original)
+++ tools/gnome-pkg-tools/debian/changelog Thu Apr 30 13:20:42 2009
@@ -1,6 +1,10 @@
gnome-pkg-tools (0.14.2) UNRELEASED; urgency=low
+ [ Josselin Mouette ]
* Remove a few inactive members of the team.
+
+ [ Eugen Dedu ]
+ * GNOME has switched to git, update get-orig-source to use git instead of svn.
-- Josselin Mouette <joss at debian.org> Fri, 10 Apr 2009 18:11:39 +0200
More information about the pkg-gnome-commits
mailing list