[gentoo-commits] proj/gentoo-vdr-scripts:master commit in: /

[gentoo-commits] proj/gentoo-vdr-scripts:master commit in: /

[Christian Ruppert]

commit:     18d7ae27df93ee04fbfa43f6ba33e383d34c5031
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 13 18:27:53 2012 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Feb 13 18:27:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-vdr-scripts.git;a=commit;h=18d7ae27

Make bump.sh git compatible

---
 bump.sh |   19 ++++---------------
 1 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/bump.sh b/bump.sh
index c493795..6d47855 100755
--- a/bump.sh
+++ b/bump.sh
@@ -9,15 +9,6 @@ if [[ "$NEWVERS" == "" ]]; then
 	exit 1
 fi
 
-if [[ ! -d ../tags/"${OLDVERS}" ]]; then
-	echo "WARNING: Old version $OLDVERS is not tagged"
-fi
-
-if [[ -d ../tags/"${NEWVERS}" ]]; then
-	echo "new version $NEWVERS is already tagged"
-	exit 1
-fi
-
 sed -e "s/^Version.*/Version ${NEWVERS}/" -i README
 
 today=$(LC_ALL=C date +"%d %b %Y")
@@ -27,12 +18,10 @@ sed -e "3a\\
 " -i ChangeLog
 
 echo "Commiting bump"
-svn commit -m "Bumped to version ${NEWVERS}" ChangeLog README
+git commit -m "Bumped to version ${NEWVERS}" ChangeLog README
+
 
+git tag gentoo-vdr-scripts-$NEWVERS
+git push origin :gentoo-vdr-scripts-$NEWVERS
 
-cd ..
-echo "svn copy"
-svn copy trunk "tags/${NEWVERS}"
-svn commit -m "Tagged version ${NEWVERS}" "tags/${NEWVERS}"
-cd "tags/${NEWVERS}"
 make dist

[gentoo-commits] proj/gentoo-vdr-scripts:master commit in: /

[Christian Ruppert]

commit:     dda7e2a3f84e6818f0c46c55f342f7e51802db5f
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 13 18:27:41 2012 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Feb 13 18:27:41 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-vdr-scripts.git;a=commit;h=dda7e2a3

Update dist target for git

---
 Makefile |   24 +++++++-----------------
 1 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index c36f711..25021b8 100644
--- a/Makefile
+++ b/Makefile
@@ -9,20 +9,12 @@ all:
 VERSION := $(shell grep '^Version' README | awk '{ print $$2 }')
 TMPDIR = /tmp
 ARCHIVE = gentoo-vdr-scripts-$(VERSION)
-PACKAGE = $(ARCHIVE)
-
-info:
-	@echo VERSION: $(VERSION)
-	@[ -d ../tags/$(VERSION) ] && echo "Already tagged in svn"
-	@echo
-	@[ -d .svn ] && svn info
+PACKAGE = $(ARCHIVE).tar.bz2
+GITREF ?= HEAD
 
 dist:
-	@-rm -rf $(TMPDIR)/$(ARCHIVE)
-	@svn export . $(TMPDIR)/$(ARCHIVE)
-	@tar cjf $(PACKAGE).tar.bz2 -C $(TMPDIR) $(ARCHIVE)
-	@-rm -rf $(TMPDIR)/$(ARCHIVE)
-	@echo Distribution package created as $(PACKAGE).tar.bz2
+	@git archive --prefix=$(ARCHIVE)/ $(GITREF) | bzip2 > $(PACKAGE)
+	@echo Distribution package created as $(PACKAGE)
 
 install:
 	@for DIR in $(SUBDIRS); do \
@@ -31,10 +23,8 @@ install:
 	@install -m 0755 -o vdr -g vdr -d $(DESTDIR)/var/vdr/{shutdown-data,merged-config-files}
 
 snapshot:
-	svn export . gentoo-vdr-scripts-snapshot
-	tar cvfz gentoo-vdr-scripts-snapshot.tgz gentoo-vdr-scripts-snapshot
-	scp gentoo-vdr-scripts-snapshot.tgz dev.gentoo.org:public_html/distfiles/gentoo-vdr-scripts-snapshot.tgz
-	rm gentoo-vdr-scripts-snapshot.tgz
-	rm -rf gentoo-vdr-scripts-snapshot
+	git archive HEAD | bzip2 gentoo-vdr-scripts-snapshot.tar.bz2
+	scp gentoo-vdr-scripts-snapshot.tar.bz2 dev.gentoo.org:public_html/distfiles/gentoo-vdr-scripts-snapshot.tar.bz2
+	rm gentoo-vdr-scripts-snapshot.tar.bz2
 
 .PHONY: all compile install snapshot