tags 289466 patch
thanks
On Mon, Jan 10, 2005 at 01:42:18AM +0100, Frank Lichtenheld wrote:
The viewcvs bug is clearly caused by the use of vhosts in the
configuration file. The script just isn't capable of dealing with
this at all. I think the maintainer script should at least
detect if the configuration file is too complex for them to handle
and not touch it in this case (I wouldn't mind if the whole debconf
stuff would disappear, but that's not up to me to decide).
Of course one could also try to support vhosts via debconf but
IMHO the effort isn't worth it.
Attached is a proposed patch which should fix this issue.
(I included some other simple changes, too)
Gruesse,
--
Frank Lichtenheld [EMAIL PROTECTED]
www: http://www.djpig.de/
diff -Naur viewcvs-0.9.2+cvs.1.0.dev.2004.07.28.bak/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.bak/debian/changelog 2005-01-21
11:16:43.0 +0100
+++ viewcvs-0.9.2+cvs.1.0.dev.2004.07.28/debian/changelog 2005-01-21
12:46:54.0 +0100
@@ -1,3 +1,18 @@
+viewcvs (0.9.2+cvs.1.0.dev.2004.07.28-1.4) unstable; urgency=high
+
+ * NMU.
+ * Don't try to change the config file if there are vhosts configured.
+This will most probably mess it up (Closes: #289466)
+ * Bug fix: viewcvs: Updated Japanese po-debconf template translation
+(ja.po), thanks to Hideki Yamane (Closes: #241832).
+ * Bug fix: Update of the french debconf translation, thanks to Michel
+Grentzinger (Closes: #244514).
+ * Bug fix: [INTL:nl] New po-debconf translation in Dutch for viewcvs.,
+thanks to Tim Dijkstra (Closes: #289639).
+ * Copyright holder has changed, correct copyright file
+
+ -- Frank Lichtenheld [EMAIL PROTECTED] Fri, 21 Jan 2005 12:33:29 +0100
+
viewcvs (0.9.2+cvs.1.0.dev.2004.07.28-1.3) unstable; urgency=HIGH
* NMU.
diff -Naur viewcvs-0.9.2+cvs.1.0.dev.2004.07.28.bak/debian/config
viewcvs-0.9.2+cvs.1.0.dev.2004.07.28/debian/config
--- viewcvs-0.9.2+cvs.1.0.dev.2004.07.28.bak/debian/config 2005-01-21
11:16:43.0 +0100
+++ viewcvs-0.9.2+cvs.1.0.dev.2004.07.28/debian/config 2005-01-21
13:02:34.0 +0100
@@ -15,6 +15,10 @@
fi
if [ -x /usr/lib/viewcvs/viewcvs-config -a -f /etc/viewcvs/viewcvs.conf ]; then
+if [ -n `/usr/lib/viewcvs/viewcvs-config --all --section vhosts
2/dev/null` ]; then
+ exit 0
+ fi
+
cvs_roots=`/usr/lib/viewcvs/viewcvs-config --get cvs_roots`
svn_roots=`/usr/lib/viewcvs/viewcvs-config --get svn_roots`
# svn_parent_path=`/usr/lib/viewcvs/viewcvs-config --get svn_parent_path`
diff -Naur viewcvs-0.9.2+cvs.1.0.dev.2004.07.28.bak/debian/copyright
viewcvs-0.9.2+cvs.1.0.dev.2004.07.28/debian/copyright
--- viewcvs-0.9.2+cvs.1.0.dev.2004.07.28.bak/debian/copyright 2005-01-21
11:16:43.0 +0100
+++ viewcvs-0.9.2+cvs.1.0.dev.2004.07.28/debian/copyright 2005-01-21
12:46:21.0 +0100
@@ -3,13 +3,13 @@
It was downloaded from http://viewcvs.sourceforge.net/
-Upstream Author(s): Greg Stein [EMAIL PROTECTED]
+Upstream Authors: Greg Stein [EMAIL PROTECTED]
Copyright:
-# Copyright (C) 1999-2000 Greg Stein. All Rights Reserved.
+# Copyright (C) 1999-2002 The ViewCVS Group. All Rights Reserved.
#
-# By using this file, you agree to the terms and conditions set forth below:
+# By using ViewCVS, you agree to the terms and conditions set forth below:
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
diff -Naur viewcvs-0.9.2+cvs.1.0.dev.2004.07.28.bak/debian/po/fr.po
viewcvs-0.9.2+cvs.1.0.dev.2004.07.28/debian/po/fr.po
--- viewcvs-0.9.2+cvs.1.0.dev.2004.07.28.bak/debian/po/fr.po2005-01-21
11:16:43.0 +0100
+++ viewcvs-0.9.2+cvs.1.0.dev.2004.07.28/debian/po/fr.po2005-01-21
12:25:49.0 +0100
@@ -11,10 +11,10 @@
#
msgid
msgstr
-Project-Id-Version: viewcvs_0.9.2+cvs.1.0.dev.2003.05.05-2\n
+Project-Id-Version: viewcvs_0.9.2+cvs.1.0.dev.2004.07-2\n
Report-Msgid-Bugs-To: \n
POT-Creation-Date: 2004-03-24 15:48+0900\n
-PO-Revision-Date: 2003-07-09 23:05+0200\n
+PO-Revision-Date: 2004-08-31 09:48+0200\n
Last-Translator: Michel Grentzinger [EMAIL PROTECTED]\n
Language-Team: French debian-l10n-french@lists.debian.org\n
MIME-Version: 1.0\n
@@ -25,7 +25,7 @@
#. Description
#: ../templates:4
msgid Where are your cvs roots?
-msgstr O sont situs vos entrepts CVS?
+msgstr Emplacement de vos entrepts CVS:
#. Type: string
#. Description
@@ -43,30 +43,28 @@
#. Type: string
#. Description
#: ../templates:12
-#, fuzzy
msgid Where are your svn roots?
-msgstr O sont situs vos entrepts CVS?
+msgstr Emplacement de vos entrepts svn:
#. Type: string
#. Description
#: ../templates:12
-#, fuzzy
msgid
This setting specifies each of the Subversion roots (repositories) on your
system and assigns names to them. Each root should be given by a \name: path
\
