OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 01-May-2007 20:38:10 Branch: HEAD Handle: 2007050119381000 Modified files: openpkg-src/git git.patch git.spec Log: upgrading package: git 1.5.1.2 -> 1.5.1.3 Summary: Revision Changes Path 1.30 +11 -11 openpkg-src/git/git.patch 1.60 +2 -2 openpkg-src/git/git.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/git/git.patch ============================================================================ $ cvs diff -u -r1.29 -r1.30 git.patch --- openpkg-src/git/git.patch 23 Apr 2007 07:00:31 -0000 1.29 +++ openpkg-src/git/git.patch 1 May 2007 18:38:10 -0000 1.30 @@ -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 2007-02-18 19:43:17 +0100 ++++ cogito-0.18.2/Makefile 2007-05-01 19:46:10 +0200 @@ -2,8 +2,8 @@ prefix="$(HOME)" @@ -12,19 +12,19 @@ INSTALL?=install -Index: git-1.5.1.2/Makefile ---- git-1.5.1.2.orig/Makefile.orig 2007-04-04 10:40:33 +0200 -+++ git-1.5.1.2/Makefile 2007-04-04 17:33:42 +0200 +Index: git-1.5.1.3/Makefile +--- git-1.5.1.3/Makefile.orig 2007-05-01 04:46:26 +0200 ++++ git-1.5.1.3/Makefile 2007-05-01 20:12:26 +0200 @@ -132,7 +132,7 @@ prefix = $(HOME) bindir = $(prefix)/bin gitexecdir = $(bindir) -template_dir = $(prefix)/share/git-core/templates/ +template_dir = $(prefix)/share/git/core/templates/ - ETC_GITCONFIG = $(prefix)/etc/gitconfig - # DESTDIR= - -@@ -463,10 +463,10 @@ + ifeq ($(prefix),/usr) + sysconfdir = /etc + else +@@ -469,10 +469,10 @@ ifndef NO_CURL ifdef CURLDIR # Try "-Wl,-rpath=$(CURLDIR)/lib" in such a case. @@ -39,8 +39,8 @@ PROGRAMS += git-http-fetch$X curl_check := $(shell (echo 070908; curl-config --vernum) | sort -r | sed -ne 2p) Index: stgit-0.12.1/setup.py ---- stgit-0.12.1/setup.py.orig 2007-01-25 23:49:37 +0100 -+++ stgit-0.12.1/setup.py 2007-02-18 19:43:17 +0100 +--- stgit-0.12.1/setup.py.orig 2007-02-13 23:27:01 +0100 ++++ stgit-0.12.1/setup.py 2007-05-01 19:46:10 +0200 @@ -15,10 +15,10 @@ long_description = 'Push/pop utility on top of GIT', scripts = ['stg'], @@ -58,7 +58,7 @@ ('share/doc/stgit', glob.glob('doc/*.txt'))] Index: stgit-0.12.1/stg --- stgit-0.12.1/stg.orig 2006-04-07 23:38:54 +0200 -+++ stgit-0.12.1/stg 2007-02-18 19:43:39 +0100 ++++ stgit-0.12.1/stg 2007-05-01 19:46:10 +0200 @@ -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.59 -r1.60 git.spec --- openpkg-src/git/git.spec 23 Apr 2007 07:00:31 -0000 1.59 +++ openpkg-src/git/git.spec 1 May 2007 18:38:10 -0000 1.60 @@ -23,7 +23,7 @@ ## # package version -%define V_git 1.5.1.2 +%define V_git 1.5.1.3 %define V_cogito 0.18.2 %define V_stgit 0.12.1 %define V_guilt 0.24 @@ -39,7 +39,7 @@ Group: SCM License: GPL Version: %{V_git} -Release: 20070423 +Release: 20070501 # list of sources Source0: http://www.kernel.org/pub/software/scm/git/git-%{V_git}.tar.gz @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org