From dc4393cba333c92873671a37e72efaf41bfa4697 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 19 Sep 2005 19:50:09 -0700 Subject: GIT 0.99.7a Signed-off-by: Junio C Hamano --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 128513a455..614494cb6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +git-core (0.99.7a-0) unstable; urgency=low + + * GIT 0.99.7a + + -- Junio C Hamano Mon, 19 Sep 2005 19:29:07 -0700 + git-core (0.99.7-0) unstable; urgency=low * GIT 0.99.7 -- cgit v1.3-5-g9baa From 990f856a62a24bfd56bac1f5e4581381369e4ede Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 22 Sep 2005 21:53:33 -0700 Subject: GIT 0.99.7b Signed-off-by: Junio C Hamano --- Makefile | 2 +- debian/changelog | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/Makefile b/Makefile index 93ceb6b407..ac13ecbedf 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ # DEFINES += -DUSE_STDEV -GIT_VERSION = 0.99.7a +GIT_VERSION = 0.99.7b CFLAGS = -g -O2 -Wall ALL_CFLAGS = $(CFLAGS) $(PLATFORM_DEFINES) $(DEFINES) diff --git a/debian/changelog b/debian/changelog index 614494cb6d..e6ea7b946a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +git-core (0.99.7b-0) unstable; urgency=low + + * GIT 0.99.7b + + -- Junio C Hamano Thu, 22 Sep 2005 21:46:44 -0700 + git-core (0.99.7a-0) unstable; urgency=low * GIT 0.99.7a -- cgit v1.3-5-g9baa From 00d8bbd3c4bba72a6dfd48c2c0c9cbaa000f13c2 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 24 Sep 2005 11:38:43 -0700 Subject: GIT 0.99.7c Contains the following post-0.99.7b fixes: - rsh.c string termination fix by H. Peter Anvin - further fetch fixes by Sergey Vlasov - diff-tree documentation by Robert Watson. - 'git diff --cached' synonymous to 'git diff --cached HEAD'. - subprocess.py licensing status clarification. Signed-off-by: Junio C Hamano --- Makefile | 2 +- debian/changelog | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/Makefile b/Makefile index ac13ecbedf..e90f646af0 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ # DEFINES += -DUSE_STDEV -GIT_VERSION = 0.99.7b +GIT_VERSION = 0.99.7c CFLAGS = -g -O2 -Wall ALL_CFLAGS = $(CFLAGS) $(PLATFORM_DEFINES) $(DEFINES) diff --git a/debian/changelog b/debian/changelog index e6ea7b946a..ef6156a764 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +git-core (0.99.7c-0) unstable; urgency=low + + * GIT 0.99.7c + + -- Junio C Hamano Sat, 24 Sep 2005 11:33:36 -0700 + git-core (0.99.7b-0) unstable; urgency=low * GIT 0.99.7b -- cgit v1.3-5-g9baa From d5bc7eecbbb0b9f6122708bf5cd62f78ebdaafd8 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 25 Sep 2005 00:36:26 -0700 Subject: GIT v0.99.7d Signed-off-by: Junio C Hamano --- Makefile | 2 +- debian/changelog | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/Makefile b/Makefile index e90f646af0..cfde69cc01 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ # DEFINES += -DUSE_STDEV -GIT_VERSION = 0.99.7c +GIT_VERSION = 0.99.7d CFLAGS = -g -O2 -Wall ALL_CFLAGS = $(CFLAGS) $(PLATFORM_DEFINES) $(DEFINES) diff --git a/debian/changelog b/debian/changelog index ef6156a764..a48c889d10 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +git-core (0.99.7d-0) unstable; urgency=low + + * GIT 0.99.7d + + -- Junio C Hamano Sun, 25 Sep 2005 00:40:46 -0700 + git-core (0.99.7c-0) unstable; urgency=low * GIT 0.99.7c -- cgit v1.3-5-g9baa From d071e8dbb6849d40038db2d98a601395fe7b0b73 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 5 Nov 2005 02:39:42 -0800 Subject: Package split: Debian. As discussed on the list, split the foreign SCM interoperability packages and documentation from the git-core binary package. Signed-off-by: Junio C Hamano --- Makefile | 4 ++-- debian/changelog | 7 +++++++ debian/control | 39 ++++++++++++++++++++++++++++++++++++++- debian/git-arch.files | 2 ++ debian/git-cvs.files | 2 ++ debian/git-doc.files | 7 +++++++ debian/git-email.files | 2 ++ debian/git-svn.files | 2 ++ debian/rules | 7 ++++++- 9 files changed, 68 insertions(+), 4 deletions(-) create mode 100644 debian/git-arch.files create mode 100644 debian/git-cvs.files create mode 100644 debian/git-doc.files create mode 100644 debian/git-email.files create mode 100644 debian/git-svn.files (limited to 'debian') diff --git a/Makefile b/Makefile index 6064672818..76d33b44f8 100644 --- a/Makefile +++ b/Makefile @@ -450,8 +450,8 @@ clean: rm -f git-core.spec *.pyc *.pyo rm -rf $(GIT_TARNAME) rm -f $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz - rm -f git-core_$(GIT_VERSION)-*.deb git-core_$(GIT_VERSION)-*.dsc - rm -f git-tk_$(GIT_VERSION)-*.deb + rm -f git-core_$(GIT_VERSION)-*.dsc + rm -f git-*_$(GIT_VERSION)-*.deb $(MAKE) -C Documentation/ clean $(MAKE) -C templates clean $(MAKE) -C t/ clean diff --git a/debian/changelog b/debian/changelog index 5fd31b7ef4..9ea3139dbb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +git-core (0.99.9-1) unstable; urgency=low + + * Split the git-core binary package into core, doc, and foreign SCM + interoperability modules. + + -- Junio C Hamano Sat, 5 Nov 2005 11:18:13 -0800 + git-core (0.99.9-0) unstable; urgency=low * GIT 0.99.9 diff --git a/debian/control b/debian/control index 1f45f93b36..f03ca4925e 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.6.1 Package: git-core Architecture: any Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}, rcs -Recommends: rsync, curl, ssh, libmail-sendmail-perl, libemail-valid-perl, libsvn-core-perl (>= 1.2.1), python (>= 2.4.0), less +Recommends: rsync, curl, ssh, python (>= 2.4.0), less Suggests: cogito, patch Conflicts: git, cogito (<< 0.13) Description: The git content addressable filesystem @@ -18,9 +18,46 @@ Description: The git content addressable filesystem enables human beings to work with the database in a manner to a degree similar to other SCM tools. +Package: git-doc +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends}, git-core, tk8.4 +Description: The git content addressable filesystem, Documentation + This package contains documentation for GIT. + Package: git-tk Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, git-core, tk8.4 Description: The git content addressable filesystem, GUI add-on This package contains 'gitk', the git revision tree visualizer. +Package: git-svn +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, git-core, libsvn-core-perl (>= 1.2.1) +Suggests: subversion +Description: The git content addressable filesystem, SVN interoperability + This package contains 'git-svnimport', to import development history from + SVN repositories. + +Package: git-arch +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, git-core +Suggests: tla, bazaar +Description: The git content addressable filesystem, GNUArch interoperability + This package contains 'git-archimport', to import development history from + GNUArch repositories. + +Package: git-cvs +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, git-core +Suggests: cvs +Description: The git content addressable filesystem, CVS interoperability + This package contains 'git-cvsimport', to import development history from + CVS repositories. + +Package: git-email +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends}, git-core, libmail-sendmail-perl, libemail-valid-perl +Description: The git content addressable filesystem, e-mail add-on + This package contains 'git-send-email', to send a series of patch e-mails. + + diff --git a/debian/git-arch.files b/debian/git-arch.files new file mode 100644 index 0000000000..1ad4656c53 --- /dev/null +++ b/debian/git-arch.files @@ -0,0 +1,2 @@ +/usr/bin/git-archimport +/usr/share/doc/git-core/git-archimport.* diff --git a/debian/git-cvs.files b/debian/git-cvs.files new file mode 100644 index 0000000000..8bf5090681 --- /dev/null +++ b/debian/git-cvs.files @@ -0,0 +1,2 @@ +/usr/bin/git-cvsimport +/usr/share/doc/git-core/git-cvsimport.* diff --git a/debian/git-doc.files b/debian/git-doc.files new file mode 100644 index 0000000000..0762f3791b --- /dev/null +++ b/debian/git-doc.files @@ -0,0 +1,7 @@ +/usr/share/doc/git-core/git-*.txt +/usr/share/doc/git-core/git-*.html +/usr/share/doc/git-core/*/*.html +/usr/share/doc/git-core/*/*.txt + + + diff --git a/debian/git-email.files b/debian/git-email.files new file mode 100644 index 0000000000..236754ceb6 --- /dev/null +++ b/debian/git-email.files @@ -0,0 +1,2 @@ +/usr/bin/git-send-email +/usr/share/doc/git-core/git-send-email.* diff --git a/debian/git-svn.files b/debian/git-svn.files new file mode 100644 index 0000000000..317b12a74a --- /dev/null +++ b/debian/git-svn.files @@ -0,0 +1,2 @@ +/usr/bin/git-svnimport +/usr/share/doc/git-core/git-svnimport.* diff --git a/debian/rules b/debian/rules index 568d430932..9f9514648f 100755 --- a/debian/rules +++ b/debian/rules @@ -41,7 +41,7 @@ MAN_DESTDIR := $(DESTDIR)/$(MANDIR) build: debian/build-stamp debian/build-stamp: dh_testdir - $(MAKE) prefix=$(PREFIX) PYTHON_PATH=/usr/bin/python2.4 all doc test + $(MAKE) prefix=$(PREFIX) PYTHON_PATH=/usr/bin/python2.4 all test doc touch debian/build-stamp debian-clean: @@ -65,7 +65,12 @@ install: build mkdir -p $(DOC_DESTDIR) find $(DOC) '(' -name '*.txt' -o -name '*.html' ')' -exec install {} $(DOC_DESTDIR) ';' + dh_movefiles -p git-arch + dh_movefiles -p git-cvs + dh_movefiles -p git-svn dh_movefiles -p git-tk + dh_movefiles -p git-email + dh_movefiles -p git-doc dh_movefiles -p git-core find debian/tmp -type d -o -print | sed -e 's/^/? /' -- cgit v1.3-5-g9baa From 9eba845f2088c33de3efe04492b9e33114c5fb52 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 5 Nov 2005 12:54:25 -0800 Subject: Further Debian split fixes. The doc installation was flattened, breaking links to howto/. Silly cut&paste error made git-doc depend on tk8.4. Doh. Move most of the documentation (except manuals) to git-doc. Signed-off-by: Junio C Hamano --- debian/control | 2 +- debian/git-doc.files | 4 ++-- debian/rules | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index f03ca4925e..8cc527e2da 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ Description: The git content addressable filesystem Package: git-doc Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, git-core, tk8.4 +Depends: ${shlibs:Depends}, ${misc:Depends}, git-core Description: The git content addressable filesystem, Documentation This package contains documentation for GIT. diff --git a/debian/git-doc.files b/debian/git-doc.files index 0762f3791b..567f5d7a8c 100644 --- a/debian/git-doc.files +++ b/debian/git-doc.files @@ -1,5 +1,5 @@ -/usr/share/doc/git-core/git-*.txt -/usr/share/doc/git-core/git-*.html +/usr/share/doc/git-core/*.txt +/usr/share/doc/git-core/*.html /usr/share/doc/git-core/*/*.html /usr/share/doc/git-core/*/*.txt diff --git a/debian/rules b/debian/rules index 9f9514648f..4ab221ce9e 100755 --- a/debian/rules +++ b/debian/rules @@ -62,8 +62,8 @@ install: build make DESTDIR=$(DESTDIR) prefix=$(PREFIX) mandir=$(MANDIR) \ install install-doc - mkdir -p $(DOC_DESTDIR) - find $(DOC) '(' -name '*.txt' -o -name '*.html' ')' -exec install {} $(DOC_DESTDIR) ';' + make -C Documentation DESTDIR=$(DESTDIR) prefix=$(PREFIX) \ + WEBDOC_DEST=$(DOC_DESTDIR) install-webdoc dh_movefiles -p git-arch dh_movefiles -p git-cvs -- cgit v1.3-5-g9baa From c0a2ed1b491deaf8160a311d6b39bae7e266248c Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 5 Nov 2005 12:54:40 -0800 Subject: Debian: test build. Update version number in changelog to match the 0.99.9.GIT version number, to allow building private deb from wip. Signed-off-by: Junio C Hamano --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9ea3139dbb..0c6e34b89d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +git-core (0.99.9.GIT-0) unstable; urgency=low + + * Test Build. + + -- Junio C Hamano Sat, 5 Nov 2005 11:18:13 -0800 + git-core (0.99.9-1) unstable; urgency=low * Split the git-core binary package into core, doc, and foreign SCM -- cgit v1.3-5-g9baa