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: 23-Nov-2009 09:03:25
Branch: HEAD Handle: 2009112308032400
Modified files:
openpkg-src/git git.patch git.spec
Log:
modifying package: git-1.6.5.3 20091121 -> 20091123
Summary:
Revision Changes Path
1.103 +29 -17 openpkg-src/git/git.patch
1.163 +2 -2 openpkg-src/git/git.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/git/git.patch
============================================================================
$ cvs diff -u -r1.102 -r1.103 git.patch
--- openpkg-src/git/git.patch 18 Nov 2009 20:04:06 -0000 1.102
+++ openpkg-src/git/git.patch 23 Nov 2009 08:03:24 -0000 1.103
@@ -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 2009-10-18 10:41:19 +0200
++++ cogito-0.18.2/Makefile 2009-11-23 08:51:14 +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 2009-10-18 10:41:19 +0200
++++ gc-utils/doc/Makefile 2009-11-23 08:51:14 +0100
@@ -29,17 +29,17 @@
.PHONY: gen install clean uninstall
@@ -38,8 +38,8 @@
uninstall:
Index: git-1.6.5.3/Documentation/Makefile
---- git-1.6.5.3/Documentation/Makefile.orig 2009-10-17 10:11:32 +0200
-+++ git-1.6.5.3/Documentation/Makefile 2009-10-18 10:41:19 +0200
+--- git-1.6.5.3/Documentation/Makefile.orig 2009-11-16 23:14:46 +0100
++++ git-1.6.5.3/Documentation/Makefile 2009-11-23 08:51:14 +0100
@@ -51,10 +51,10 @@
infodir?=$(prefix)/share/info
MAKEINFO=makeinfo
@@ -54,9 +54,9 @@
-include ../config.mak.autogen
Index: git-1.6.5.3/Makefile
---- git-1.6.5.3/Makefile.orig 2009-10-17 10:11:32 +0200
-+++ git-1.6.5.3/Makefile 2009-10-18 10:41:19 +0200
-@@ -237,9 +237,9 @@
+--- git-1.6.5.3/Makefile.orig 2009-11-16 23:14:46 +0100
++++ git-1.6.5.3/Makefile 2009-11-23 08:51:14 +0100
+@@ -241,9 +241,9 @@
bindir = $(prefix)/$(bindir_relative)
mandir = share/man
infodir = share/info
@@ -68,7 +68,7 @@
htmldir = share/doc/git-doc
ifeq ($(prefix),/usr)
sysconfdir = /etc
-@@ -1045,10 +1045,10 @@
+@@ -1050,10 +1050,10 @@
else
ifdef CURLDIR
# Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case.
@@ -82,7 +82,7 @@
endif
PROGRAMS += git-remote-curl$X git-http-fetch$X
curl_check := $(shell (echo 070908; curl-config --vernum) | sort -r |
sed -ne 2p)
-@@ -1086,7 +1086,7 @@
+@@ -1091,7 +1091,7 @@
OPENSSL_LINK =
endif
ifdef NEEDS_CRYPTO_WITH_SSL
@@ -92,8 +92,8 @@
else
BASIC_CFLAGS += -DNO_OPENSSL
Index: git-1.6.5.3/config.mak.in
---- git-1.6.5.3/config.mak.in.orig 2009-10-17 10:11:32 +0200
-+++ git-1.6.5.3/config.mak.in 2009-10-18 10:51:24 +0200
+--- git-1.6.5.3/config.mak.in.orig 2009-11-16 23:14:46 +0100
++++ git-1.6.5.3/config.mak.in 2009-11-23 08:51:14 +0100
@@ -13,9 +13,9 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
@@ -107,8 +107,8 @@
mand...@mandir@
Index: git-1.6.5.3/perl/Makefile.PL
---- git-1.6.5.3/perl/Makefile.PL.orig 2009-10-17 10:11:32 +0200
-+++ git-1.6.5.3/perl/Makefile.PL 2009-10-18 10:41:19 +0200
+--- git-1.6.5.3/perl/Makefile.PL.orig 2009-11-16 23:14:46 +0100
++++ git-1.6.5.3/perl/Makefile.PL 2009-11-23 08:51:14 +0100
@@ -34,5 +34,6 @@
VERSION_FROM => 'Git.pm',
PM => \%pm,
@@ -118,8 +118,8 @@
+ INSTALLSITEMAN3DIR => '$(SITEPREFIX)/man/man3'
);
Index: git-1.6.5.3/templates/Makefile
---- git-1.6.5.3/templates/Makefile.orig 2009-10-17 10:11:32 +0200
-+++ git-1.6.5.3/templates/Makefile 2009-10-18 10:41:19 +0200
+--- git-1.6.5.3/templates/Makefile.orig 2009-11-16 23:14:46 +0100
++++ git-1.6.5.3/templates/Makefile 2009-11-23 08:51:14 +0100
@@ -8,7 +8,7 @@
TAR ?= tar
RM ?= rm -f
@@ -131,7 +131,7 @@
# Shell quote (do not use $(call) to accommodate ancient setups);
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 2009-10-18 10:41:19 +0200
++++ stgit-0.14.3/setup.py 2009-11-23 08:51:14 +0100
@@ -61,10 +61,10 @@
long_description = 'Push/pop utility on top of GIT',
scripts = ['stg'],
@@ -149,7 +149,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 2009-10-18 10:41:19 +0200
++++ stgit-0.14.3/stg 2009-11-23 08:51:14 +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])
@@ -166,3 +166,15 @@
os.path.join(prefix, 'lib', 'python%s.%s' % (major,
minor)),
os.path.join(prefix, 'lib', 'python%s.%s' % (major,
minor),
'site-packages')]
+Index: tig-0.15/tig.c
+--- tig-0.15/tig.c.orig 2009-11-20 14:05:27 +0100
++++ tig-0.15/tig.c 2009-11-23 08:56:35 +0100
+@@ -4015,7 +4015,7 @@
+
+ if (add_title && help_open_keymap_title(view, keymap))
+ return;
+- add_title = false;
++ add_title = FALSE;
+
+ if (group) {
+ add_line_text(view, group, LINE_HELP_GROUP);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/git/git.spec
============================================================================
$ cvs diff -u -r1.162 -r1.163 git.spec
--- openpkg-src/git/git.spec 21 Nov 2009 09:40:32 -0000 1.162
+++ openpkg-src/git/git.spec 23 Nov 2009 08:03:24 -0000 1.163
@@ -40,10 +40,10 @@
Group: SCM
License: GPL
Version: %{V_git}
-Release: 20091121
+Release: 20091123
# package options
-%option with_doc yes
+%option with_doc no
%option with_cogito no
%option with_stgit no
%option with_guilt no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
