[PATCH 1/3] debianization update

2005-08-01 Thread Holger Eitzenberger

Hi,

attached is a patch containing a debianziation update for cogito, based 
upon the Debian/unstable package.  I mailed the official Debian 
maintainer in the hope to get an updated .deb but got no reply from him 
until today.  So i used his work to make a new release of it.


Note that this patch alone will not make the build work, the following 
two patches contain a makefile update and a small cleanup patch to 
remove the old debian/git-core.* files.


Also note that i had to remove the reference to the asciidoc.conf in 
Documentation/Makefile because asciidoc.conf is not available yet.


I hope that these patches are usefull for you.

Any suggestions/improvements welcome.

/holger
Debianization update for latest cogito (0.12.x).

---
commit f2d865a59091d712f9138dbb7b6df039b342844e
tree 7ad37ab44c23028d08595e75338869b2a88828e2
parent 5811433ca54eaab5cefe36924154428697e8826e
author Holger Eitzenberger [EMAIL PROTECTED] Mon, 01 Aug 2005 23:30:00 +0200
committer Holger Eitzenberger [EMAIL PROTECTED] Mon, 01 Aug 2005 23:30:00 +0200

 debian/README.Debian|   21 
 debian/changelog|   21 +---
 debian/control  |   23 +++--
 debian/dirs |4 +
 debian/git-core.doc-base|   12 
 debian/git-core.install |1 
 debian/helper-scripts/make-orig.tgz |   12 
 debian/helper-scripts/make-package  |4 +
 debian/helper-scripts/make-test |   28 ++
 debian/rules|   94 ---
 10 files changed, 135 insertions(+), 85 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,21 @@
+cogito for Debian
+-
+
+GIT is Linus Torvald's directory content manager.  Cogito is Petr Pasky
+Baudis' distributed revision control system on top of GIT.
+
+The changes from the upstream are:
+
+* don't install the 'git' and 'cg' commands (to avoid conflicts with
+  the git and cgvg debian packages)
+
+* make  install docs in .txt format
+
+* minor tweaks to the docs (sent to upstream, pending approval)
+
+
+Here is the list of GIT repositories available on kernel.org:
+http://kernel.org/git/
+
+
+ -- Sebastian Kuzminsky [EMAIL PROTECTED], Thu,  5 May 2005 10:27:14 -0600
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,21 +1,6 @@
-git-core (0.99-2) unstable; urgency=low
+cogito (0.12.1-1) stable; urgency=low
 
-  * Conflict with the GNU Interactive Tools package, which also installs
-/usr/bin/git.
-  * Use the Mozilla SHA1 code and/or the PPC assembly in preference to
-OpenSSL.  This is only a partial fix for the license issues with OpenSSL.
-  * Minor tweaks to the Depends.
+  * new version 0.12.1 (needed in order check out Linus' git trees).
 
- -- Ryan Anderson [EMAIL PROTECTED]  Sat, 23 Jul 2005 14:15:00 -0400
+ -- Holger Eitzenberger [EMAIL PROTECTED]  Mon, 01 Aug 2005 20:00:00 -0200
 
-git-core (0.99-1) unstable; urgency=low
-
-  * Update deb package support to build correctly. 
-
- -- Ryan Anderson [EMAIL PROTECTED]  Thu, 21 Jul 2005 02:03:32 -0400
-
-git-core (0.99-0) unstable; urgency=low
-
-  * Initial deb package support
-
- -- Eric Biederman [EMAIL PROTECTED]  Tue, 12 Jul 2005 10:57:51 -0600
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -1,19 +1,14 @@
-Source: git-core
+Source: cogito
 Section: devel
 Priority: optional
-Maintainer: Linus Torvalds [EMAIL PROTECTED]
-Build-Depends-Indep: libz-dev, libssl-dev, libcurl3-dev, asciidoc  6.0.3, xmlto, debhelper (= 4.0.0)
+Maintainer: Holger Eitzenberger [EMAIL PROTECTED]
+Build-Depends: debhelper (= 4.0.0), dpatch, zlib1g-dev, libcurl3-dev, asciidoc, xmlto
 Standards-Version: 3.6.1
 
-Package: git-core
+Package: cogito
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, patch, diff, rcs
-Recommends: rsync, curl, ssh
-Conflicts: git
-Description: The git content addressable filesystem
- GIT comes in two layers. The bottom layer is merely an extremely fast
- and flexible filesystem-based database designed to store directory trees
- with regard to their history. The top layer is a SCM-like tool which
- enables human beings to work with the database in a manner to a degree
- similar to other SCM tools (like CVS, BitKeeper or Monotone).
-
+Depends: ${shlibs:Depends}, rcs, patch, rsync, wget, rsh-client
+Description: version control system
+ Cogito is the user-friendly front-end to the GIT directory content
+ manager.  This package includes both the low-level GIT tools and the
+ high-level Cogito programs.
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1,4 @@
+usr/bin
+usr/share/doc/cogito/html
+usr/share/doc/cogito/txt
+usr/share/man/man7
diff --git a/debian/git-core.doc-base b/debian/git-core.doc-base
--- 

Re: [PATCH 1/3] debianization update

2005-08-01 Thread Sebastian Kuzminsky
Holger Eitzenberger [EMAIL PROTECTED] wrote:
 attached is a patch containing a debianziation update for cogito, based 
 upon the Debian/unstable package.  I mailed the official Debian 
 maintainer in the hope to get an updated .deb but got no reply from him 
 until today.  So i used his work to make a new release of it.

This does not belong in git.  The git-core debianization does its job
just fine, and shouldnt include any cogito debianization stuff.

If this was targeted at Pasky, I suggest this patchbomb wait until Cogito
doesnt include git-core.


-- 
Sebastian Kuzminsky
-
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html