diff options
| author | Juergen Daubert <jue@jue.li> | 2012-08-25 10:17:31 +0200 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2012-08-25 10:17:31 +0200 |
| commit | 3e71e7d8cbfd763f6ad2e8d083c18c5e25acdc6c (patch) | |
| tree | 32b0662b12dd33472c4e48c690f23eb778ae00bb /git | |
| parent | 9a5a7885cf163e9d5a86d220cdf083384cb83432 (diff) | |
| parent | ee3d27117766edc4f42001a6129b85902b586c11 (diff) | |
| download | opt-3e71e7d8cbfd763f6ad2e8d083c18c5e25acdc6c.tar.gz opt-3e71e7d8cbfd763f6ad2e8d083c18c5e25acdc6c.tar.xz | |
Merge branch '2.7' into 2.8
Diffstat (limited to 'git')
| -rw-r--r-- | git/.footprint | 9 | ||||
| -rw-r--r-- | git/.md5sum | 4 | ||||
| -rw-r--r-- | git/Pkgfile | 4 |
3 files changed, 13 insertions, 4 deletions
diff --git a/git/.footprint b/git/.footprint index 7c8b67124..ef4dd1afc 100644 --- a/git/.footprint +++ b/git/.footprint @@ -37,6 +37,7 @@ drwxr-xr-x root/root usr/lib/git-core/ -rwxr-xr-x root/root usr/lib/git-core/git-commit-tree -rwxr-xr-x root/root usr/lib/git-core/git-config -rwxr-xr-x root/root usr/lib/git-core/git-count-objects +-rwxr-xr-x root/root usr/lib/git-core/git-credential -rwxr-xr-x root/root usr/lib/git-core/git-credential-cache -rwxr-xr-x root/root usr/lib/git-core/git-credential-cache--daemon -rwxr-xr-x root/root usr/lib/git-core/git-credential-store @@ -198,13 +199,19 @@ drwxr-xr-x root/root usr/lib/perl5/site_perl/5.16/ -r--r--r-- root/root usr/lib/perl5/site_perl/5.16/Git.pm drwxr-xr-x root/root usr/lib/perl5/site_perl/5.16/Git/ -r--r--r-- root/root usr/lib/perl5/site_perl/5.16/Git/I18N.pm +-r--r--r-- root/root usr/lib/perl5/site_perl/5.16/Git/IndexInfo.pm +-r--r--r-- root/root usr/lib/perl5/site_perl/5.16/Git/SVN.pm drwxr-xr-x root/root usr/lib/perl5/site_perl/5.16/Git/SVN/ -r--r--r-- root/root usr/lib/perl5/site_perl/5.16/Git/SVN/Editor.pm -r--r--r-- root/root usr/lib/perl5/site_perl/5.16/Git/SVN/Fetcher.pm +-r--r--r-- root/root usr/lib/perl5/site_perl/5.16/Git/SVN/GlobSpec.pm +-r--r--r-- root/root usr/lib/perl5/site_perl/5.16/Git/SVN/Log.pm drwxr-xr-x root/root usr/lib/perl5/site_perl/5.16/Git/SVN/Memoize/ -r--r--r-- root/root usr/lib/perl5/site_perl/5.16/Git/SVN/Memoize/YAML.pm +-r--r--r-- root/root usr/lib/perl5/site_perl/5.16/Git/SVN/Migration.pm -r--r--r-- root/root usr/lib/perl5/site_perl/5.16/Git/SVN/Prompt.pm -r--r--r-- root/root usr/lib/perl5/site_perl/5.16/Git/SVN/Ra.pm +-r--r--r-- root/root usr/lib/perl5/site_perl/5.16/Git/SVN/Utils.pm drwxr-xr-x root/root usr/lib/perl5/site_perl/5.16/linux-thread-multi/ drwxr-xr-x root/root usr/lib/perl5/site_perl/5.16/linux-thread-multi/auto/ drwxr-xr-x root/root usr/lib/perl5/site_perl/5.16/linux-thread-multi/auto/Git/ @@ -259,6 +266,7 @@ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/git-credential-cache--daemon.1.gz -rw-r--r-- root/root usr/man/man1/git-credential-cache.1.gz -rw-r--r-- root/root usr/man/man1/git-credential-store.1.gz +-rw-r--r-- root/root usr/man/man1/git-credential.1.gz -rw-r--r-- root/root usr/man/man1/git-cvsexportcommit.1.gz -rw-r--r-- root/root usr/man/man1/git-cvsimport.1.gz -rw-r--r-- root/root usr/man/man1/git-cvsserver.1.gz @@ -389,6 +397,7 @@ drwxr-xr-x root/root usr/man/man3/ -r--r--r-- root/root usr/man/man3/Git::SVN::Memoize::YAML.3pm.gz -r--r--r-- root/root usr/man/man3/Git::SVN::Prompt.3pm.gz -r--r--r-- root/root usr/man/man3/Git::SVN::Ra.3pm.gz +-r--r--r-- root/root usr/man/man3/Git::SVN::Utils.3pm.gz -r--r--r-- root/root usr/man/man3/private-Error.3pm.gz drwxr-xr-x root/root usr/man/man5/ -rw-r--r-- root/root usr/man/man5/gitattributes.5.gz diff --git a/git/.md5sum b/git/.md5sum index c5524ab64..f1dbad270 100644 --- a/git/.md5sum +++ b/git/.md5sum @@ -1,2 +1,2 @@ -21c7100cddee8579233a924111e829ab git-1.7.11.4.tar.gz -397af842126a5099968238ab946580a5 git-manpages-1.7.11.4.tar.gz +ceb1a6b17a3e33bbc70eadf8fce5876c git-1.7.12.tar.gz +0070ad185cfc29da545abe35ba8862e7 git-manpages-1.7.12.tar.gz diff --git a/git/Pkgfile b/git/Pkgfile index 65eec3235..5b4493fe0 100644 --- a/git/Pkgfile +++ b/git/Pkgfile @@ -6,7 +6,7 @@ # Nice to have: tk name=git -version=1.7.11.4 +version=1.7.12 release=1 source=(https://git-core.googlecode.com/files/$name-{,manpages-}$version.tar.gz) @@ -15,7 +15,7 @@ build() { # install Error.pm. this pretty much sucks, but i'm too lazy to # investigate whether there's a better way. - sed -i -e '44d' -e '46d' perl/Makefile.PL + sed -i -e '47d' -e '49d' perl/Makefile.PL make CFLAGS="$CFLAGS" prefix=/usr gitexecdir=/usr/lib/git-core \ INSTALLSITEMAN3DIR=/usr/man/man3 DESTDIR=$PKG install |