[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

viewcvs ...-1.5, closes: #303756



Hi,

I just uploaded an NMU for viewcvs that fixes #303756.
It's in incoming right now.

The problem was an out of date template that made viewcvs print
backtraces when viewing the history of cvs files.

The fix is using a newer template (from upstream CVS) which has 3 lines
removed.

It would be great if the updated package could make it into sarge.

Thanks.

interdiff on the source:
========================
weasel@galaxy:~/tmp/viewcvs$ interdiff -z viewcvs_0.9.2+cvs.1.0.dev.2004.07.28-1.4.diff.gz viewcvs_0.9.2+cvs.1.0.dev.2004.07.28-1.5.diff.gz
reverted:
--- viewcvs-0.9.2+cvs.1.0.dev.2004.07.28/templates/include/branch_form.ezt
+++ viewcvs-0.9.2+cvs.1.0.dev.2004.07.28.orig/templates/include/branch_form.ezt
@@ -4,9 +4,6 @@
   <form method=GET action="[branch_select_action]">
     [branch_select_hidden_values]
     View only Branch:
-    [if-any current_root]
-    <input type="hidden" name="root" value="[current_root]">
-    [end]
     <select name="only_with_tag" onchange="submit()">
       <option value="" [is view_tag ""]selected[end]>Show all branches</option>
       [for branch_names]
diff -u viewcvs-0.9.2+cvs.1.0.dev.2004.07.28/debian/changelog viewcvs-0.9.2+cvs.1.0.dev.2004.07.28/debian/changelog
--- viewcvs-0.9.2+cvs.1.0.dev.2004.07.28/debian/changelog
+++ viewcvs-0.9.2+cvs.1.0.dev.2004.07.28/debian/changelog
@@ -1,3 +1,14 @@
+viewcvs (0.9.2+cvs.1.0.dev.2004.07.28-1.5) unstable; urgency=medium
+
+  * NMU
+  * Urgency medium because it fixes an important bug and it would
+    be great if it still could get into sarge, even if it's frozen.
+  * Update templates/include/branch_form.ezt from upstream CVS so that viewcvs
+    actually shows files in CVS trees without backtraces
+    (closes: #303756).
+
+ -- Peter Palfrader <weasel@debian.org>  Tue, 24 May 2005 00:47:29 +0200
+
 viewcvs (0.9.2+cvs.1.0.dev.2004.07.28-1.4) unstable; urgency=high
 
   * NMU.



Some more diffing below, showing that the new version differs only in
the intended way:



debdiff on both binary packages:
================================
weasel@galaxy:~/tmp/viewcvs$ debdiff viewcvs-query_0.9.2+cvs.1.0.dev.2004.07.28-1.4_all.deb viewcvs-query_0.9.2+cvs.1.0.dev.2004.07.28-1.5_all.deb
File lists identical (after any substitutions)

The following lines in the control files differ (wdiff output format):
----------------------------------------------------------------------
Version: [-0.9.2+cvs.1.0.dev.2004.07.28-1.4-] {+0.9.2+cvs.1.0.dev.2004.07.28-1.5+}
Depends: viewcvs (= [-0.9.2+cvs.1.0.dev.2004.07.28-1.4),-] {+0.9.2+cvs.1.0.dev.2004.07.28-1.5),+} python-mysqldb, python-egenix-mxdatetime
Installed-Size: [-32-] {+4+}

weasel@galaxy:~/tmp/viewcvs$ debdiff viewcvs_0.9.2+cvs.1.0.dev.2004.07.28-1.4_all.deb viewcvs_0.9.2+cvs.1.0.dev.2004.07.28-1.5_all.deb
File lists identical (after any substitutions)

The following lines in the control files differ (wdiff output format):
----------------------------------------------------------------------
Version: [-0.9.2+cvs.1.0.dev.2004.07.28-1.4-] {+0.9.2+cvs.1.0.dev.2004.07.28-1.5+}
Installed-Size: [-1028-] {+902+}




diff -Nur on extracted .deb files:
==================================
weasel@galaxy:~/tmp/viewcvs$ diff -Nur 1.4 1.5 > /dev/null 
diff: 1.4/q/usr/share/doc/viewcvs-query: No such file or directory
diff: 1.5/q/usr/share/doc/viewcvs-query: No such file or directory
diff: 1.4/v/usr/share/doc/viewcvs/examples/viewcvs.conf: No such file or directory
diff: 1.5/v/usr/share/doc/viewcvs/examples/viewcvs.conf: No such file or directory

weasel@galaxy:~/tmp/viewcvs$ ls -l 1.4/q/usr/share/doc/viewcvs-query 1.5/q/usr/share/doc/viewcvs-query  1.4/v/usr/share/doc/viewcvs/examples/viewcvs.conf 1.5/v/usr/share/doc/viewcvs/examples/viewcvs.conf
lrwxrwxrwx  1 weasel weasel  7 May 24 01:11 1.4/q/usr/share/doc/viewcvs-query -> viewcvs
lrwxrwxrwx  1 weasel weasel 33 May 24 01:11 1.4/v/usr/share/doc/viewcvs/examples/viewcvs.conf -> /etc/viewcvs/viewcvs.conf.default
lrwxrwxrwx  1 weasel weasel  7 May 24 01:11 1.5/q/usr/share/doc/viewcvs-query -> viewcvs
lrwxrwxrwx  1 weasel weasel 33 May 24 01:11 1.5/v/usr/share/doc/viewcvs/examples/viewcvs.conf -> /etc/viewcvs/viewcvs.conf.default

weasel@galaxy:~/tmp/viewcvs$ diff -Nur 1.4 1.5
diff -Nur 1.4/q/control 1.5/q/control
--- 1.4/q/control	2005-01-24 11:36:33.000000000 +0100
+++ 1.5/q/control	2005-05-24 01:09:29.000000000 +0200
@@ -1,11 +1,11 @@
 Package: viewcvs-query
-Version: 0.9.2+cvs.1.0.dev.2004.07.28-1.4
+Version: 0.9.2+cvs.1.0.dev.2004.07.28-1.5
 Section: devel
 Priority: optional
 Architecture: all
-Depends: viewcvs (= 0.9.2+cvs.1.0.dev.2004.07.28-1.4), python-mysqldb, python-egenix-mxdatetime
+Depends: viewcvs (= 0.9.2+cvs.1.0.dev.2004.07.28-1.5), python-mysqldb, python-egenix-mxdatetime
 Replaces: viewcvs (<< 0.9.2-6)
-Installed-Size: 32
+Installed-Size: 4
 Maintainer: Takuo KITAME <kitame@debian.org>
 Source: viewcvs
 Description: view CVS (viewcvs-query.cgi)
Binary files 1.4/q/control.tar.gz and 1.5/q/control.tar.gz differ
Binary files 1.4/q/data.tar.gz and 1.5/q/data.tar.gz differ
diff -Nur 1.4/v/conffiles 1.5/v/conffiles
--- 1.4/v/conffiles	2005-01-24 11:36:33.000000000 +0100
+++ 1.5/v/conffiles	2005-05-24 01:09:27.000000000 +0200
@@ -1,26 +1,26 @@
 /etc/viewcvs/cvsgraph.conf
-/etc/viewcvs/templates/annotate.ezt
+/etc/viewcvs/viewcvs.conf.default
 /etc/viewcvs/templates/diff.ezt
-/etc/viewcvs/templates/dir_alternate.ezt
+/etc/viewcvs/templates/revision.ezt
 /etc/viewcvs/templates/directory.ezt
-/etc/viewcvs/templates/error.ezt
+/etc/viewcvs/templates/annotate.ezt
+/etc/viewcvs/templates/dir_alternate.ezt
+/etc/viewcvs/templates/log.ezt
+/etc/viewcvs/templates/markup.ezt
+/etc/viewcvs/templates/query_form.ezt
+/etc/viewcvs/templates/query_results.ezt
 /etc/viewcvs/templates/graph.ezt
+/etc/viewcvs/templates/log_table.ezt
+/etc/viewcvs/templates/query.ezt
+/etc/viewcvs/templates/include/paging.ezt
+/etc/viewcvs/templates/include/sort.ezt
 /etc/viewcvs/templates/include/branch.ezt
 /etc/viewcvs/templates/include/branch_form.ezt
-/etc/viewcvs/templates/include/diff_form.ezt
+/etc/viewcvs/templates/include/view_tag.ezt
 /etc/viewcvs/templates/include/dir_footer.ezt
-/etc/viewcvs/templates/include/dir_header.ezt
 /etc/viewcvs/templates/include/footer.ezt
+/etc/viewcvs/templates/include/dir_header.ezt
+/etc/viewcvs/templates/include/diff_form.ezt
 /etc/viewcvs/templates/include/header.ezt
-/etc/viewcvs/templates/include/paging.ezt
-/etc/viewcvs/templates/include/sort.ezt
-/etc/viewcvs/templates/include/view_tag.ezt
-/etc/viewcvs/templates/log.ezt
-/etc/viewcvs/templates/log_table.ezt
-/etc/viewcvs/templates/markup.ezt
-/etc/viewcvs/templates/query.ezt
-/etc/viewcvs/templates/query_form.ezt
-/etc/viewcvs/templates/query_results.ezt
-/etc/viewcvs/templates/revision.ezt
-/etc/viewcvs/viewcvs.conf.default
+/etc/viewcvs/templates/error.ezt
 /etc/apache2/conf.d/viewcvs
diff -Nur 1.4/v/control 1.5/v/control
--- 1.4/v/control	2005-01-24 11:36:33.000000000 +0100
+++ 1.5/v/control	2005-05-24 01:09:29.000000000 +0200
@@ -1,12 +1,12 @@
 Package: viewcvs
-Version: 0.9.2+cvs.1.0.dev.2004.07.28-1.4
+Version: 0.9.2+cvs.1.0.dev.2004.07.28-1.5
 Section: devel
 Priority: optional
 Architecture: all
 Depends: python (>= 2.3), python (<< 2.4), cvs | subversion, rcs, mime-support, debconf (>= 1.0)
 Recommends: enscript, httpd
 Suggests: cvsgraph, viewcvs-query, python2.3-subversion
-Installed-Size: 1028
+Installed-Size: 902
 Maintainer: Takuo KITAME <kitame@debian.org>
 Description: view CVS Repositories via HTTP
  The ViewCVS software was inspired by cvsweb (by Henner Zeller).
Binary files 1.4/v/control.tar.gz and 1.5/v/control.tar.gz differ
Binary files 1.4/v/data.tar.gz and 1.5/v/data.tar.gz differ
diff -Nur 1.4/v/etc/viewcvs/templates/include/branch_form.ezt 1.5/v/etc/viewcvs/templates/include/branch_form.ezt
--- 1.4/v/etc/viewcvs/templates/include/branch_form.ezt	2005-01-24 11:36:31.000000000 +0100
+++ 1.5/v/etc/viewcvs/templates/include/branch_form.ezt	2005-05-24 01:09:19.000000000 +0200
@@ -4,9 +4,6 @@
   <form method=GET action="[branch_select_action]">
     [branch_select_hidden_values]
     View only Branch:
-    [if-any current_root]
-    <input type="hidden" name="root" value="[current_root]">
-    [end]
     <select name="only_with_tag" onchange="submit()">
       <option value="" [is view_tag ""]selected[end]>Show all branches</option>
       [for branch_names]
diff -Nur 1.4/v/md5sums 1.5/v/md5sums
--- 1.4/v/md5sums	2005-01-24 11:36:33.000000000 +0100
+++ 1.5/v/md5sums	2005-05-24 01:09:30.000000000 +0200
@@ -1,90 +1,90 @@
-62ce0385408ef01c7568c91e8e29f963  usr/sbin/viewcvsd
-cf8c5cbcf23e3cf5ffed25ac852e44cb  usr/lib/cgi-bin/viewcvs.cgi
-83a29db5d5b1e50e427c18e6b79720b7  usr/lib/viewcvs/viewcvs-config
-9f772669b7a67d4b39a68db5e8a4cc73  usr/lib/viewcvs/cvsdbadmin
-7bd6aebff32da85892e985346d6c310c  usr/lib/viewcvs/loginfo-handler
-d6cf4cc6e8bb5e01e1b231aa4d33826a  usr/lib/viewcvs/make-database
-db28d5ba66fcdb97cc9b1ef9b339d9ba  usr/lib/python2.3/site-packages/viewcvs/PyFontify.py
-fae5fe657e3c73bcb8883904d0f9de12  usr/lib/python2.3/site-packages/viewcvs/accept.py
-2067206188be810a6e897f79e58793ff  usr/lib/python2.3/site-packages/viewcvs/apache.py
-2b20d6778d597379dfb57a3cd17355cd  usr/lib/python2.3/site-packages/viewcvs/apache_icons.py
-299f4a027e149459945aa1699a198d20  usr/lib/python2.3/site-packages/viewcvs/blame.py
+9d82c2ea5659f4fbcd0debc75017bd75  etc/viewcvs/cvsgraph.conf
+5ad0653c7c382adf7f10df36d14ef009  etc/viewcvs/viewcvs.conf.default
+0dc286a09cafea48a2aaf51b9e68e072  etc/viewcvs/templates/diff.ezt
+02943bd6284e8d498fb2b42fb1026edc  etc/viewcvs/templates/revision.ezt
+4c1451504b12b270b2baead52054e8e7  etc/viewcvs/templates/directory.ezt
+db527442876c1262c3e28f6b2d7d61be  etc/viewcvs/templates/annotate.ezt
+a5452f18e94d40d62bbc19f57ddcedc4  etc/viewcvs/templates/dir_alternate.ezt
+f9d77f4daf633ae319c3381519cee3d0  etc/viewcvs/templates/log.ezt
+102118f4a280ff880bbc204585613c59  etc/viewcvs/templates/markup.ezt
+2e0d3b1ec31f55756b31c5c456f79504  etc/viewcvs/templates/query_form.ezt
+b852ec7752c9a24e609522b015404f18  etc/viewcvs/templates/query_results.ezt
+32664d8c047e198d8f6e1c1f2705b0d4  etc/viewcvs/templates/graph.ezt
+4faf5615ab03999e254a86eae30ab252  etc/viewcvs/templates/log_table.ezt
+9903ff25c30ca4f0854f0830d0ac2438  etc/viewcvs/templates/query.ezt
+7c81bf1614cd65fb796c55b1e51ba1ad  etc/viewcvs/templates/include/paging.ezt
+553050e2629bcc1478c7a5eef9c27f18  etc/viewcvs/templates/include/sort.ezt
+34d458a72376aaa09035b8f693091a16  etc/viewcvs/templates/include/branch.ezt
+d65b4d02a44673da2f4371da46a38367  etc/viewcvs/templates/include/branch_form.ezt
+db3fa327ce56cd03ca6a103d039556b8  etc/viewcvs/templates/include/view_tag.ezt
+c8c838538b503859c267aa123623b4f0  etc/viewcvs/templates/include/dir_footer.ezt
+58fab502a5fa8ddddcfbc04884f4099f  etc/viewcvs/templates/include/footer.ezt
+57b6202bb4f099bfb981c6817ff8872d  etc/viewcvs/templates/include/dir_header.ezt
+5401c5c9b564aa510c465ed3746b5113  etc/viewcvs/templates/include/diff_form.ezt
+1cc941fb698d8550dc4f6a914c8a5b3f  etc/viewcvs/templates/include/header.ezt
+f81798561a0506e262603cac2a23f177  etc/viewcvs/templates/error.ezt
+d3b8037cced669b58a55ddb730d91627  etc/apache2/conf.d/viewcvs
+35afbc04f7f670202395389fc4a8afad  usr/lib/python2.3/site-packages/viewcvs/vclib/svn/__init__.py
+613d88481c34bac7ff76e730d71c1c9a  usr/lib/python2.3/site-packages/viewcvs/vclib/ccvs/rcsparse/common.py
+c5d571aef81ce0dfe0d6d54c6407c4d2  usr/lib/python2.3/site-packages/viewcvs/vclib/ccvs/rcsparse/debug.py
+2807ddcc79f7e04709239f20825b6a51  usr/lib/python2.3/site-packages/viewcvs/vclib/ccvs/rcsparse/default.py
+abe15b71002a32b4533bfe4de58ce57f  usr/lib/python2.3/site-packages/viewcvs/vclib/ccvs/rcsparse/texttools.py
+9066913b390cc537e24f0a305ead3b39  usr/lib/python2.3/site-packages/viewcvs/vclib/ccvs/rcsparse/__init__.py
+0a567d3ab1c92c5a4fe618cfb5ddf228  usr/lib/python2.3/site-packages/viewcvs/vclib/ccvs/__init__.py
+63fce08d20f442f84bd31bd8d7174936  usr/lib/python2.3/site-packages/viewcvs/vclib/ccvs/loginfo.py
+abbaf090900fdbba5fa5a42bdcbca728  usr/lib/python2.3/site-packages/viewcvs/vclib/bincvs/__init__.py
+7404c60df9982b628993bd24335ccedb  usr/lib/python2.3/site-packages/viewcvs/vclib/svn_ra/__init__.py
+652b34492f347810c9268706024d996d  usr/lib/python2.3/site-packages/viewcvs/vclib/__init__.py
+218b6a0898be6a14bf566ee594dc60dc  usr/lib/python2.3/site-packages/viewcvs/rlog.py
+1da3751ff4ebcfd7efb5f11604d7e8a8  usr/lib/python2.3/site-packages/viewcvs/sapi.py
 2af58bc25e1c214ab9439dfb3fd798f8  usr/lib/python2.3/site-packages/viewcvs/compat.py
 0932f964e4631ce9fee26fb7be34cf8a  usr/lib/python2.3/site-packages/viewcvs/config.py
-bc99a2ac94250447de4f461151bcb0ae  usr/lib/python2.3/site-packages/viewcvs/cvsdb.py
+299f4a027e149459945aa1699a198d20  usr/lib/python2.3/site-packages/viewcvs/blame.py
+fae5fe657e3c73bcb8883904d0f9de12  usr/lib/python2.3/site-packages/viewcvs/accept.py
+6ea9a9552ec0b142df3c1ce0a6d00f8a  usr/lib/python2.3/site-packages/viewcvs/popen.py
+8ca733865a1470697220ceee80701d0c  usr/lib/python2.3/site-packages/viewcvs/ndiff.py
+2b20d6778d597379dfb57a3cd17355cd  usr/lib/python2.3/site-packages/viewcvs/apache_icons.py
 1319fa5b4c8212e66f2529fbd68e9402  usr/lib/python2.3/site-packages/viewcvs/dbi.py
 5a5fa13f760fa8586bba4eb0cd6a1f34  usr/lib/python2.3/site-packages/viewcvs/debug.py
-e57b6d48a7182d42dcbfc9a2a3cfb25d  usr/lib/python2.3/site-packages/viewcvs/difflib.py
 7365e392efab5273b0f4277527402072  usr/lib/python2.3/site-packages/viewcvs/ezt.py
-8ca733865a1470697220ceee80701d0c  usr/lib/python2.3/site-packages/viewcvs/ndiff.py
-6ea9a9552ec0b142df3c1ce0a6d00f8a  usr/lib/python2.3/site-packages/viewcvs/popen.py
-f2fecb9f11bdcf9b36c1c37f573f69b1  usr/lib/python2.3/site-packages/viewcvs/py2html.py
+e57b6d48a7182d42dcbfc9a2a3cfb25d  usr/lib/python2.3/site-packages/viewcvs/difflib.py
+bc99a2ac94250447de4f461151bcb0ae  usr/lib/python2.3/site-packages/viewcvs/cvsdb.py
+db28d5ba66fcdb97cc9b1ef9b339d9ba  usr/lib/python2.3/site-packages/viewcvs/PyFontify.py
 77b86b147c45f2adaf64527523d6769b  usr/lib/python2.3/site-packages/viewcvs/query.py
-218b6a0898be6a14bf566ee594dc60dc  usr/lib/python2.3/site-packages/viewcvs/rlog.py
-1da3751ff4ebcfd7efb5f11604d7e8a8  usr/lib/python2.3/site-packages/viewcvs/sapi.py
-652b34492f347810c9268706024d996d  usr/lib/python2.3/site-packages/viewcvs/vclib/__init__.py
-abbaf090900fdbba5fa5a42bdcbca728  usr/lib/python2.3/site-packages/viewcvs/vclib/bincvs/__init__.py
-0a567d3ab1c92c5a4fe618cfb5ddf228  usr/lib/python2.3/site-packages/viewcvs/vclib/ccvs/__init__.py
-63fce08d20f442f84bd31bd8d7174936  usr/lib/python2.3/site-packages/viewcvs/vclib/ccvs/loginfo.py
-9066913b390cc537e24f0a305ead3b39  usr/lib/python2.3/site-packages/viewcvs/vclib/ccvs/rcsparse/__init__.py
-613d88481c34bac7ff76e730d71c1c9a  usr/lib/python2.3/site-packages/viewcvs/vclib/ccvs/rcsparse/common.py
-c5d571aef81ce0dfe0d6d54c6407c4d2  usr/lib/python2.3/site-packages/viewcvs/vclib/ccvs/rcsparse/debug.py
-2807ddcc79f7e04709239f20825b6a51  usr/lib/python2.3/site-packages/viewcvs/vclib/ccvs/rcsparse/default.py
-abe15b71002a32b4533bfe4de58ce57f  usr/lib/python2.3/site-packages/viewcvs/vclib/ccvs/rcsparse/texttools.py
-35afbc04f7f670202395389fc4a8afad  usr/lib/python2.3/site-packages/viewcvs/vclib/svn/__init__.py
-7404c60df9982b628993bd24335ccedb  usr/lib/python2.3/site-packages/viewcvs/vclib/svn_ra/__init__.py
-9b0d5b84f6b696b67e3d2f74458b99c6  usr/lib/python2.3/site-packages/viewcvs/viewcvs.py
 abb081e2935a4bd35d623d64d6f48bb8  usr/lib/python2.3/site-packages/viewcvs/win32popen.py
-25bb9a200cc7697499254800aa26ae67  usr/share/viewcvs/icons/back.gif
-16ff51c168405e575d32bae001f280e4  usr/share/viewcvs/icons/debian.jpg
+f2fecb9f11bdcf9b36c1c37f573f69b1  usr/lib/python2.3/site-packages/viewcvs/py2html.py
+2067206188be810a6e897f79e58793ff  usr/lib/python2.3/site-packages/viewcvs/apache.py
+9b0d5b84f6b696b67e3d2f74458b99c6  usr/lib/python2.3/site-packages/viewcvs/viewcvs.py
+9f772669b7a67d4b39a68db5e8a4cc73  usr/lib/viewcvs/cvsdbadmin
+83a29db5d5b1e50e427c18e6b79720b7  usr/lib/viewcvs/viewcvs-config
+d6cf4cc6e8bb5e01e1b231aa4d33826a  usr/lib/viewcvs/make-database
+7bd6aebff32da85892e985346d6c310c  usr/lib/viewcvs/loginfo-handler
+cf8c5cbcf23e3cf5ffed25ac852e44cb  usr/lib/cgi-bin/viewcvs.cgi
+62ce0385408ef01c7568c91e8e29f963  usr/sbin/viewcvsd
+ee47cf9a70c8142e35c71451c98193c2  usr/share/doc/viewcvs/TODO
+a72bde4b9849e49fcbf444ecac837372  usr/share/doc/viewcvs/README.Debian
+d83a4c09ab3c0456976cca0c65c88df9  usr/share/doc/viewcvs/copyright
+b4af32ebfde5f9548c2c00c01f821761  usr/share/doc/viewcvs/changelog.gz
+49255771d591ed1943e7a5d94116101c  usr/share/doc/viewcvs/changelog.Debian.gz
+02e9a4c81a67068f7537de5c743652d1  usr/share/man/man8/viewcvsd.8.gz
 be033a4b7bd90ebb747a4480d8ece6d1  usr/share/viewcvs/icons/dir.gif
+16ff51c168405e575d32bae001f280e4  usr/share/viewcvs/icons/debian.jpg
 f3fa1d34ae216911d245672e3db9235b  usr/share/viewcvs/icons/text.gif
-f184a52373aa2e680a38d03265b30eda  usr/share/viewcvs/contributing.html
-2b59d5d3a59e61a5328b6d24aa3c7011  usr/share/viewcvs/help_dirview.html
-3234e75d5c9c06a634ea865ff6054c5c  usr/share/viewcvs/help_log.html
-e1ed58133b36bd92364eccf652c0c3f8  usr/share/viewcvs/help_logtable.html
+25bb9a200cc7697499254800aa26ae67  usr/share/viewcvs/icons/back.gif
 1f735c8ca77bfa4558348c1f47098f4f  usr/share/viewcvs/help_query.html
+25531bd4cc5a100741926b19a00b22c6  usr/share/viewcvs/index.html
+73ff6e1773648d326512a3bb54596d83  usr/share/viewcvs/who.html
 dfd241fd650dbaa5138b9624acc3ad58  usr/share/viewcvs/help_rootview.html
-a8840dd134991b9827f07d59184b1048  usr/share/viewcvs/images/chalk.jpg
-c85312cb3549cd96994cf9cd611f2414  usr/share/viewcvs/images/cvsgraph_16x16.png
 baa51bd1ef9c94e5bab1720144b43565  usr/share/viewcvs/images/cvsgraph_32x32.png
 859f362be5b33a6d265689a6fc4dad5d  usr/share/viewcvs/images/down.png
-0f6576f1ec8788ba52a72340729e8bed  usr/share/viewcvs/images/logo.png
+a8840dd134991b9827f07d59184b1048  usr/share/viewcvs/images/chalk.jpg
+c85312cb3549cd96994cf9cd611f2414  usr/share/viewcvs/images/cvsgraph_16x16.png
 48e0bc94edaeba9ad15557f3401d6ac8  usr/share/viewcvs/images/up.png
-25531bd4cc5a100741926b19a00b22c6  usr/share/viewcvs/index.html
-8bbf5c2f29be8bbe9444e75eb4420fdc  usr/share/viewcvs/license-1.html
-95ea0b00bfa2eaa674df492af78e5a82  usr/share/viewcvs/styles.css
+0f6576f1ec8788ba52a72340729e8bed  usr/share/viewcvs/images/logo.png
 03c81eb82d9cf486a850c047536c413c  usr/share/viewcvs/upgrading.html
-73ff6e1773648d326512a3bb54596d83  usr/share/viewcvs/who.html
-ee47cf9a70c8142e35c71451c98193c2  usr/share/doc/viewcvs/TODO
-a72bde4b9849e49fcbf444ecac837372  usr/share/doc/viewcvs/README.Debian
-d83a4c09ab3c0456976cca0c65c88df9  usr/share/doc/viewcvs/copyright
-b4af32ebfde5f9548c2c00c01f821761  usr/share/doc/viewcvs/changelog.gz
-7a8b76c35fa84cd3de2389aa25889779  usr/share/doc/viewcvs/changelog.Debian.gz
-bd2ba7465136ba2925e7f8e47acc7921  usr/share/man/man8/viewcvsd.8.gz
-9d82c2ea5659f4fbcd0debc75017bd75  etc/viewcvs/cvsgraph.conf
-db527442876c1262c3e28f6b2d7d61be  etc/viewcvs/templates/annotate.ezt
-0dc286a09cafea48a2aaf51b9e68e072  etc/viewcvs/templates/diff.ezt
-a5452f18e94d40d62bbc19f57ddcedc4  etc/viewcvs/templates/dir_alternate.ezt
-4c1451504b12b270b2baead52054e8e7  etc/viewcvs/templates/directory.ezt
-f81798561a0506e262603cac2a23f177  etc/viewcvs/templates/error.ezt
-32664d8c047e198d8f6e1c1f2705b0d4  etc/viewcvs/templates/graph.ezt
-34d458a72376aaa09035b8f693091a16  etc/viewcvs/templates/include/branch.ezt
-91f5fd69c0dbd5760a15c7cbef1c5750  etc/viewcvs/templates/include/branch_form.ezt
-5401c5c9b564aa510c465ed3746b5113  etc/viewcvs/templates/include/diff_form.ezt
-c8c838538b503859c267aa123623b4f0  etc/viewcvs/templates/include/dir_footer.ezt
-57b6202bb4f099bfb981c6817ff8872d  etc/viewcvs/templates/include/dir_header.ezt
-58fab502a5fa8ddddcfbc04884f4099f  etc/viewcvs/templates/include/footer.ezt
-1cc941fb698d8550dc4f6a914c8a5b3f  etc/viewcvs/templates/include/header.ezt
-7c81bf1614cd65fb796c55b1e51ba1ad  etc/viewcvs/templates/include/paging.ezt
-553050e2629bcc1478c7a5eef9c27f18  etc/viewcvs/templates/include/sort.ezt
-db3fa327ce56cd03ca6a103d039556b8  etc/viewcvs/templates/include/view_tag.ezt
-f9d77f4daf633ae319c3381519cee3d0  etc/viewcvs/templates/log.ezt
-4faf5615ab03999e254a86eae30ab252  etc/viewcvs/templates/log_table.ezt
-102118f4a280ff880bbc204585613c59  etc/viewcvs/templates/markup.ezt
-9903ff25c30ca4f0854f0830d0ac2438  etc/viewcvs/templates/query.ezt
-2e0d3b1ec31f55756b31c5c456f79504  etc/viewcvs/templates/query_form.ezt
-b852ec7752c9a24e609522b015404f18  etc/viewcvs/templates/query_results.ezt
-02943bd6284e8d498fb2b42fb1026edc  etc/viewcvs/templates/revision.ezt
-5ad0653c7c382adf7f10df36d14ef009  etc/viewcvs/viewcvs.conf.default
-d3b8037cced669b58a55ddb730d91627  etc/apache2/conf.d/viewcvs
+3234e75d5c9c06a634ea865ff6054c5c  usr/share/viewcvs/help_log.html
+e1ed58133b36bd92364eccf652c0c3f8  usr/share/viewcvs/help_logtable.html
+f184a52373aa2e680a38d03265b30eda  usr/share/viewcvs/contributing.html
+2b59d5d3a59e61a5328b6d24aa3c7011  usr/share/viewcvs/help_dirview.html
+95ea0b00bfa2eaa674df492af78e5a82  usr/share/viewcvs/styles.css
+8bbf5c2f29be8bbe9444e75eb4420fdc  usr/share/viewcvs/license-1.html
Binary files 1.4/v/usr/share/doc/viewcvs/changelog.Debian.gz and 1.5/v/usr/share/doc/viewcvs/changelog.Debian.gz differ
Binary files 1.4/v/usr/share/man/man8/viewcvsd.8.gz and 1.5/v/usr/share/man/man8/viewcvsd.8.gz differ


Looking at the conffiles and md5sums files again, with information properly sorted:
===================================================================================
weasel@galaxy:~/tmp/viewcvs$ sort 1.5/v/conffiles > 15c
weasel@galaxy:~/tmp/viewcvs$ sort 1.4/v/conffiles > 14c
weasel@galaxy:~/tmp/viewcvs$ sort 1.5/v/md5sums  > 15m
weasel@galaxy:~/tmp/viewcvs$ sort 1.4/v/md5sums  > 14m
weasel@galaxy:~/tmp/viewcvs$ diff 14c 15c
weasel@galaxy:~/tmp/viewcvs$ diff 14m 15m
1a2
> 02e9a4c81a67068f7537de5c743652d1  usr/share/man/man8/viewcvsd.8.gz
27a29
> 49255771d591ed1943e7a5d94116101c  usr/share/doc/viewcvs/changelog.Debian.gz
45d46
< 7a8b76c35fa84cd3de2389aa25889779  usr/share/doc/viewcvs/changelog.Debian.gz
53d53
< 91f5fd69c0dbd5760a15c7cbef1c5750  etc/viewcvs/templates/include/branch_form.ezt
69d68
< bd2ba7465136ba2925e7f8e47acc7921  usr/share/man/man8/viewcvsd.8.gz
75a75
> d65b4d02a44673da2f4371da46a38367  etc/viewcvs/templates/include/branch_form.ezt

Meaning that only branch_form.ezt and the 2 gziped files have really been changed.
The rest of the above diff is just due to a different order.


Diffing the two gziped files:
=============================
weasel@galaxy:~/tmp/viewcvs$ diff 14cl 15cl 
0a1,11
> viewcvs (0.9.2+cvs.1.0.dev.2004.07.28-1.5) unstable; urgency=medium
> 
>   * NMU
>   * Urgency medium because it fixes an important bug and it would
>     be great if it still could get into sarge, even if it's frozen.
>   * Update templates/include/branch_form.ezt from upstream CVS so that viewcvs
>     actually shows files in CVS trees without backtraces
>     (closes: #303756).
> 
>  -- Peter Palfrader <weasel@debian.org>  Tue, 24 May 2005 00:47:29 +0200
> 
weasel@galaxy:~/tmp/viewcvs$ zcat 1.4/v/usr/share/man/man8/viewcvsd.8.gz > 14vcvsd
weasel@galaxy:~/tmp/viewcvs$ zcat 1.5/v/usr/share/man/man8/viewcvsd.8.gz > 15vcvsd
weasel@galaxy:~/tmp/viewcvs$ diff 14vcvsd 15vcvsd 
44c44
< .\" created by instant / docbook-to-man, Mon 24 Jan 2005, 10:36 
---
> .\" created by instant / docbook-to-man, Tue 24 May 2005, 01:09 


Cheers
-- 
 PGP signed and encrypted  |  .''`.  ** Debian GNU/Linux **
    messages preferred.    | : :' :      The  universal
                           | `. `'      Operating System
 http://www.palfrader.org/ |   `-    http://www.debian.org/



Reply to: