michael@516: Index: cogito-0.18.2/Makefile michael@516: --- cogito-0.18.2/Makefile.orig 2006-11-17 01:37:24.000000000 +0100 michael@516: +++ cogito-0.18.2/Makefile 2012-06-18 16:02:16.000000000 +0200 michael@516: @@ -2,8 +2,8 @@ michael@516: prefix="$(HOME)" michael@516: michael@516: bindir=$(prefix)/bin michael@516: -libdir=$(prefix)/lib/cogito michael@516: -sharedir=$(prefix)/share/cogito michael@516: +libdir=$(prefix)/lib/git/cogito michael@516: +sharedir=$(prefix)/share/git/cogito michael@516: michael@516: INSTALL?=install michael@516: michael@516: Index: gc-utils/doc/Makefile michael@516: --- gc-utils/doc/Makefile.orig 2008-08-01 17:39:15.000000000 +0200 michael@516: +++ gc-utils/doc/Makefile 2012-06-18 16:02:16.000000000 +0200 michael@516: @@ -29,17 +29,17 @@ michael@516: michael@516: .PHONY: gen install clean uninstall michael@516: michael@516: -gen:: $(manpagesgz) michael@516: +gen:: $(manpages) michael@516: michael@516: $(manpagesgz): michael@516: $(QUIET_GEN) cat $(@:../build/%.1.gz=%.1) | sed -e 's,\$$VERSION\$$,$(VERSION_SQ),' | gzip -9 > $@ michael@516: michael@516: -install: $(manpagesgz) michael@516: +install: $(manpages) michael@516: @$(MKINSTALLDIRS) $(DESTDIR)$(man1dir) michael@516: ifndef V michael@516: - @$(foreach f, $(manpagesgz), $(QUIET_INSTALL) $(INSTALL) -m644 $f "$(DESTDIR)$(man1dir)/$(f:../build/%=%)" ;) michael@516: + @$(foreach f, $(manpages), $(QUIET_INSTALL) $(INSTALL) -m644 $f "$(DESTDIR)$(man1dir)/$(f:../build/%=%)" ;) michael@516: else michael@516: - $(foreach f, $(manpagesgz), $(INSTALL) -m644 $f "$(DESTDIR)$(man1dir)/$(f:../build/%=%)" ;) michael@516: + $(foreach f, $(manpages), $(INSTALL) -m644 $f "$(DESTDIR)$(man1dir)/$(f:../build/%=%)" ;) michael@516: endif michael@516: michael@516: uninstall: michael@516: Index: git-1.7.11.4/Documentation/Makefile michael@516: --- git-1.7.11.4/Documentation/Makefile.orig 2012-06-18 00:01:30.000000000 +0200 michael@516: +++ git-1.7.11.4/Documentation/Makefile 2012-06-18 16:02:16.000000000 +0200 michael@516: @@ -56,10 +56,10 @@ michael@516: infodir?=$(prefix)/share/info michael@516: MAKEINFO=makeinfo michael@516: INSTALL_INFO=install-info michael@516: -DOCBOOK2X_TEXI=docbook2x-texi michael@516: +DOCBOOK2X_TEXI=docbook2texi michael@516: DBLATEX=dblatex michael@516: ifndef PERL_PATH michael@516: - PERL_PATH = /usr/bin/perl michael@516: + PERL_PATH = perl michael@516: endif michael@516: michael@516: -include ../config.mak.autogen michael@516: Index: git-1.7.11.4/Makefile michael@516: --- git-1.7.11.4/Makefile.orig 2012-06-18 00:01:30.000000000 +0200 michael@516: +++ git-1.7.11.4/Makefile 2012-06-18 16:02:16.000000000 +0200 michael@516: @@ -339,12 +339,12 @@ michael@516: bindir = $(prefix)/$(bindir_relative) michael@516: mandir = share/man michael@516: infodir = share/info michael@516: -gitexecdir = libexec/git-core michael@516: +gitexecdir = libexec/git michael@516: mergetoolsdir = $(gitexecdir)/mergetools michael@516: sharedir = $(prefix)/share michael@516: gitwebdir = $(sharedir)/gitweb michael@516: localedir = $(sharedir)/locale michael@516: -template_dir = share/git-core/templates michael@516: +template_dir = share/git/templates michael@516: htmldir = share/doc/git-doc michael@516: ETC_GITCONFIG = $(sysconfdir)/gitconfig michael@516: ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes michael@516: @@ -1455,10 +1455,10 @@ michael@516: else michael@516: ifdef CURLDIR michael@516: # Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case. michael@516: - BASIC_CFLAGS += -I$(CURLDIR)/include michael@516: - CURL_LIBCURL = -L$(CURLDIR)/$(lib) $(CC_LD_DYNPATH)$(CURLDIR)/$(lib) -lcurl michael@516: + BASIC_CFLAGS += `$(CURLDIR)/bin/curl-config --cflags` michael@516: + CURL_LIBCURL = `$(CURLDIR)/bin/curl-config --libs` michael@516: else michael@516: - CURL_LIBCURL = -lcurl michael@516: + CURL_LIBCURL = -lcurl -lssl -lcrypto michael@516: endif michael@516: ifdef NEEDS_SSL_WITH_CURL michael@516: CURL_LIBCURL += -lssl michael@516: @@ -2553,6 +2553,12 @@ michael@516: $(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' michael@516: $(INSTALL) -m 644 $(SCRIPT_LIB) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' michael@516: $(INSTALL) $(install_bindir_programs) '$(DESTDIR_SQ)$(bindir_SQ)' michael@516: + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(prefix)/lib' michael@516: + $(INSTALL) -m 644 $(LIB_FILE) '$(DESTDIR_SQ)$(prefix)/lib/libgit.a' michael@516: + $(INSTALL) -m 644 $(XDIFF_LIB) '$(DESTDIR_SQ)$(prefix)/lib/libgit-xdiff.a' michael@516: + $(INSTALL) -m 644 $(VCSSVN_LIB) '$(DESTDIR_SQ)$(prefix)/lib/libgit-vcssvn.a' michael@516: + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(prefix)/include/git' michael@516: + for h in $(LIB_H); do b=`echo $$h | sed -e 's;/*[^/][^/]*$$;;'`; $(INSTALL) -d -m 755 $(DESTDIR_SQ)$(prefix)/include/git/$$b; $(INSTALL) -m 644 $$h $(DESTDIR_SQ)$(prefix)/include/git/$$h; done michael@516: $(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install michael@516: $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(mergetools_instdir_SQ)' michael@516: $(INSTALL) -m 644 mergetools/* '$(DESTDIR_SQ)$(mergetools_instdir_SQ)' michael@516: Index: git-1.7.11.4/config.mak.in michael@516: --- git-1.7.11.4/config.mak.in.orig 2012-06-18 00:01:30.000000000 +0200 michael@516: +++ git-1.7.11.4/config.mak.in 2012-06-18 16:02:16.000000000 +0200 michael@516: @@ -15,9 +15,9 @@ michael@516: prefix = @prefix@ michael@516: exec_prefix = @exec_prefix@ michael@516: bindir = @bindir@ michael@516: -gitexecdir = @libexecdir@/git-core michael@516: +gitexecdir = @libexecdir@/git michael@516: datarootdir = @datarootdir@ michael@516: -template_dir = @datadir@/git-core/templates michael@516: +template_dir = @datadir@/git/templates michael@516: sysconfdir = @sysconfdir@ michael@516: michael@516: mandir=@mandir@ michael@516: Index: git-1.7.11.4/perl/Makefile.PL michael@516: --- git-1.7.11.4/perl/Makefile.PL.orig 2012-06-18 00:01:30.000000000 +0200 michael@516: +++ git-1.7.11.4/perl/Makefile.PL 2012-06-18 16:02:16.000000000 +0200 michael@516: @@ -55,5 +55,6 @@ michael@516: PM => \%pm, michael@516: PM_FILTER => qq[\$(PERL) -pe "s<\\Q++LOCALEDIR++\\E><$localedir>"], michael@516: MAKEFILE => 'perl.mak', michael@516: - INSTALLSITEMAN3DIR => '$(SITEPREFIX)/share/man/man3' michael@516: + INSTALLDIRS => 'vendor', michael@516: + INSTALLSITEMAN3DIR => '$(SITEPREFIX)/man/man3' michael@516: ); michael@516: Index: git-1.7.11.4/sha1_file.c michael@516: --- git-1.7.11.4/sha1_file.c.orig 2012-06-18 00:01:30.000000000 +0200 michael@516: +++ git-1.7.11.4/sha1_file.c 2012-06-18 16:32:16.000000000 +0200 michael@516: @@ -20,6 +20,7 @@ michael@516: #include "sha1-lookup.h" michael@516: #include "bulk-checkin.h" michael@516: #include "streaming.h" michael@516: +#include michael@516: michael@516: #ifndef O_NOATIME michael@516: #if defined(__linux__) && (defined(__i386__) || defined(__PPC__)) michael@516: Index: git-1.7.11.4/templates/Makefile michael@516: --- git-1.7.11.4/templates/Makefile.orig 2012-06-18 00:01:30.000000000 +0200 michael@516: +++ git-1.7.11.4/templates/Makefile 2012-06-18 16:02:16.000000000 +0200 michael@516: @@ -8,7 +8,7 @@ michael@516: TAR ?= tar michael@516: RM ?= rm -f michael@516: prefix ?= $(HOME) michael@516: -template_instdir ?= $(prefix)/share/git-core/templates michael@516: +template_instdir ?= $(prefix)/share/git/templates michael@516: # DESTDIR= michael@516: michael@516: ifndef SHELL_PATH michael@516: Index: stgit-0.14.3/setup.py michael@516: --- stgit-0.14.3/setup.py.orig 2008-06-09 00:26:03.000000000 +0200 michael@516: +++ stgit-0.14.3/setup.py 2012-06-18 16:02:16.000000000 +0200 michael@516: @@ -61,10 +61,10 @@ michael@516: long_description = 'Push/pop utility on top of GIT', michael@516: scripts = ['stg'], michael@516: packages = ['stgit', 'stgit.commands'], michael@516: - data_files = [('share/stgit/templates', glob.glob('templates/*.tmpl')), michael@516: - ('share/stgit/examples', glob.glob('examples/*.tmpl')), michael@516: - ('share/stgit/examples', ['examples/gitconfig']), michael@516: - ('share/stgit/contrib', ['contrib/diffcol.sh', michael@516: + data_files = [('share/git/stgit/templates', glob.glob('templates/*.tmpl')), michael@516: + ('share/git/stgit/examples', glob.glob('examples/*.tmpl')), michael@516: + ('share/git/stgit/examples', ['examples/gitconfig']), michael@516: + ('share/git/stgit/contrib', ['contrib/diffcol.sh', michael@516: 'contrib/stgbashprompt.sh', michael@516: 'contrib/stgit-completion.bash']), michael@516: ('share/doc/stgit', glob.glob('doc/*.txt'))] michael@516: Index: stgit-0.14.3/stg michael@516: --- stgit-0.14.3/stg.orig 2006-04-07 23:38:54.000000000 +0200 michael@516: +++ stgit-0.14.3/stg 2012-06-18 16:02:16.000000000 +0200 michael@516: @@ -26,12 +26,13 @@ michael@516: # It is assumed that the user installed StGIT using the --prefix= option michael@516: prefix, bin = os.path.split(sys.path[0]) michael@516: michael@516: -if bin == 'bin' and prefix != sys.prefix: michael@516: +if bin == 'bin': michael@516: sys.prefix = prefix michael@516: sys.exec_prefix = prefix michael@516: michael@516: major, minor = sys.version_info[0:2] michael@516: - local_path = [os.path.join(prefix, 'lib', 'python'), michael@516: + local_path = [os.path.join(prefix, 'lib', 'git'), michael@516: + os.path.join(prefix, 'lib', 'python'), michael@516: os.path.join(prefix, 'lib', 'python%s.%s' % (major, minor)), michael@516: os.path.join(prefix, 'lib', 'python%s.%s' % (major, minor), michael@516: 'site-packages')]