Package: viewvc
Version: 1.0.3-2.1
Severity: wishlist
Tags: patch
Dear David / any other maintainers of ViewVC,
Thank you for packaging ViewVC! Could you possibly update this
package to the latest released version, 1.0.4?
The only things that really need to change (apart from what is
unpacked by the viewvc_1.0.4.orig.tar.gz file, of course) are in
the debian directory:
changelog
patches/101_viewvc-install_Debian_paths
I am including a patch that I used to create my own (temporary)
version of the viewvc package, which you can download from
ftp://ftp.zap.org.au/pub/debian/dists/zapgroup-XXXX (for various
XXXX's: etch, sid, gutsy).
This change should be almost trivial to do. Thank you in advance!
Yours truly,
John Zaitseff
--
John Zaitseff ,--_|\ The ZAP Group
Phone: +61 2 9643 7737 / \ Sydney, Australia
E-mail: [EMAIL PROTECTED] \_,--._* http://www.zap.org.au/
v
diff -ruN viewvc/upstream/1.0.3-2.1/debian/changelog viewvc/tags/1.0.4-0.1zg1/debian/changelog
--- viewvc/upstream/1.0.3-2.1/debian/changelog 2008-01-24 14:16:10.000000000 +1100
+++ viewvc/tags/1.0.4-0.1zg1/debian/changelog 2008-01-30 09:31:02.000000000 +1100
@@ -1,3 +1,16 @@
+viewvc (1.0.4-0.1zg1) unstable; urgency=low
+
+ * New upstream release, packaged for the ZAP Group package repository.
+ * Updated patches/101_viewvc-install_Debian_paths for this release.
+
+ -- John Zaitseff <[EMAIL PROTECTED]> Wed, 30 Jan 2008 09:23:10 +1100
+
+viewvc (1.0.3-2.1zg1) unstable; urgency=low
+
+ * Imported the upstream package into the ZAP Group package repository.
+
+ -- John Zaitseff <[EMAIL PROTECTED]> Thu, 24 Jan 2008 14:39:57 +1100
+
viewvc (1.0.3-2.1) unstable; urgency=medium
* Non-maintainer upload.
diff -ruN viewvc/upstream/1.0.3-2.1/debian/patches/101_viewvc-install_Debian_paths viewvc/tags/1.0.4-0.1zg1/debian/patches/101_viewvc-install_Debian_paths
--- viewvc/upstream/1.0.3-2.1/debian/patches/101_viewvc-install_Debian_paths 2008-01-24 14:16:10.000000000 +1100
+++ viewvc/tags/1.0.4-0.1zg1/debian/patches/101_viewvc-install_Debian_paths 2008-01-30 09:31:02.000000000 +1100
@@ -1,24 +1,24 @@
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):
+--- viewvc-install.orig 2008-01-29 17:39:15.000000000 +1100
++++ viewvc-install 2008-01-29 17:46:51.000000000 +1100
+@@ -118,7 +118,7 @@
+ """Replace instances of the variable VAR as found in file CONTENTS
+ with 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)
+ return re.sub(pattern, _escape(repl), contents)
+
--
- def SetPythonPaths(contents):
+@@ -127,8 +127,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', 'lib')
+- contents = replace_var(contents, 'CONF_PATHNAME', 'viewvc.conf')
++ contents = replace_var(contents, 'LIBRARY_DIR', '/usr/lib/viewvc')
++ contents = replace_var(contents, 'CONF_PATHNAME', '/etc/viewvc/viewvc.conf')
return contents
