threads / patch / 1657

patchcogito bugfixes and cleanups, mainly Debian things

Subject: [PATCH] cogito bugfixes and cleanups, mainly Debian things

## tl;dr

8 messages between Aug 26, 2005 and Sep 12, 2005. Diffs are folded; open one to read it.

replies: 7people: 2as markdown or json

Tommi Virtanen· Aug 26, 2005, 11:01 UTC · lore

As cogito contains only shell scripts, make the deb Arch: all.

Signed-off-by: Tommi Virtanen <tv@debian.org>

--- commit 0b1227b120532fe2d8b48ad2d43b2f002241f8d9 tree 1e00c450a8eb96159f0f5545ce94aabd3a1fcd44 parent 1190649aaff433501d6e6c92deb8a0f201fdd8d0 author Tommi Virtanen <tv@debian.org> Fri, 26 Aug 2005 13:34:00 +0300 committer Tommi Virtanen <tv@debian.org> Fri, 26 Aug 2005 13:34:00 +0300

 debian/control |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Show changes to debian/control +2 −2

diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,8 @@ Build-Depends: debhelper (>= 4.0.0), dpa
 Standards-Version: 3.6.1
 
 Package: cogito
-Architecture: any
-Depends: git-core, ${shlibs:Depends}, patch, diff, rcs
+Architecture: all
+Depends: git-core, patch, diff, rcs
 Recommends: rsync, curl, wget, rsh-client
 Conflicts: cgvg
 Description: version control system

Tommi Virtanen· Aug 26, 2005, 11:01 UTC · re: Tommi Virtanen · lore

Stylistical improvements on Debian package description.

Signed-off-by: Tommi Virtanen <tv@debian.org>

--- commit 97b501908e075bfd1f97261f94842669e7b4db5b tree ee48eaa9d8fbf6db7c2a19cfd93de52d60938655 parent 0b1227b120532fe2d8b48ad2d43b2f002241f8d9 author Tommi Virtanen <tv@debian.org> Fri, 26 Aug 2005 13:34:02 +0300 committer Tommi Virtanen <tv@debian.org> Fri, 26 Aug 2005 13:34:02 +0300

 debian/control |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Show changes to debian/control +5 −5

diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,8 @@ Architecture: all
 Depends: git-core, patch, diff, rcs
 Recommends: rsync, curl, wget, rsh-client
 Conflicts: cgvg
-Description: version control system
- Cogito is a version control system layered on top of the git tree history
- storage system. It aims at seamless user interface and ease of use, providing
- generally smoother user experience than the "raw" Core GIT itself and indeed
- many other version control systems.
+Description: A version control system layered on top of git
+ A version control system layered on top of the git tree history
+ storage system. It aims at seamless user interface and ease of use,
+ providing generally smoother user experience than the "raw" Core GIT
+ itself and indeed many other version control systems.

Tommi Virtanen· Aug 26, 2005, 11:01 UTC · re: Tommi Virtanen · lore

As long as the cg-cancel name is around, provide docs for it too.

Signed-off-by: Tommi Virtanen <tv@debian.org>

--- commit c1970992d81e2c26d2d85ad65b0e2e90fbeee7f1 tree 461b478052898b2d9cfc67a1b29098abdf5d427e parent 97b501908e075bfd1f97261f94842669e7b4db5b author Tommi Virtanen <tv@debian.org> Fri, 26 Aug 2005 13:34:03 +0300 committer Tommi Virtanen <tv@debian.org> Fri, 26 Aug 2005 13:34:03 +0300

 Documentation/Makefile |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

Show changes to Documentation/Makefile +7 −1

diff --git a/Documentation/Makefile b/Documentation/Makefile
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -1,7 +1,7 @@
 CG_IGNORE=$(wildcard ../cg-X* ../cg-*.orig ../cg-*.rej)
 CG_SRC=$(filter-out $(CG_IGNORE), $(wildcard ../cg-*))
 
-MAN1_TXT=$(patsubst ../cg-%,cg-%.txt,$(CG_SRC))
+MAN1_TXT=$(patsubst ../cg-%,cg-%.txt,$(CG_SRC)) cg-cancel.txt
 MAN7_TXT=cogito.txt
 
 DOC_HTML=$(patsubst %.txt,%.html,$(MAN1_TXT) $(MAN7_TXT)) introduction.html
@@ -71,3 +71,9 @@ cogito.txt : make-cogito-asciidoc
 
 cg-%.txt : ../cg-% make-cg-asciidoc
 	./make-cg-asciidoc $< > $@
+
+cg-cancel.txt : cg-reset.txt
+	ln -s $< $@
+
+cg-cancel.1 : cg-reset.1
+	ln -s $< $@

Tommi Virtanen· Aug 26, 2005, 11:01 UTC · re: Tommi Virtanen · lore

Ignore more generated files.

Signed-off-by: Tommi Virtanen <tv@debian.org>

--- commit 91aeeed108292bb42f7b133da13ec6881cf84a9e tree fd0dc430a655fde2a21a9634c914b22db0ee96ce parent c1970992d81e2c26d2d85ad65b0e2e90fbeee7f1 author Tommi Virtanen <tv@debian.org> Fri, 26 Aug 2005 13:34:07 +0300 committer Tommi Virtanen <tv@debian.org> Fri, 26 Aug 2005 13:34:07 +0300

 .gitignore               |    2 ++
 Documentation/.gitignore |    1 +
 2 files changed, 3 insertions(+), 0 deletions(-)

Show changes to 2 files +3 −0

.gitignore, Documentation/.gitignore

diff --git a/.gitignore b/.gitignore
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 cg-version
+build-stamp
+configure-stamp
diff --git a/Documentation/.gitignore b/Documentation/.gitignore
--- a/Documentation/.gitignore
+++ b/Documentation/.gitignore
@@ -1,2 +1,3 @@
 *.html
 cogito.txt
+*.[1-9]

Tommi Virtanen· Aug 26, 2005, 11:01 UTC · re: Tommi Virtanen · lore

Make the text format docs too.

Signed-off-by: Tommi Virtanen <tv@debian.org>

--- commit 3a0094e4985bcb5970ecee2d59d0ba5f5a806d2d tree b4d3b267a4b15d3068727fad080c12f6d10a6cd9 parent 91aeeed108292bb42f7b133da13ec6881cf84a9e author Tommi Virtanen <tv@debian.org> Fri, 26 Aug 2005 13:34:09 +0300 committer Tommi Virtanen <tv@debian.org> Fri, 26 Aug 2005 13:34:09 +0300

 Documentation/Makefile |    4 +++-
 debian/rules           |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

Show changes to 2 files +4 −2

Documentation/Makefile, debian/rules

diff --git a/Documentation/Makefile b/Documentation/Makefile
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -29,7 +29,7 @@ INSTALL=install
 # yourself - yes, all 6 characters of it!
 #
 
-all: html man
+all: html man txt
 
 html: $(DOC_HTML)
 
@@ -38,6 +38,8 @@ man: man1 man7
 man1: $(DOC_MAN1)
 man7: $(DOC_MAN7)
 
+txt: $(MAN1_TXT) $(MAN7_TXT)
+
 install: man
 	$(INSTALL) -m755 -d $(DESTDIR)/$(txtdir)
 	$(INSTALL) $(MAN1_TXT) $(MAN7_TXT) $(DESTDIR)/$(txtdir)
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,7 @@ build: build-stamp
 build-stamp: configure-stamp 
 	dh_testdir
 	$(MAKE)
-	$(MAKE) -C Documentation html man
+	$(MAKE) -C Documentation all
 	touch build-stamp
 
 clean:

Petr Baudis· Sep 12, 2005, 00:31 UTC · re: Tommi Virtanen · lore

Re: [PATCH] cogito bugfixes and cleanups, mainly Debian things

Dear diary, on Fri, Aug 26, 2005 at 01:01:35PM CEST, I got a letter where Tommi Virtanen <tv@debian.org> told me that...

> As long as the cg-cancel name is around, provide docs for it too.

cg-cancel is a compatibility alias only, so adding docs for it would only encourage its further use, which is precisely what I don't want.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
If you want the holes in your knowledge showing up try teaching
someone.  -- Alan Cox

Tommi Virtanen· Sep 12, 2005, 07:29 UTC · re: Petr Baudis · lore

Re: [PATCH] cogito bugfixes and cleanups, mainly Debian things

Petr Baudis wrote:

>>As long as the cg-cancel name is around, provide docs for it too.
> cg-cancel is a compatibility alias only, so adding docs for it would
> only encourage its further use, which is precisely what I don't want.

Maybe then it should have documentation that basically states "cg-cancel is deprecated, please use cg-reset".

Petr Baudis· Sep 12, 2005, 10:21 UTC · re: Tommi Virtanen · lore

Re: [PATCH] cogito bugfixes and cleanups, mainly Debian things

Dear diary, on Mon, Sep 12, 2005 at 09:29:32AM CEST, I got a letter where Tommi Virtanen <tv@debian.org> told me that...

Show 7 quoted lines

> Petr Baudis wrote:
> >>As long as the cg-cancel name is around, provide docs for it too.
> > cg-cancel is a compatibility alias only, so adding docs for it would
> > only encourage its further use, which is precisely what I don't want.
> 
> Maybe then it should have documentation that basically states
> "cg-cancel is deprecated, please use cg-reset".

Well, I don't know if it's worth the trouble - what would be more useful would be printing a warning when cg-reset is called as cg-cancel - we should remember to do that if we ever alias something else. But I'll just remove cg-cancel by now, it's been two releases.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
If you want the holes in your knowledge showing up try teaching
someone.  -- Alan Cox