I've confirmed this - when upgrading from the 1.0-pre to 1.0.3 it screws
up your relative templates. 1.1 beta has fixed this, but it has a
number of it's own problems right now. (Not the least of which is that
it Just Won't Work by default - keyerror on authentication init.)
That said, here's a patch to the debian/ directory that lets
1.1-snapshot package and install on my system. It is functional, but
I have not tested very much at all. It does not handle the new
contributed templates yet, they don't even manage to make it to doc/
Someone may wish to re-file this patch under wishlist/new upstream, I
just wanted to get this out there for people to try. It solved my problems.
diff -ruN debian.orig/changelog debian/changelog
--- debian.orig/changelog 2007-06-05 20:20:32.000000000 -0400
+++ debian/changelog 2007-06-05 20:21:41.000000000 -0400
@@ -1,3 +1,9 @@
+viewvc (1.0.3+svn1.1.20070605) experimental; urgency=low
+
+ * pulled in the latest upstream, not for production use.
+
+ -- Dan Merillat <[EMAIL PROTECTED]> Tue, 5 Jun 2007 19:06:53 -0400
+
viewvc (1.0.3-2) unstable; urgency=low
* debian/control:
diff -ruN debian.orig/patches/02_py2html_activation debian/patches/02_py2html_activation
--- debian.orig/patches/02_py2html_activation 2007-06-05 18:59:43.000000000 -0400
+++ debian/patches/02_py2html_activation 1969-12-31 19:00:00.000000000 -0500
@@ -1,17 +0,0 @@
-# This patch activates processing for .py scripts in lib/viewvc.py.
-#
-# Fixes #282718.
-#
-Index: lib/viewvc.py
-===================================================================
---- lib/viewvc.py.orig 2006-03-18 03:07:36.642984000 +0100
-+++ lib/viewvc.py 2006-03-18 16:11:32.945884353 +0100
-@@ -1310,7 +1310,7 @@
- return MarkupPHP(cfg.options.php_exe_path, fp)
-
- markup_streamers = {
--# '.py' : markup_stream_python,
-+ '.py' : markup_stream_python,
- '.php' : markup_stream_php,
- '.inc' : markup_stream_php,
- }
diff -ruN debian.orig/patches/1000_lib_config.py_no_default_auth debian/patches/1000_lib_config.py_no_default_auth
--- debian.orig/patches/1000_lib_config.py_no_default_auth 1969-12-31 19:00:00.000000000 -0500
+++ debian/patches/1000_lib_config.py_no_default_auth 2007-06-05 20:17:57.000000000 -0400
@@ -0,0 +1,16 @@
+This change is here as a stopgap so the default install works for
+TESTING ONLY. It possibly/probably breaks the new authentication,
+however that is currently buggy. This allows 1.1 to work as-is, without
+having to edit your existing configuration file.
+
+--- lib/config.py.orig 2007-06-05 20:09:41.000000000 -0400
++++ lib/config.py 2007-06-05 20:10:15.000000000 -0400
+@@ -233,7 +233,7 @@
+ self.options.default_file_view = "log"
+ self.options.checkout_magic = 0
+ self.options.allowed_views = ['markup', 'annotate']
+- self.options.authorizer = 'forbidden'
++ self.options.authorizer = None
+ self.options.mangle_email_addresses = 0
+ self.options.use_rcsparse = 0
+ self.options.sort_by = 'file'
diff -ruN debian.orig/patches/101_viewvc-install_Debian_paths debian/patches/101_viewvc-install_Debian_paths
--- debian.orig/patches/101_viewvc-install_Debian_paths 2007-06-05 19:31:21.000000000 -0400
+++ debian/patches/101_viewvc-install_Debian_paths 2007-06-05 19:21:58.000000000 -0400
@@ -1,24 +1,13 @@
-Index: viewvc-install
-===================================================================
---- viewvc-install.orig 2006-03-22 01:42:02.038375982 +0100
-+++ viewvc-install 2006-03-22 01:42:11.060273474 +0100
-@@ -122,16 +122,15 @@
-
- def SetOnePath(contents, var, value):
- pattern = re.compile('^' + var + r'\s*=\s*.*$', re.MULTILINE)
-- repl = '%s = r"%s"' % (var, os.path.join(ROOT_DIR, value))
-+ repl = '%s = r"%s"' % (var, value)
- return re.sub(pattern, ReEscape(repl), contents)
-
--
- def SetPythonPaths(contents):
+--- viewvc-install 2007-06-05 19:16:06.000000000 -0400
++++ viewvc-install.orig 2007-06-05 19:16:45.000000000 -0400
+@@ -128,8 +128,8 @@
if contents[:2] == '#!':
shbang = '#!' + sys.executable
- contents = re.sub('^#![^\n]*', ReEscape(shbang), contents)
-- contents = SetOnePath(contents, 'LIBRARY_DIR', 'lib')
-- contents = SetOnePath(contents, 'CONF_PATHNAME', 'viewvc.conf')
-+ contents = SetOnePath(contents, 'LIBRARY_DIR', '/usr/lib/viewvc')
-+ contents = SetOnePath(contents, 'CONF_PATHNAME', '/etc/viewvc/viewvc.conf')
+ contents = re.sub('^#![^\n]*', _escape(shbang), contents)
+- contents = replace_var(contents, 'LIBRARY_DIR', '/usr/lib/viewvc')
+- contents = replace_var(contents, 'CONF_PATHNAME', '/etc/viewvc/viewvc.conf')
++ contents = replace_var(contents, 'LIBRARY_DIR', 'lib')
++ contents = replace_var(contents, 'CONF_PATHNAME', 'viewvc.conf')
return contents
diff -ruN debian.orig/patches/log/patch debian/patches/log/patch
--- debian.orig/patches/log/patch 2007-06-05 19:22:07.000000000 -0400
+++ debian/patches/log/patch 1969-12-31 19:00:00.000000000 -0500
@@ -1,8 +0,0 @@
-Applying patch 101_viewvc-install_Debian_paths
-patching file viewvc-install
-
-Applying patch 102_viewvc.conf_Debian_customization
-patching file viewvc.conf.dist
-Hunk #1 succeeded at 432 (offset 57 lines).
-
-Now at patch 102_viewvc.conf_Debian_customization
diff -ruN debian.orig/patches/series debian/patches/series
--- debian.orig/patches/series 2007-06-05 19:31:21.000000000 -0400
+++ debian/patches/series 2007-06-05 20:12:13.000000000 -0400
@@ -1,5 +1,5 @@
01_separe_log_and_file -p0
-02_py2html_activation -p0
03_robots_support -p0
101_viewvc-install_Debian_paths -p0
102_viewvc.conf_Debian_customization -p0
+1000_lib_config.py_no_default_auth -p0
diff -ruN debian.orig/viewvc.install debian/viewvc.install
--- debian.orig/viewvc.install 2007-06-05 19:28:51.000000000 -0400
+++ debian/viewvc.install 2007-06-05 19:30:19.000000000 -0400
@@ -5,6 +5,9 @@
usr/lib/cgi-bin/lib/vclib/ccvs/rcsparse/*py /usr/lib/viewvc/vclib/ccvs/rcsparse
usr/lib/cgi-bin/lib/vclib/svn/*py /usr/lib/viewvc/vclib/svn
usr/lib/cgi-bin/lib/vclib/svn_ra/*py /usr/lib/viewvc/vclib/svn_ra
+usr/lib/cgi-bin/lib/vcauth/*py /usr/lib/viewvc/vcauth
+usr/lib/cgi-bin/lib/vcauth/forbidden/*py /usr/lib/viewvc/vcauth/forbidden
+usr/lib/cgi-bin/lib/vcauth/svnauthz/*py /usr/lib/viewvc/vcauth/svnauthz
usr/lib/cgi-bin/bin/*dbadmin /usr/lib/viewvc/
usr/lib/cgi-bin/templates/ /etc/viewvc/
usr/lib/cgi-bin/*.conf /etc/viewvc/
