[csw-devel] SF.net SVN: gar:[7316] csw/mgar/pkg/git-subtree/trunk

[bdwalton at users.sourceforge.net]

Revision: 7316
          http://gar.svn.sourceforge.net/gar/?rev=7316&view=rev
Author:   bdwalton
Date:     2009-11-17 01:25:48 +0000 (Tue, 17 Nov 2009)

Log Message:
-----------
git-subtree: drop patches that were accepted upstream

Modified Paths:
--------------
    csw/mgar/pkg/git-subtree/trunk/Makefile
    csw/mgar/pkg/git-subtree/trunk/checksums

Removed Paths:
-------------
    csw/mgar/pkg/git-subtree/trunk/files/0001-add-installation-support-to-Makefile.patch
    csw/mgar/pkg/git-subtree/trunk/files/0002-make-git-version-dynamic-when-building-documentation.patch

Modified: csw/mgar/pkg/git-subtree/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git-subtree/trunk/Makefile	2009-11-16 17:01:56 UTC (rev 7315)
+++ csw/mgar/pkg/git-subtree/trunk/Makefile	2009-11-17 01:25:48 UTC (rev 7316)
@@ -1,6 +1,6 @@
 GARNAME = git-subtree
 GARVERSION = 0.2
-PATCHLEVEL = d8b2c
+PATCHLEVEL = d20ac
 CATEGORIES = devel
 
 DESCRIPTION = Subtree support for git
@@ -20,9 +20,6 @@
 GIT_REPOS = git://github.com/apenwarr/git-subtree.git
 GIT_TREEISH_git-subtree.git = $(PATCHLEVEL)
 
-PATCHFILES  = 0001-add-installation-support-to-Makefile.patch
-PATCHFILES += 0002-make-git-version-dynamic-when-building-documentation.patch
-
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS =
 INSTALL_SCRIPTS = custom

Modified: csw/mgar/pkg/git-subtree/trunk/checksums
===================================================================
--- csw/mgar/pkg/git-subtree/trunk/checksums	2009-11-16 17:01:56 UTC (rev 7315)
+++ csw/mgar/pkg/git-subtree/trunk/checksums	2009-11-17 01:25:48 UTC (rev 7316)
@@ -1,2 +0,0 @@
-40a8c3282a2f4bd4e5fbaebf2bba9359  0001-add-installation-support-to-Makefile.patch
-7587367599ef47e0a3e81c96996f855b  0002-make-git-version-dynamic-when-building-documentation.patch

Deleted: csw/mgar/pkg/git-subtree/trunk/files/0001-add-installation-support-to-Makefile.patch
===================================================================
--- csw/mgar/pkg/git-subtree/trunk/files/0001-add-installation-support-to-Makefile.patch	2009-11-16 17:01:56 UTC (rev 7315)
+++ csw/mgar/pkg/git-subtree/trunk/files/0001-add-installation-support-to-Makefile.patch	2009-11-17 01:25:48 UTC (rev 7316)
@@ -1,48 +0,0 @@
-From 9c69a401f3d2fb44b0a09702aff99c9e28b627c4 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at artsci.utoronto.ca>
-Date: Fri, 13 Nov 2009 12:01:31 -0500
-Subject: [PATCH 1/2] add installation support to Makefile
-
-Signed-off-by: Ben Walton <bwalton at artsci.utoronto.ca>
----
- Makefile |   20 ++++++++++++++++++++
- 1 files changed, 20 insertions(+), 0 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 3e97c62..faefffd 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,3 +1,13 @@
-+prefix ?= /usr/local
-+mandir ?= $(prefix)/share/man
-+gitdir ?= $(shell git --exec-path)
-+
-+# this should be set to a 'standard' bsd-type install program
-+INSTALL ?= install
-+INSTALL_DATA = $(INSTALL) -c -m 0644
-+INSTALL_EXE = $(INSTALL) -c -m 0755
-+INSTALL_DIR = $(INSTALL) -c -d -m 0755
-+
- default:
- 	@echo "git-subtree doesn't need to be built."
- 	@echo "Just copy it somewhere on your PATH, like /usr/local/bin."
-@@ -5,6 +15,16 @@ default:
- 	@echo "Try: make doc"
- 	@false
- 
-+install: install-exe install-doc
-+
-+install-exe: git-subtree.sh
-+	$(INSTALL_DIR) $(DESTDIR)/$(gitdir)
-+	$(INSTALL_EXE) $< $(DESTDIR)/$(gitdir)/git-subtree
-+
-+install-doc: git-subtree.1
-+	$(INSTALL_DIR) $(DESTDIR)/$(mandir)/man1/
-+	$(INSTALL_DATA) $< $(DESTDIR)/$(mandir)/man1/
-+
- doc: git-subtree.1
- 
- %.1: %.xml
--- 
-1.6.5
-

Deleted: csw/mgar/pkg/git-subtree/trunk/files/0002-make-git-version-dynamic-when-building-documentation.patch
===================================================================
--- csw/mgar/pkg/git-subtree/trunk/files/0002-make-git-version-dynamic-when-building-documentation.patch	2009-11-16 17:01:56 UTC (rev 7315)
+++ csw/mgar/pkg/git-subtree/trunk/files/0002-make-git-version-dynamic-when-building-documentation.patch	2009-11-17 01:25:48 UTC (rev 7316)
@@ -1,35 +0,0 @@
-From e17159437af26336537a46cf64825c9130e91267 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at artsci.utoronto.ca>
-Date: Fri, 13 Nov 2009 12:08:02 -0500
-Subject: [PATCH 2/2] make git version dynamic when building documentation
-
-Signed-off-by: Ben Walton <bwalton at artsci.utoronto.ca>
----
- Makefile |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index faefffd..9b204bd 100644
---- a/Makefile
-+++ b/Makefile
-@@ -2,6 +2,8 @@ prefix ?= /usr/local
- mandir ?= $(prefix)/share/man
- gitdir ?= $(shell git --exec-path)
- 
-+gitver ?= $(word 3,$(shell git --version))
-+
- # this should be set to a 'standard' bsd-type install program
- INSTALL ?= install
- INSTALL_DATA = $(INSTALL) -c -m 0644
-@@ -32,7 +34,7 @@ doc: git-subtree.1
- 
- %.xml: %.txt
- 	asciidoc -b docbook -d manpage -f asciidoc.conf \
--		-agit_version=1.6.3 $^
-+		-agit_version=$(gitver) $^
- 
- clean:
- 	rm -f *~ *.xml *.html *.1
--- 
-1.6.5
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.