Bug#322622: load-dirs-common: baz support

2005-09-06 Thread Teemu Ikonen
Hi,

I made a quick attempt at adding baz support to tla-load-dirs. It's
not very well tested, but worked for me. The attached diff is against
the debian source in unstable and adds a new binary package
baz-load-dirs.

Teemu
diff -r -N -u tla-load-dirs-1.0.26.orig/baz_load_dirs 
tla-load-dirs-1.0.26/baz_load_dirs
--- tla-load-dirs-1.0.26.orig/baz_load_dirs 1970-01-01 02:00:00.0 
+0200
+++ tla-load-dirs-1.0.26/baz_load_dirs  2005-09-06 15:16:25.0 +0300
@@ -0,0 +1,21 @@
+#!/usr/bin/python2.3
+# arch-tag: tla load dirs primary executable
+# Copyright (C) 2005 John Goerzen
+# [EMAIL PROTECTED]
+#
+#This program is free software; you can redistribute it and/or modify
+#it under the terms of the GNU General Public License as published by
+#the Free Software Foundation; either version 2 of the License, or
+#(at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU General Public License
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+from tla_support import init
+init.run(baz)
diff -r -N -u tla-load-dirs-1.0.26.orig/darcs_load_dirs 
tla-load-dirs-1.0.26/darcs_load_dirs
--- tla-load-dirs-1.0.26.orig/darcs_load_dirs   2005-04-17 06:04:36.0 
+0300
+++ tla-load-dirs-1.0.26/darcs_load_dirs2005-09-06 14:57:51.0 
+0300
@@ -23,4 +23,4 @@
 
 from tla_support import init
 
-init.run(darcsdefault=True)
+init.run(darcs)
diff -r -N -u tla-load-dirs-1.0.26.orig/debian/baz-load-dirs.install 
tla-load-dirs-1.0.26/debian/baz-load-dirs.install
--- tla-load-dirs-1.0.26.orig/debian/baz-load-dirs.install  1970-01-01 
02:00:00.0 +0200
+++ tla-load-dirs-1.0.26/debian/baz-load-dirs.install   2005-09-06 
16:32:58.0 +0300
@@ -0,0 +1,2 @@
+debian/tmp/usr/bin/baz_load_dirs usr/bin
+
diff -r -N -u tla-load-dirs-1.0.26.orig/debian/baz-load-dirs.manpages 
tla-load-dirs-1.0.26/debian/baz-load-dirs.manpages
--- tla-load-dirs-1.0.26.orig/debian/baz-load-dirs.manpages 1970-01-01 
02:00:00.0 +0200
+++ tla-load-dirs-1.0.26/debian/baz-load-dirs.manpages  2005-09-06 
16:33:07.0 +0300
@@ -0,0 +1 @@
+docs/baz_load_dirs.1
diff -r -N -u tla-load-dirs-1.0.26.orig/debian/control 
tla-load-dirs-1.0.26/debian/control
--- tla-load-dirs-1.0.26.orig/debian/control2005-04-21 06:32:47.0 
+0300
+++ tla-load-dirs-1.0.26/debian/control 2005-09-06 16:40:54.0 +0300
@@ -30,6 +30,18 @@
  changes.  It works on a principle similar to Subversion's
  svn_load_dirs or my tla_load_dirs package for Arch.
 
+Package: baz-load-dirs
+Architecture: all
+Depends: load-dirs-common, bazaar, ${shlibs:Depends} ${misc:Depends} 
${python:Depends}
+Description: Import upstream archives into baz
+ Bazaar (baz) works fine for importing new archives.  However, for situations
+ where the upstream renames or moves files and directories on a regular
+ basis, version information can be lost.
+ .
+ baz-load-dirs works with baz to import these things and preserve
+ changes.  It works on a principle similar to Subversion's
+ svn_load_dirs or my tla_load_dirs package for tla.
+
 Package: load-dirs-common
 Architecture: all
 Depends: ${shlibs:Depends} ${misc:Depends} ${python:Depends}
diff -r -N -u tla-load-dirs-1.0.26.orig/docs/Makefile 
tla-load-dirs-1.0.26/docs/Makefile
--- tla-load-dirs-1.0.26.orig/docs/Makefile 2005-04-17 06:04:36.0 
+0300
+++ tla-load-dirs-1.0.26/docs/Makefile  2005-09-06 16:34:15.0 +0300
@@ -29,13 +29,16 @@
 html: html/index.html
 text: $(MASTERBASE).txt
 
-manpages: tla_load_dirs.1 darcs_load_dirs.1
+manpages: tla_load_dirs.1 darcs_load_dirs.1 baz_load_dirs.1
 %.1: %.sgml
docbook2man $
 
 darcs_load_dirs.1: tla_load_dirs.1
sed s/tla_load_dirs/darcs_load_dirs/g  $  $@
 
+baz_load_dirs.1: tla_load_dirs.1
+   sed s/tla_load_dirs/baz_load_dirs/g  $  $@
+
 include sgml-common/Makefile.common
 
 realclean: clean
diff -r -N -u tla-load-dirs-1.0.26.orig/setup.py tla-load-dirs-1.0.26/setup.py
--- tla-load-dirs-1.0.26.orig/setup.py  2005-04-17 06:04:36.0 +0300
+++ tla-load-dirs-1.0.26/setup.py   2005-09-06 16:37:15.0 +0300
@@ -23,7 +23,7 @@
   author = 'John Goerzen',
   author_email = '[EMAIL PROTECTED]',
   packages = ['tla_support'],
-  scripts = ['tla_load_dirs', 'darcs_load_dirs']
+  scripts = ['tla_load_dirs', 'darcs_load_dirs', 'baz_load_dirs']
   #license = offlineimap.version.copyright + \
   #  , Licensed under the GPL version 2
 )
diff -r -N -u tla-load-dirs-1.0.26.orig/tla_load_dirs 
tla-load-dirs-1.0.26/tla_load_dirs
--- tla-load-dirs-1.0.26.orig/tla_load_dirs 2005-04-17 

Bug#322622: load-dirs-common: baz support

2005-09-06 Thread John Goerzen
On Tue, Sep 06, 2005 at 05:03:33PM +0300, Teemu Ikonen wrote:
 Hi,
 
 I made a quick attempt at adding baz support to tla-load-dirs. It's
 not very well tested, but worked for me. The attached diff is against
 the debian source in unstable and adds a new binary package
 baz-load-dirs.

Thank you very much, Teemu.  I have applied this to my tree and will be
uploading a new package today.

-- John


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#322622: load-dirs-common: baz support

2005-08-22 Thread John Goerzen
tags 322622 help
thanks

On Thu, Aug 11, 2005 at 04:50:01PM -0400, Clint Adams wrote:
 Package: load-dirs-common
 Version: 1.0.24
 Severity: wishlist
 
 It would be nice to be able to use baz instead of tla if necessary.

I would be happy to support that, but I don't really have much
experience with baz.  I would gladly accept a tested patch from someone
that does.

-- John


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#322622: load-dirs-common: baz support

2005-08-11 Thread Clint Adams
Package: load-dirs-common
Version: 1.0.24
Severity: wishlist

It would be nice to be able to use baz instead of tla if necessary.


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]