Package: viewvc
Severity: wishlist
Dear David,
Thanks for using my work in releasing ViewVC 1.1.5-1 for Debian; I'm
glad you found it useful! For some reason, I didn't receive mail
from bug #575777; I was in Russia (!) at the time and out of e-mail
contact: perhaps the mail was accidentally rejected as spam.
I note that upstream have released a new version of ViewVC, 1.1.9.
I have already packaged this for the ZAP Group and am using it
successfully on my server. I am including the diff of the debian
directory between 1.1.5-1.1 and 1.1.9-0.1zg1 (my version). You can
also download the full source to the packages, if you wish:
ftp://ftp.zap.org.au/pub/debian/dists/zapgroup-sid/main/source/viewvc_1.1.9-0.1zg1.dsc
ftp://ftp.zap.org.au/pub/debian/dists/zapgroup-sid/main/source/viewvc_1.1.9-0.1zg1.diff.gz
ftp://ftp.zap.org.au/pub/debian/dists/zapgroup-sid/main/source/viewvc_1.1.9.orig.tar.gz
Alternatively, you can use the following lines in
/etc/apt/sources.list:
deb ftp://ftp.zap.org.au/pub/debian zapgroup-sid main
deb-src ftp://ftp.zap.org.au/pub/debian zapgroup-sid main
You can replace "zapgroup-sid" with "zapgroup-squeeze" or
"zapgroup-maverick" as appropriate.
Highlights of my changes:
* ViewVC 1.1.9 packaged (new functionality and also some bug fixes)
* Patches in debian/patches refreshed for 1.1.9
Thanks in advance for your work!
Yours truly,
John Zaitseff
--
John Zaitseff ,--_|\ The ZAP Group
Phone: +61 2 9643 7737 / \ Sydney, Australia
E-mail: j.zaits...@zap.org.au \_,--._* http://www.zap.org.au/
v
diff -x .svn -ruNa upstream/1.1.5-1.1/debian/changelog tags/1.1.9-0.1zg1/debian/changelog
--- upstream/1.1.5-1.1/debian/changelog 2011-02-22 11:56:53.000000000 +1100
+++ tags/1.1.9-0.1zg1/debian/changelog 2011-02-22 11:58:09.000000000 +1100
@@ -1,3 +1,18 @@
+viewvc (1.1.9-0.1zg1) unstable; urgency=low
+
+ * New upstream release, packaged for the ZAP Group package repository.
+ * Resynchronised the debian directory with the official Debian version:
+ imported files from version 1.1.5-1.1:
+ - Moved to the official Debian version of debian/changelog,
+ debian/control, debian/NEWS, debian/README.source (added),
+ debian/viewcvs.link (removed) and debian/viewcvs.postrm (removed).
+ - Updated the debian/patches directory for ViewVC 1.1.9: refreshed
+ 01-robots-support, 90-viewvc-install-debian-paths,
+ 91-viewvc-conf-debian-custom, 92-no_strings_in_raise (added); removed
+ rev2369 as it is already applied in ViewVC 1.1.9.
+
+ -- John Zaitseff <j.zaits...@zap.org.au> Tue, 22 Feb 2011 10:33:43 +1100
+
viewvc (1.1.5-1.1) unstable; urgency=low
* Non-maintainer upload.
diff -x .svn -ruNa upstream/1.1.5-1.1/debian/control tags/1.1.9-0.1zg1/debian/control
--- upstream/1.1.5-1.1/debian/control 2011-02-22 11:56:53.000000000 +1100
+++ tags/1.1.9-0.1zg1/debian/control 2011-02-22 11:58:09.000000000 +1100
@@ -1,7 +1,7 @@
Source: viewvc
Section: vcs
Priority: optional
-Maintainer: David MartÃnez Moreno <en...@debian.org>
+Maintainer: John Zaitseff <j.zaits...@zap.org.au>
Build-Depends-Indep: python, python-subversion, python-support (>= 0.8)
Build-Depends: debhelper (>= 7), quilt
Standards-Version: 3.8.4
diff -x .svn -ruNa upstream/1.1.5-1.1/debian/patches/01-robots-support tags/1.1.9-0.1zg1/debian/patches/01-robots-support
--- upstream/1.1.5-1.1/debian/patches/01-robots-support 2011-02-22 11:56:53.000000000 +1100
+++ tags/1.1.9-0.1zg1/debian/patches/01-robots-support 2011-02-22 11:58:09.000000000 +1100
@@ -1,7 +1,7 @@
Index: trunk/bin/cgi/viewvc.cgi
===================================================================
---- trunk.orig/bin/cgi/viewvc.cgi 2010-03-31 11:48:35.000000000 +1100
-+++ trunk/bin/cgi/viewvc.cgi 2010-03-31 11:57:56.000000000 +1100
+--- trunk.orig/bin/cgi/viewvc.cgi 2011-02-22 10:10:10.000000000 +1100
++++ trunk/bin/cgi/viewvc.cgi 2011-02-22 10:11:36.000000000 +1100
@@ -47,6 +47,17 @@
"../../../lib")))
diff -x .svn -ruNa upstream/1.1.5-1.1/debian/patches/90-viewvc-install-debian-paths tags/1.1.9-0.1zg1/debian/patches/90-viewvc-install-debian-paths
--- upstream/1.1.5-1.1/debian/patches/90-viewvc-install-debian-paths 2011-02-22 11:56:53.000000000 +1100
+++ tags/1.1.9-0.1zg1/debian/patches/90-viewvc-install-debian-paths 2011-02-22 11:58:09.000000000 +1100
@@ -1,11 +1,11 @@
Index: trunk/viewvc-install
===================================================================
---- trunk.orig/viewvc-install 2010-03-31 19:36:34.000000000 +1100
-+++ trunk/viewvc-install 2010-03-31 20:00:56.000000000 +1100
-@@ -49,10 +49,10 @@
- FILE_INFO_LIST = [
- ("bin/cgi/viewvc.cgi", "bin/cgi/viewvc.cgi", 0755, 1, 0, 0),
- ("bin/cgi/query.cgi", "bin/cgi/query.cgi", 0755, 1, 0, 0),
+--- trunk.orig/viewvc-install 2011-02-22 10:10:09.000000000 +1100
++++ trunk/viewvc-install 2011-02-22 10:12:35.000000000 +1100
+@@ -53,10 +53,10 @@
+ ("bin/wsgi/viewvc.fcgi", "bin/wsgi/viewvc.fcgi", 0755, 1, 0, 0),
+ ("bin/wsgi/query.wsgi", "bin/wsgi/query.wsgi", 0755, 1, 0, 0),
+ ("bin/wsgi/query.fcgi", "bin/wsgi/query.fcgi", 0755, 1, 0, 0),
- ("bin/mod_python/viewvc.py", "bin/mod_python/viewvc.py", 0755, 1, 0, 0),
- ("bin/mod_python/query.py", "bin/mod_python/query.py", 0755, 1, 0, 0),
- ("bin/mod_python/handler.py", "bin/mod_python/handler.py", 0755, 1, 0, 0),
@@ -17,7 +17,7 @@
("bin/standalone.py", "bin/standalone.py", 0755, 1, 0, 0),
("bin/loginfo-handler", "bin/loginfo-handler", 0755, 1, 0, 0),
("bin/cvsdbadmin", "bin/cvsdbadmin", 0755, 1, 0, 0),
-@@ -122,7 +122,7 @@
+@@ -126,7 +126,7 @@
"""Replace instances of the variable VAR as found in file CONTENTS
with VALUE."""
pattern = re.compile('^' + var + r'\s*=\s*.*$', re.MULTILINE)
@@ -26,7 +26,7 @@
return re.sub(pattern, _escape(repl), contents)
-@@ -131,8 +131,8 @@
+@@ -135,8 +135,8 @@
if contents[:2] == '#!':
shbang = '#!' + sys.executable
contents = re.sub('^#![^\n]*', _escape(shbang), contents)
diff -x .svn -ruNa upstream/1.1.5-1.1/debian/patches/91-viewvc-conf-debian-custom tags/1.1.9-0.1zg1/debian/patches/91-viewvc-conf-debian-custom
--- upstream/1.1.5-1.1/debian/patches/91-viewvc-conf-debian-custom 2011-02-22 11:56:53.000000000 +1100
+++ tags/1.1.9-0.1zg1/debian/patches/91-viewvc-conf-debian-custom 2011-02-22 11:58:09.000000000 +1100
@@ -1,7 +1,7 @@
Index: trunk/conf/viewvc.conf.dist
===================================================================
---- trunk.orig/conf/viewvc.conf.dist 2010-04-01 09:34:36.000000000 +1100
-+++ trunk/conf/viewvc.conf.dist 2010-04-01 09:41:07.000000000 +1100
+--- trunk.orig/conf/viewvc.conf.dist 2011-02-22 10:10:09.000000000 +1100
++++ trunk/conf/viewvc.conf.dist 2011-02-22 10:19:05.000000000 +1100
@@ -93,7 +93,7 @@
## cvs_roots = cvsroot: /opt/cvs/repos1,
## anotherroot: /usr/local/cvs/repos2
@@ -18,9 +18,9 @@
-#svn_roots =
+#svn_roots = svn: /var/lib/svn
- ## root_parents: Specifies a list of directories in which any number of
- ## repositories may reside. Rather than force you to add a new entry
-@@ -520,7 +520,7 @@
+ ## root_parents: Specifies a list of directories under which any
+ ## number of repositories may reside. You can specify multiple root
+@@ -540,7 +540,7 @@
## SEE ALSO: the [templates] configuration section, where you can
## override templates on a per-view basis.
##
diff -x .svn -ruNa upstream/1.1.5-1.1/debian/patches/92-no_strings_in_raise tags/1.1.9-0.1zg1/debian/patches/92-no_strings_in_raise
--- upstream/1.1.5-1.1/debian/patches/92-no_strings_in_raise 2011-02-22 11:56:53.000000000 +1100
+++ tags/1.1.9-0.1zg1/debian/patches/92-no_strings_in_raise 2011-02-22 11:58:09.000000000 +1100
@@ -1,8 +1,8 @@
-Index: viewvc-1.1.5/lib/vclib/ccvs/ccvs.py
+Index: trunk/lib/vclib/ccvs/ccvs.py
===================================================================
---- viewvc-1.1.5.orig/lib/vclib/ccvs/ccvs.py
-+++ viewvc-1.1.5/lib/vclib/ccvs/ccvs.py
-@@ -302,7 +302,7 @@ class TreeSink(rcsparse.Sink):
+--- trunk.orig/lib/vclib/ccvs/ccvs.py 2011-02-19 09:50:11.000000000 +1100
++++ trunk/lib/vclib/ccvs/ccvs.py 2011-02-22 10:26:53.000000000 +1100
+@@ -302,7 +302,7 @@
added = added + count
idx = idx + count
elif command:
@@ -11,11 +11,11 @@
if len(rev.number) == 2:
rev.next_changed = changed and "+%i -%i" % (deled, added)
-Index: viewvc-1.1.5/lib/win32popen.py
+Index: trunk/lib/win32popen.py
===================================================================
---- viewvc-1.1.5.orig/lib/win32popen.py
-+++ viewvc-1.1.5/lib/win32popen.py
-@@ -184,7 +184,7 @@ def SpoolWorker(srcHandle, destHandle, o
+--- trunk.orig/lib/win32popen.py 2011-02-19 09:50:11.000000000 +1100
++++ trunk/lib/win32popen.py 2011-02-22 10:26:53.000000000 +1100
+@@ -184,7 +184,7 @@
hr, data = win32file.ReadFile(srcHandle, buffer)
#print >> SPOOL_ERROR, "ReadFile returned '%s', '%s'" % (str(hr), str(data)); SPOOL_ERROR.flush()
if hr != 0:
@@ -24,7 +24,7 @@
elif len(data) == 0:
break
except pywintypes.error, e:
-@@ -205,7 +205,7 @@ def SpoolWorker(srcHandle, destHandle, o
+@@ -205,7 +205,7 @@
hr, bytes = win32file.WriteFile(destHandle, data)
#print >> SPOOL_ERROR, "WriteFile() passed %i bytes and returned %i, %i" % (len(data), hr, bytes); SPOOL_ERROR.flush()
if hr != 0 or bytes != len(data):
diff -x .svn -ruNa upstream/1.1.5-1.1/debian/patches/rev2369 tags/1.1.9-0.1zg1/debian/patches/rev2369
--- upstream/1.1.5-1.1/debian/patches/rev2369 2011-02-22 11:56:53.000000000 +1100
+++ tags/1.1.9-0.1zg1/debian/patches/rev2369 1970-01-01 10:00:00.000000000 +1000
@@ -1,10 +0,0 @@
---- a/lib/sapi.py
-+++ b/lib/sapi.py
-@@ -33,6 +33,7 @@ server = None
- # that character as-is, and sometimes needs to embed escaped values
- # into HTML attributes.
- def escape(s):
-+ s = str(s)
- s = string.replace(s, '&', '&')
- s = string.replace(s, '>', '>')
- s = string.replace(s, '<', '<')
diff -x .svn -ruNa upstream/1.1.5-1.1/debian/patches/series tags/1.1.9-0.1zg1/debian/patches/series
--- upstream/1.1.5-1.1/debian/patches/series 2011-02-22 11:56:53.000000000 +1100
+++ tags/1.1.9-0.1zg1/debian/patches/series 2011-02-22 11:58:09.000000000 +1100
@@ -2,4 +2,3 @@
90-viewvc-install-debian-paths
91-viewvc-conf-debian-custom
92-no_strings_in_raise
-rev2369
