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

[bdwalton at users.sourceforge.net]

Revision: 21344
          http://gar.svn.sourceforge.net/gar/?rev=21344&view=rev
Author:   bdwalton
Date:     2013-06-15 12:13:24 +0000 (Sat, 15 Jun 2013)
Log Message:
-----------
version bump; drop merged patch

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

Removed Paths:
-------------
    csw/mgar/pkg/git/trunk/files/0006-Fix-use-of-non-portable-strftime-format-string.patch

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2013-06-15 11:18:37 UTC (rev 21343)
+++ csw/mgar/pkg/git/trunk/Makefile	2013-06-15 12:13:24 UTC (rev 21344)
@@ -1,5 +1,5 @@
 NAME = git
-VERSION = 1.8.2.1
+VERSION = 1.8.3.1
 #PATCHLEVEL = rc4
 DISTNAME = $(NAME)-$(VERSION)
 GARTYPE = v2
@@ -117,7 +117,6 @@
 # to the selection of available utf8 locales.
 PATCHFILES_isa-sparcv8 += 0005-Force-en_US.UTF-8-for-a-git-svn-test.patch
 PATCHFILES += 0006-Patch-out-a-few-usr-share-references.patch
-PATCHFILES += 0006-Fix-use-of-non-portable-strftime-format-string.patch
 
 fdirs = $(bindir_install) $(mandir) $(libexecdir_install)
 define _git_files

Modified: csw/mgar/pkg/git/trunk/checksums
===================================================================
--- csw/mgar/pkg/git/trunk/checksums	2013-06-15 11:18:37 UTC (rev 21343)
+++ csw/mgar/pkg/git/trunk/checksums	2013-06-15 12:13:24 UTC (rev 21344)
@@ -1 +1 @@
-3f6ebca116c627490e4ee1f1324d5e65  git-1.8.2.1.tar.gz
+35401b410e7f248b13e35a1069aca2e2  git-1.8.3.1.tar.gz

Deleted: csw/mgar/pkg/git/trunk/files/0006-Fix-use-of-non-portable-strftime-format-string.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0006-Fix-use-of-non-portable-strftime-format-string.patch	2013-06-15 11:18:37 UTC (rev 21343)
+++ csw/mgar/pkg/git/trunk/files/0006-Fix-use-of-non-portable-strftime-format-string.patch	2013-06-15 12:13:24 UTC (rev 21344)
@@ -1,29 +0,0 @@
-From 4e13b01e8678d73f4bc68189ea278eef6b38fd4d Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Fri, 22 Feb 2013 00:22:15 +0100
-Subject: [PATCH] Fix use of non-portable strftime format string.
-
-This is merged in a more proper manner upstream, but until that lands
-in a release, this quick hack should work for us.
-
-Signed-off-by: Ben Walton <bwalton at opencsw.org>
----
- git-cvsimport.perl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/git-cvsimport.perl b/git-cvsimport.perl
-index 0a31ebd..dda0966 100755
---- a/git-cvsimport.perl
-+++ b/git-cvsimport.perl
-@@ -864,7 +864,7 @@ sub commit {
- 	}
- 
- 	set_timezone($author_tz);
--	my $commit_date = strftime("%s %z", localtime($date));
-+	my $commit_date = strftime("$date %z", localtime($date));
- 	set_timezone('UTC');
- 	$ENV{GIT_AUTHOR_NAME} = $author_name;
- 	$ENV{GIT_AUTHOR_EMAIL} = $author_email;
--- 
-1.8.1
-

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