OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 04-Mar-2009 23:06:31
Branch: HEAD Handle: 2009030422063100
Modified files:
openpkg-src/git git.patch git.spec
Log:
upgrading package: git 1.6.1.3 -> 1.6.2
Summary:
Revision Changes Path
1.83 +22 -21 openpkg-src/git/git.patch
1.135 +2 -2 openpkg-src/git/git.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/git/git.patch
============================================================================
$ cvs diff -u -r1.82 -r1.83 git.patch
--- openpkg-src/git/git.patch 10 Feb 2009 07:58:30 -0000 1.82
+++ openpkg-src/git/git.patch 4 Mar 2009 22:06:31 -0000 1.83
@@ -1,6 +1,6 @@
Index: cogito-0.18.2/Makefile
--- cogito-0.18.2/Makefile.orig 2006-11-17 01:37:24 +0100
-+++ cogito-0.18.2/Makefile 2008-08-01 21:05:21 +0200
++++ cogito-0.18.2/Makefile 2009-03-04 22:55:27 +0100
@@ -2,8 +2,8 @@
prefix="$(HOME)"
@@ -14,7 +14,7 @@
Index: gc-utils/doc/Makefile
--- gc-utils/doc/Makefile.orig 2008-08-01 17:39:15 +0200
-+++ gc-utils/doc/Makefile 2008-08-01 21:05:37 +0200
++++ gc-utils/doc/Makefile 2009-03-04 22:55:27 +0100
@@ -29,17 +29,17 @@
.PHONY: gen install clean uninstall
@@ -37,34 +37,35 @@
endif
uninstall:
-Index: git-1.6.1.3/Documentation/Makefile
---- git-1.6.1.3/Documentation/Makefile.orig 2008-07-20 02:23:11 +0200
-+++ git-1.6.1.3/Documentation/Makefile 2008-08-01 21:05:21 +0200
-@@ -48,9 +48,9 @@
+Index: git-1.6.2/Documentation/Makefile
+--- git-1.6.2/Documentation/Makefile.orig 2009-03-04 09:18:50 +0100
++++ git-1.6.2/Documentation/Makefile 2009-03-04 22:59:49 +0100
+@@ -50,10 +50,10 @@
infodir?=$(prefix)/share/info
MAKEINFO=makeinfo
INSTALL_INFO=install-info
-DOCBOOK2X_TEXI=docbook2x-texi
+DOCBOOK2X_TEXI=docbook2texi
+ DBLATEX=dblatex
ifndef PERL_PATH
- PERL_PATH = /usr/bin/perl
+ PERL_PATH = perl
endif
-include ../config.mak.autogen
-Index: git-1.6.1.3/Makefile
---- git-1.6.1.3/Makefile.orig 2008-07-20 02:23:11 +0200
-+++ git-1.6.1.3/Makefile 2008-08-01 21:05:21 +0200
-@@ -176,7 +176,7 @@
- infodir = $(prefix)/share/info
- gitexecdir = $(bindir)
+Index: git-1.6.2/Makefile
+--- git-1.6.2/Makefile.orig 2009-03-04 09:18:50 +0100
++++ git-1.6.2/Makefile 2009-03-04 23:00:34 +0100
+@@ -198,7 +198,7 @@
+ infodir = share/info
+ gitexecdir = libexec/git-core
sharedir = $(prefix)/share
--template_dir = $(sharedir)/git-core/templates
-+template_dir = $(sharedir)/git/core/templates
- htmldir=$(sharedir)/doc/git-doc
+-template_dir = share/git-core/templates
++template_dir = share/git/core/templates
+ htmldir = share/doc/git-doc
ifeq ($(prefix),/usr)
sysconfdir = /etc
-@@ -748,10 +748,10 @@
+@@ -844,10 +844,10 @@
else
ifdef CURLDIR
# Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case.
@@ -78,9 +79,9 @@
endif
BUILTIN_OBJS += builtin-http-fetch.o
EXTLIBS += $(CURL_LIBCURL)
-Index: git-1.6.1.3/perl/Makefile.PL
---- git-1.6.1.3/perl/Makefile.PL.orig 2008-07-20 02:23:11 +0200
-+++ git-1.6.1.3/perl/Makefile.PL 2008-08-01 21:05:21 +0200
+Index: git-1.6.2/perl/Makefile.PL
+--- git-1.6.2/perl/Makefile.PL.orig 2009-03-04 09:18:50 +0100
++++ git-1.6.2/perl/Makefile.PL 2009-03-04 22:55:27 +0100
@@ -26,5 +26,6 @@
VERSION_FROM => 'Git.pm',
PM => \%pm,
@@ -91,7 +92,7 @@
);
Index: stgit-0.14.3/setup.py
--- stgit-0.14.3/setup.py.orig 2008-06-09 00:26:03 +0200
-+++ stgit-0.14.3/setup.py 2008-08-01 21:05:21 +0200
++++ stgit-0.14.3/setup.py 2009-03-04 22:55:27 +0100
@@ -61,10 +61,10 @@
long_description = 'Push/pop utility on top of GIT',
scripts = ['stg'],
@@ -109,7 +110,7 @@
('share/doc/stgit', glob.glob('doc/*.txt'))]
Index: stgit-0.14.3/stg
--- stgit-0.14.3/stg.orig 2006-04-07 23:38:54 +0200
-+++ stgit-0.14.3/stg 2008-08-01 21:05:21 +0200
++++ stgit-0.14.3/stg 2009-03-04 22:55:27 +0100
@@ -26,12 +26,13 @@
# It is assumed that the user installed StGIT using the --prefix= option
prefix, bin = os.path.split(sys.path[0])
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/git/git.spec
============================================================================
$ cvs diff -u -r1.134 -r1.135 git.spec
--- openpkg-src/git/git.spec 16 Feb 2009 07:46:43 -0000 1.134
+++ openpkg-src/git/git.spec 4 Mar 2009 22:06:31 -0000 1.135
@@ -22,7 +22,7 @@
##
# package version
-%define V_git 1.6.1.3
+%define V_git 1.6.2
%define V_cogito 0.18.2
%define V_stgit 0.14.3
%define V_guilt 0.32
@@ -40,7 +40,7 @@
Group: SCM
License: GPL
Version: %{V_git}
-Release: 20090216
+Release: 20090304
# package options
%option with_cogito no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
