diff --git a/develop/git/git-1.7.4.5-no-install-Error.pm.patch b/develop/git/git-no-install-Error.pm.patch similarity index 70% rename from develop/git/git-1.7.4.5-no-install-Error.pm.patch rename to develop/git/git-no-install-Error.pm.patch index 0604adc30..5ea687e1e 100644 --- a/develop/git/git-1.7.4.5-no-install-Error.pm.patch +++ b/develop/git/git-no-install-Error.pm.patch @@ -1,8 +1,8 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../git/git-1.7.4.5-no-install-Error.pm.patch -# Copyright (C) 2011 The OpenSDE Project +# Filename: package/.../git/git-no-install-Error.pm.patch +# Copyright (C) 2011 - 2014 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -16,12 +16,12 @@ Description: Do not install the private Error.pm ---- git-1.7.4.5/perl/Makefile.PL.orig 2011-05-18 19:53:03.604002343 +0200 -+++ git-1.7.4.5/perl/Makefile.PL 2011-05-18 19:53:29.280002344 +0200 -@@ -22,7 +22,7 @@ +--- a/perl/Makefile.PL 2014-02-02 19:56:05.318198022 +0100 ++++ b/perl/Makefile.PL 2014-02-02 19:59:38.331137009 +0100 +@@ -45,7 +45,7 @@ + # We come with our own bundled Error.pm. It's not in the set of default # Perl modules so install it if it's not available on the system yet. - eval { require Error }; - if ($@ || $Error::VERSION < 0.15009) { + if ( !eval { require Error } || $Error::VERSION < 0.15009) { - $pm{'private-Error.pm'} = '$(INST_LIBDIR)/Error.pm'; +# $pm{'private-Error.pm'} = '$(INST_LIBDIR)/Error.pm'; } diff --git a/develop/git/git.desc b/develop/git/git.desc index 51f2d63c8..c9858fc4b 100644 --- a/develop/git/git.desc +++ b/develop/git/git.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../git/git.desc -[COPY] Copyright (C) 2006 - 2012 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2014 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] [COPY] More information can be found in the files COPYING and README. @@ -31,8 +31,8 @@ [L] GPL [S] Stable -[V] 1.7.10.2 +[V] 1.7.12.4 [P] X -----5---9 209.700 [CV-URL] http://code.google.com/p/git-core/downloads/list -[D] 4079345202 git-1.7.10.2.tar.gz http://git-core.googlecode.com/files/ +[D] 1660808450 git-1.7.12.4.tar.gz http://git-core.googlecode.com/files/ diff --git a/develop/git/xmlto-skip-validation.patch b/develop/git/xmlto-skip-validation.patch index a25aa1d05..a3669c789 100644 --- a/develop/git/xmlto-skip-validation.patch +++ b/develop/git/xmlto-skip-validation.patch @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../git/xmlto-skip-validation.patch -# Copyright (C) 2011 The OpenSDE Project +# Copyright (C) 2011 - 2014 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -14,14 +14,14 @@ # version. # --- SDE-COPYRIGHT-NOTE-END --- ---- git-1.7.4.1/Documentation/Makefile.orig 2011-04-27 11:48:26.360000252 +0200 -+++ git-1.7.4.1/Documentation/Makefile 2011-04-27 11:49:03.508000254 +0200 -@@ -248,7 +248,7 @@ +--- a/Documentation/Makefile 2014-02-02 20:03:02.907838559 +0100 ++++ b/Documentation/Makefile 2014-02-02 20:06:22.076498569 +0100 +@@ -246,7 +246,7 @@ %.1 %.5 %.7 : %.xml manpage-base-url.xsl $(QUIET_XMLTO)$(RM) $@ && \ -- xmlto -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $< -+ xmlto --skip-validation -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $< +- $(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $< ++ $(XMLTO) --skip-validation -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $< %.xml : %.txt $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \