summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/control48
-rw-r--r--debian/git.NEWS.Debian (renamed from debian/git-core.NEWS.Debian)0
-rw-r--r--debian/git.README.Debian (renamed from debian/git-core.README.Debian)0
-rw-r--r--debian/git.README.source (renamed from debian/git-core.README.source)0
-rw-r--r--debian/git.conffiles (renamed from debian/git-core.conffiles)0
-rw-r--r--debian/git.docs (renamed from debian/git-core.docs)0
-rw-r--r--debian/git.emacsen-startup (renamed from debian/git-core.emacsen-startup)0
-rwxr-xr-xdebian/git.preinst (renamed from debian/git-core.preinst)0
-rwxr-xr-xdebian/rules115
9 files changed, 92 insertions, 71 deletions
diff --git a/debian/control b/debian/control
index 0189ebb..4d14c7e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: git-core
+Source: git
Section: vcs
Priority: optional
Maintainer: Gerrit Pape <pape@smarden.org>
@@ -7,15 +7,15 @@ Build-Depends: libz-dev, libcurl4-gnutls-dev | libcurl3-gnutls-dev, asciidoc (>>
Standards-Version: 3.8.4.0
Vcs-Git: http://smarden.org/git/git.git/
-Package: git-core
+Package: git
Architecture: any
Depends: ${shlibs:Depends}, perl-modules, liberror-perl, libdigest-sha1-perl,
libc6.1 (>= 2.10.2-6) [ia64]
Recommends: patch, less, rsync, ssh-client
Suggests: git-doc, git-arch, git-cvs, git-svn, git-email, git-daemon-run, git-gui, gitk, gitweb
-Replaces: cogito (<< 0.16rc2-0), git-completion
-Conflicts: git (<< 4.3.20-11), qgit (<< 1.5.5), git-completion
-Provides: git-completion
+Replaces: cogito (<< 0.16rc2-0), git-completion, git-core
+Conflicts: git (<< 4.3.20-11), qgit (<< 1.5.5), git-completion, git-core (<= 1:1.7.0.3-1)
+Provides: git-completion, git-core
Description: fast, scalable, distributed revision control system
Git is popular version control system designed to handle very large
projects with speed and efficiency; it is used for many high profile
@@ -31,10 +31,28 @@ Description: fast, scalable, distributed revision control system
tree visualizer, tools for interoperating with other VCS's, or a web
interface, is provided as separate git* packages.
+Package: git-core
+Architecture: all
+Depends: git (>> 1:1.7.0.2)
+Description: fast, scalable, distributed revision control system (obsolete)
+ Git is popular version control system designed to handle very large
+ projects with speed and efficiency; it is used for many high profile
+ open source projects, most notably the Linux kernel.
+ .
+ Git falls in the category of distributed source code management tools.
+ Every Git working directory is a full-fledged repository with full
+ revision tracking capabilities, not dependent on network access or a
+ central server.
+ .
+ This package contains no files. The 'git-core' package has been
+ renamed to 'git', which has been installed automatically. This
+ git-core package is now obsolte, and can safely be removed from the
+ system..
+
Package: git-doc
Section: doc
Architecture: all
-Suggests: git-core, git-arch, git-cvs, git-svn, git-email, gitk, gitweb
+Suggests: git, git-arch, git-cvs, git-svn, git-email, gitk, gitweb
Description: fast, scalable, distributed revision control system (documentation)
Git is popular version control system designed to handle very large
projects with speed and efficiency; it is used for many high profile
@@ -49,7 +67,7 @@ Description: fast, scalable, distributed revision control system (documentation)
Package: git-arch
Architecture: all
-Depends: git-core (>> ${source:Upstream-Version}), git-core (<< ${source:Upstream-Version}-.), tla
+Depends: git (>> ${source:Upstream-Version}), git (<< ${source:Upstream-Version}-.), tla
Suggests: git-doc
Replaces: cogito (<< 0.16rc2-0)
Description: fast, scalable, distributed revision control system (arch interoperability)
@@ -67,7 +85,7 @@ Description: fast, scalable, distributed revision control system (arch interoper
Package: git-cvs
Architecture: all
-Depends: git-core (>> ${source:Upstream-Version}), git-core (<< ${source:Upstream-Version}-.), cvsps (>> 2.1-0), libdbd-sqlite3-perl
+Depends: git (>> ${source:Upstream-Version}), git (<< ${source:Upstream-Version}-.), cvsps (>> 2.1-0), libdbd-sqlite3-perl
Suggests: git-doc, cvs
Replaces: cogito (<< 0.16rc2-0)
Description: fast, scalable, distributed revision control system (cvs interoperability)
@@ -86,7 +104,7 @@ Description: fast, scalable, distributed revision control system (cvs interopera
Package: git-svn
Architecture: all
-Depends: git-core (>> ${source:Upstream-Version}), git-core (<< ${source:Upstream-Version}-.), libsvn-perl | libsvn-core-perl, libwww-perl, libterm-readkey-perl
+Depends: git (>> ${source:Upstream-Version}), git (<< ${source:Upstream-Version}-.), libsvn-perl | libsvn-core-perl, libwww-perl, libterm-readkey-perl
Suggests: git-doc, subversion
Replaces: cogito (<< 0.16rc2-0)
Description: fast, scalable, distributed revision control system (svn interoperability)
@@ -104,7 +122,7 @@ Description: fast, scalable, distributed revision control system (svn interopera
Package: git-email
Architecture: all
-Depends: git-core (>> ${source:Upstream-Version}), git-core (<< ${source:Upstream-Version}-.)
+Depends: git (>> ${source:Upstream-Version}), git (<< ${source:Upstream-Version}-.)
Recommends: libemail-valid-perl, libnet-smtp-ssl-perl, libauthen-sasl-perl
Suggests: git-doc
Replaces: cogito (<< 0.16rc2-0)
@@ -123,7 +141,7 @@ Description: fast, scalable, distributed revision control system (email add-on)
Package: git-daemon-run
Architecture: all
-Depends: git-core (>> ${source:Upstream-Version}), git-core (<< ${source:Upstream-Version}-.), runit (>= 1.8.0-2), adduser
+Depends: git (>> ${source:Upstream-Version}), git (<< ${source:Upstream-Version}-.), runit (>= 1.8.0-2), adduser
Description: fast, scalable, distributed revision control system (git-daemon service)
Git is popular version control system designed to handle very large
projects with speed and efficiency; it is used for many high profile
@@ -134,14 +152,14 @@ Description: fast, scalable, distributed revision control system (git-daemon ser
revision tracking capabilities, not dependent on network access or a
central server.
.
- git-daemon, as provided by the git-core package, is a simple server for git
+ git-daemon, as provided by the git package, is a simple server for git
repositories, ideally suited for read-only updates, i.e. pulling from git
repositories through the network. This package provides a runit service
for running git-daemon permanently.
Package: git-gui
Architecture: all
-Depends: git-core (>> ${source:Upstream-Version}), git-core (<< ${source:Upstream-Version}-.), tk (>= 8.4)
+Depends: git (>> ${source:Upstream-Version}), git (<< ${source:Upstream-Version}-.), tk (>= 8.4)
Replaces: git-core (<< 1:1.5.2.2-3)
Recommends: gitk
Suggests: git-doc
@@ -159,7 +177,7 @@ Description: fast, scalable, distributed revision control system (GUI)
Package: gitk
Architecture: all
-Depends: git-core (>> ${source:Upstream-Version}), git-core (<< ${source:Upstream-Version}-.), tk (>= 8.4)
+Depends: git (>> ${source:Upstream-Version}), git (<< ${source:Upstream-Version}-.), tk (>= 8.4)
Suggests: git-doc
Replaces: cogito (<< 0.16rc2-0)
Description: fast, scalable, distributed revision control system (revision tree visualizer)
@@ -176,7 +194,7 @@ Description: fast, scalable, distributed revision control system (revision tree
Package: gitweb
Architecture: all
-Depends: git-core (>> ${source:Upstream-Version}), git-core (<< ${source:Upstream-Version}-.), perl
+Depends: git (>> ${source:Upstream-Version}), git (<< ${source:Upstream-Version}-.), perl
Suggests: git-doc
Description: fast, scalable, distributed revision control system (web interface)
Git is popular version control system designed to handle very large
diff --git a/debian/git-core.NEWS.Debian b/debian/git.NEWS.Debian
index f812c32..f812c32 100644
--- a/debian/git-core.NEWS.Debian
+++ b/debian/git.NEWS.Debian
diff --git a/debian/git-core.README.Debian b/debian/git.README.Debian
index ad1d0b0..ad1d0b0 100644
--- a/debian/git-core.README.Debian
+++ b/debian/git.README.Debian
diff --git a/debian/git-core.README.source b/debian/git.README.source
index 6508390..6508390 100644
--- a/debian/git-core.README.source
+++ b/debian/git.README.source
diff --git a/debian/git-core.conffiles b/debian/git.conffiles
index 6670cf8..6670cf8 100644
--- a/debian/git-core.conffiles
+++ b/debian/git.conffiles
diff --git a/debian/git-core.docs b/debian/git.docs
index f8725d1..f8725d1 100644
--- a/debian/git-core.docs
+++ b/debian/git.docs
diff --git a/debian/git-core.emacsen-startup b/debian/git.emacsen-startup
index 5e8df73..5e8df73 100644
--- a/debian/git-core.emacsen-startup
+++ b/debian/git.emacsen-startup
diff --git a/debian/git-core.preinst b/debian/git.preinst
index c032e00..c032e00 100755
--- a/debian/git-core.preinst
+++ b/debian/git.preinst
diff --git a/debian/rules b/debian/rules
index 10e8d85..fc55462 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ CC =gcc
CFLAGS =-g -Wall
STRIP =strip
TEST =test
-OPTS =NO_OPENSSL=1 prefix=/usr gitexecdir=/usr/lib/git-core \
+OPTS =NO_OPENSSL=1 prefix=/usr gitexecdir=/usr/lib/git \
mandir=/usr/share/man INSTALLDIRS=vendor \
NO_PYTHON=1 \
THREADED_DELTA_SEARCH=1 NO_CROSS_DIRECTORY_HARDLINKS=1 \
@@ -43,12 +43,12 @@ patch-stamp:
build: deb-checkdir build-arch-stamp build-indep-stamp
build-arch-stamp: patch-stamp build-indep-stamp
-$(CC) -v
- DESTDIR='$(GIT)'-core $(MAKE) all \
+ DESTDIR='$(GIT)' $(MAKE) all \
CC='$(CC)' CFLAGS='$(CFLAGS)' $(OPTS)
test -z '$(TEST)' || \
- DESTDIR='$(GIT)'-core $(MAKE) $(TEST) \
+ DESTDIR='$(GIT)' $(MAKE) $(TEST) \
CC='$(CC)' CFLAGS='$(CFLAGS)' $(OPTS) || \
- GIT_TEST_OPTS=--verbose DESTDIR='$(GIT)'-core $(MAKE) $(TEST) \
+ GIT_TEST_OPTS=--verbose DESTDIR='$(GIT)' $(MAKE) $(TEST) \
CC='$(CC)' CFLAGS='$(CFLAGS)' $(OPTS)
touch build-arch-stamp
build-indep-stamp:
@@ -61,60 +61,58 @@ clean: deb-checkdir
for i in `ls -1r debian/diff/*.diff || :`; do patch -p1 -R <$$i; done
rm -rf '$(TMP)'
rm -f patch-stamp build-arch-stamp build-indep-stamp
- rm -rf '$(GIT)'-core '$(GIT)'-doc '$(GIT)'-arch '$(GIT)'-cvs \
+ rm -rf '$(GIT)' '$(GIT)'-doc '$(GIT)'-arch '$(GIT)'-cvs \
'$(GIT)'-svn '$(GIT)'-email '$(GIT)'-daemon-run '$(GIT)'-gui \
- '$(GIT)'k '$(GIT)'web
+ '$(GIT)'k '$(GIT)'web '$(GIT)'-core
rm -f debian/files debian/substvars changelog
install: install-arch install-indep
install-arch: deb-checkdir deb-checkuid build-arch-stamp
- # git-core
- rm -rf '$(GIT)-core'
- install -d -m0755 '$(GIT)'-core/usr/bin
- DESTDIR='$(GIT)'-core $(MAKE) install install-doc \
+ # git
+ rm -rf '$(GIT)'
+ install -d -m0755 '$(GIT)'/usr/bin
+ DESTDIR='$(GIT)' $(MAKE) install install-doc \
CC='$(CC)' CFLAGS='$(CFLAGS)' $(OPTS)
- install -d -m0755 '$(GIT)'-core/var/cache/git
- rm -f '$(GIT)'-core/usr/share/perl5/Error.pm
- rm -f '$(GIT)'-core/usr/share/man/man3/private-Error.3pm
- chmod 644 '$(GIT)'-core/usr/share/perl5/Git.pm
+ install -d -m0755 '$(GIT)'/var/cache/git
+ rm -f '$(GIT)'/usr/share/perl5/Error.pm
+ rm -f '$(GIT)'/usr/share/man/man3/private-Error.3pm
+ chmod 644 '$(GIT)'/usr/share/perl5/Git.pm
# don't include arch, cvs, svn, email, gui tools, and gitk program
for i in git-archimport git-cvs git-svn git-send-email \
git-gui git-citool; do \
- rm -f '$(GIT)'-core/usr/lib/git-core/$$i*; \
+ rm -f '$(GIT)'/usr/lib/git/$$i*; \
done
- rm -f '$(GIT)'-core/usr/bin/git-cvsserver
- rm -f '$(GIT)'-core/usr/bin/gitk
- for i in '$(GIT)'-core/usr/bin/* '$(GIT)'-core/usr/lib/git-core/*; do \
+ rm -f '$(GIT)'/usr/bin/git-cvsserver
+ rm -f '$(GIT)'/usr/bin/gitk
+ for i in '$(GIT)'/usr/bin/* '$(GIT)'/usr/lib/git/*; do \
test "`head -c2 $$i`" = '#!' || $(STRIP) -R .comment -R .note $$i; \
done
# don't include git-gui's lib
- rm -rf '$(GIT)'-core/usr/share/git-gui/
+ rm -rf '$(GIT)'/usr/share/git-gui/
# don't include gitk's lib
- rm -rf '$(GIT)'-core/usr/share/gitk/
+ rm -rf '$(GIT)'/usr/share/gitk/
# don't include arch, cvs, svn, email, gui, and gitk man pages
for i in git-archimport git-cvs git-svn git-send-email gitk \
git-gui git-citool; do \
- rm -f '$(GIT)'-core/usr/share/man/man1/$$i*; \
+ rm -f '$(GIT)'/usr/share/man/man1/$$i*; \
done
- chmod 0644 '$(GIT)'-core/usr/share/man/man?/*.[0-9]*
- gzip -9 '$(GIT)'-core/usr/share/man/man?/*.[0-9]*
+ chmod 0644 '$(GIT)'/usr/share/man/man?/*.[0-9]*
+ gzip -9 '$(GIT)'/usr/share/man/man?/*.[0-9]*
# emacs
- install -m0644 -D debian/git-core.emacsen-startup \
- '$(GIT)'-core/etc/emacs/site-start.d/50git-core.el
+ install -m0644 -D debian/git.emacsen-startup \
+ '$(GIT)'/etc/emacs/site-start.d/50git-core.el
# bash completion
- install -d -m0755 '$(GIT)'-core/etc/bash_completion.d
+ install -d -m0755 '$(GIT)'/etc/bash_completion.d
install -m0644 contrib/completion/git-completion.bash \
- '$(GIT)'-core/etc/bash_completion.d/git
+ '$(GIT)'/etc/bash_completion.d/git
# contrib
- install -d -m0755 '$(GIT)'-core/usr/share/doc/git-core
- cp -R contrib '$(GIT)'-core/usr/share/doc/git-core/
- rm -rf '$(GIT)'-core/usr/share/doc/git-core/contrib/completion
- find '$(GIT)'-core/usr/share/doc/git-core/contrib -type f | \
- xargs chmod 0644
- find '$(GIT)'-core/usr/share/doc/git-core/contrib -type d | \
- xargs chmod 0755
- find '$(GIT)'-core/usr/share/doc/git-core/ -name .gitignore | \
- xargs rm -f
+ install -d -m0755 '$(GIT)'/usr/share/doc/git
+ cp -R contrib '$(GIT)'/usr/share/doc/git/
+ rm -rf '$(GIT)'/usr/share/doc/git/contrib/completion
+ find '$(GIT)'/usr/share/doc/git/contrib -type f | xargs chmod 0644
+ find '$(GIT)'/usr/share/doc/git/contrib -type d | xargs chmod 0755
+ find '$(GIT)'/usr/share/doc/git/ -name .gitignore | xargs rm -f
+ ln -s git '$(GIT)'/usr/share/doc/git-core
# upstream changelog
test -r changelog || ln -s debian/changelog.upstream changelog
@@ -125,7 +123,7 @@ install-indep: build-arch-stamp build-indep-stamp
CC='$(CC)' CFLAGS='$(CFLAGS)' $(OPTS)
$(MAKE) -CDocumentation install-webdoc WEBDOC_DEST='$(TMP)'/html \
2>/dev/null
- # RelNotes are shipped in git-core
+ # RelNotes are shipped in git
rm -f '$(TMP)'/html/RelNotes*
# git-doc
rm -rf '$(GIT)'-doc
@@ -133,9 +131,9 @@ install-indep: build-arch-stamp build-indep-stamp
# git-cvs, git-svn
for i in cvs svn; do \
rm -rf '$(GIT)'-$$i && \
- install -d -m0755 '$(GIT)'-$$i/usr/lib/git-core && \
- install -m0755 '$(TMP)'/usr/lib/git-core/git-$$i* \
- '$(GIT)'-$$i/usr/lib/git-core/ && \
+ install -d -m0755 '$(GIT)'-$$i/usr/lib/git && \
+ install -m0755 '$(TMP)'/usr/lib/git/git-$$i* \
+ '$(GIT)'-$$i/usr/lib/git/ && \
install -d -m0755 '$(GIT)'-$$i/usr/share/man/man1 && \
install -m0644 '$(TMP)'/usr/share/man/man1/git-$$i* \
'$(GIT)'-$$i/usr/share/man/man1/ && \
@@ -146,18 +144,18 @@ install-indep: build-arch-stamp build-indep-stamp
install -m0755 '$(TMP)'/usr/bin/git-cvsserver '$(GIT)'-cvs/usr/bin/
# git-arch
rm -rf '$(GIT)'-arch
- install -d -m0755 '$(GIT)'-arch/usr/lib/git-core
- install -m0755 '$(TMP)'/usr/lib/git-core/git-archimport \
- '$(GIT)'-arch/usr/lib/git-core/
+ install -d -m0755 '$(GIT)'-arch/usr/lib/git
+ install -m0755 '$(TMP)'/usr/lib/git/git-archimport \
+ '$(GIT)'-arch/usr/lib/git/
install -d -m0755 '$(GIT)'-arch/usr/share/man/man1
install -m0644 '$(TMP)'/usr/share/man/man1/git-archimport.1 \
'$(GIT)'-arch/usr/share/man/man1/
gzip -9 '$(GIT)'-arch/usr/share/man/man1/*.1
# git-email
rm -rf '$(GIT)'-email
- install -d -m0755 '$(GIT)'-email/usr/lib/git-core
- install -m0755 '$(TMP)'/usr/lib/git-core/git-send-email \
- '$(GIT)'-email/usr/lib/git-core/
+ install -d -m0755 '$(GIT)'-email/usr/lib/git
+ install -m0755 '$(TMP)'/usr/lib/git/git-send-email \
+ '$(GIT)'-email/usr/lib/git/
install -d -m0755 '$(GIT)'-email/usr/share/man/man1
install -m0644 '$(TMP)'/usr/share/man/man1/git-send-email.1 \
'$(GIT)'-email/usr/share/man/man1/
@@ -171,11 +169,11 @@ install-indep: build-arch-stamp build-indep-stamp
'$(GIT)'-daemon-run/etc/sv/git-daemon/log/run
# git-gui
rm -rf '$(GIT)'-gui
- install -d -m0755 '$(GIT)'-gui/usr/lib/git-core
- install -m0755 '$(TMP)'/usr/lib/git-core/git-gui \
- '$(GIT)'-gui/usr/lib/git-core/
- install -m0755 '$(TMP)'/usr/lib/git-core/git-citool \
- '$(GIT)'-gui/usr/lib/git-core/
+ install -d -m0755 '$(GIT)'-gui/usr/lib/git
+ install -m0755 '$(TMP)'/usr/lib/git/git-gui \
+ '$(GIT)'-gui/usr/lib/git/
+ install -m0755 '$(TMP)'/usr/lib/git/git-citool \
+ '$(GIT)'-gui/usr/lib/git/
install -d -m0755 '$(GIT)'-gui/usr/share/man/man1
for i in gui citool; do \
install -m0644 '$(TMP)'/usr/share/man/man1/git-$$i* \
@@ -210,19 +208,24 @@ install-indep: build-arch-stamp build-indep-stamp
install -d -m0755 '$(GIT)'web/etc/apache2/conf.d
install -m0644 debian/gitweb.apache2.conf '$(GIT)'web/etc/apache2/conf.d/gitweb
install -d -m0755 '$(GIT)'web/var/cache/git/
+ # git-core
+ rm -rf '$(GIT)'-core
+ install -d -m0755 '$(GIT)'-core/usr/share/doc
+ ln -s git '$(GIT)'-core/usr/share/doc/git-core
+ install -d -m0755 '$(GIT)'-core/DEBIAN
# upstream changelog
test -r changelog || ln -s debian/changelog.upstream changelog
binary: binary-arch binary-indep
-binary-arch: install-arch git-core.deb
+binary-arch: install-arch git.deb
rm -f debian/substvars
- dpkg-shlibdeps '$(GIT)'-core/usr/bin/* '$(GIT)'-core/usr/lib/git-core/*
- dpkg-gencontrol -isp -pgit-core -P'$(GIT)'-core
- dpkg -b '$(GIT)'-core ..
+ dpkg-shlibdeps '$(GIT)'/usr/bin/* '$(GIT)'/usr/lib/git/*
+ dpkg-gencontrol -isp -pgit -P'$(GIT)'
+ dpkg -b '$(GIT)' ..
binary-indep: install-indep git-doc.deb git-arch.deb git-cvs.deb git-svn.deb \
git-daemon-run.deb git-email.deb git-gui.deb gitk.deb gitweb.deb
rm -f debian/substvars
- for i in -doc -arch -cvs -svn -daemon-run -email -gui k web; do \
+ for i in -doc -arch -cvs -svn -daemon-run -email -gui k web -core; do \
dpkg-gencontrol -isp -pgit$$i -P'$(GIT)'$$i && \
dpkg -b '$(GIT)'$$i .. || exit 1; \
done