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: 07-Feb-2007 09:07:16
Branch: HEAD Handle: 2007020708071501
Modified files:
openpkg-src/git git.patch git.spec
Log:
modifying package: git-1.4.4.4 20070127 -> 20070207
Summary:
Revision Changes Path
1.17 +15 -14 openpkg-src/git/git.patch
1.43 +2 -2 openpkg-src/git/git.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/git/git.patch
============================================================================
$ cvs diff -u -r1.16 -r1.17 git.patch
--- openpkg-src/git/git.patch 27 Jan 2007 21:16:00 -0000 1.16
+++ openpkg-src/git/git.patch 7 Feb 2007 08:07:15 -0000 1.17
@@ -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-01-27 21:25:28 +0100
++++ cogito-0.18.2/Makefile 2007-02-07 08:58:03 +0100
@@ -2,8 +2,8 @@
prefix="$(HOME)"
@@ -14,7 +14,7 @@
Index: git-1.4.4.4/Makefile
--- git-1.4.4.4/Makefile.orig 2007-01-08 04:14:44 +0100
-+++ git-1.4.4.4/Makefile 2007-01-27 21:26:23 +0100
++++ git-1.4.4.4/Makefile 2007-02-07 08:58:03 +0100
@@ -115,8 +115,8 @@
prefix = $(HOME)
bindir = $(prefix)/bin
@@ -41,26 +41,27 @@
endif
PROGRAMS += git-http-fetch$X
curl_check := $(shell (echo 070908; curl-config --vernum) | sort -r |
sed -ne 2p)
-Index: stgit-0.11/setup.py
---- stgit-0.11/setup.py.orig 2006-10-21 10:38:55 +0200
-+++ stgit-0.11/setup.py 2007-01-27 21:25:28 +0100
-@@ -15,9 +15,9 @@
+Index: stgit-0.12/setup.py
+--- stgit-0.12/setup.py.orig 2007-01-25 23:49:37 +0100
++++ stgit-0.12/setup.py 2007-02-07 08:59:12 +0100
+@@ -15,10 +15,10 @@
long_description = 'Push/pop utility on top of GIT',
scripts = ['stg'],
packages = ['stgit', 'stgit.commands'],
- data_files = [('share/stgit/templates',
glob.glob('templates/*.tmpl')),
- ('share/stgit/examples', glob.glob('examples/*.tmpl')),
-- ('share/stgit/examples', ['examples/stgitrc']),
-- ('share/stgit/contrib', ['contrib/diffcol.sh']),
+- ('share/stgit/examples', ['examples/gitconfig']),
+- ('share/stgit/contrib', ['contrib/diffcol.sh',
+ data_files = [('share/git/stgit/templates',
glob.glob('templates/*.tmpl')),
+ ('share/git/stgit/examples',
glob.glob('examples/*.tmpl')),
-+ ('share/git/stgit/examples', ['examples/stgitrc']),
-+ ('share/git/stgit/contrib', ['contrib/diffcol.sh']),
++ ('share/git/stgit/examples', ['examples/gitconfig']),
++ ('share/git/stgit/contrib', ['contrib/diffcol.sh',
+ 'contrib/stgbashprompt.sh',
+
'contrib/stgit-completion.bash']),
('share/doc/stgit', glob.glob('doc/*.txt'))]
- )
-Index: stgit-0.11/stg
---- stgit-0.11/stg.orig 2006-04-07 23:38:54 +0200
-+++ stgit-0.11/stg 2007-01-27 21:25:28 +0100
+Index: stgit-0.12/stg
+--- stgit-0.12/stg.orig 2006-04-07 23:38:54 +0200
++++ stgit-0.12/stg 2007-02-07 08:58:03 +0100
@@ -31,7 +31,8 @@
sys.exec_prefix = prefix
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/git/git.spec
============================================================================
$ cvs diff -u -r1.42 -r1.43 git.spec
--- openpkg-src/git/git.spec 27 Jan 2007 21:16:01 -0000 1.42
+++ openpkg-src/git/git.spec 7 Feb 2007 08:07:16 -0000 1.43
@@ -25,7 +25,7 @@
# package version
%define V_git 1.4.4.4
%define V_cogito 0.18.2
-%define V_stgit 0.11
+%define V_stgit 0.12
# package information
Name: git
@@ -38,7 +38,7 @@
Group: SCM
License: GPL
Version: %{V_git}
-Release: 20070127
+Release: 20070207
# 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 [email protected]