tags 408364 patch
stop
Hi,
I've created a patch moving adduser to the pre-depends and NMU'ed it to
DELAYED/0 according to
http://lists.debian.org/debian-devel-announce/2006/09/msg00020.html
The patch is attached.
Cheers,
Bastian
--
Bastian Venthur http://venthur.de
Debian Developer venthur at debian org
diff -ruN orig/karrigell-2.3.2/debian/changelog karrigell-2.3.2/debian/changelog
--- orig/karrigell-2.3.2/debian/changelog 2007-02-01 12:24:20.000000000 +0100
+++ karrigell-2.3.2/debian/changelog 2007-02-01 12:20:41.000000000 +0100
@@ -1,3 +1,11 @@
+karrigell (2.3.2-1.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Moved adduser from depend to pre-depend (Closes: #408364)
+ * Urgency high due RCness
+
+ -- Bastian Venthur <[EMAIL PROTECTED]> Thu, 1 Feb 2007 12:20:04 +0100
+
karrigell (2.3.2-1) unstable; urgency=low
* new upstream version
diff -ruN orig/karrigell-2.3.2/debian/control karrigell-2.3.2/debian/control
--- orig/karrigell-2.3.2/debian/control 2007-02-01 12:24:20.000000000 +0100
+++ karrigell-2.3.2/debian/control 2007-02-01 12:21:41.000000000 +0100
@@ -8,7 +8,8 @@
Package: karrigell
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, adduser, python (>= 2.4), python-cheetah (>= 1.0-1.1)
+Pre-Depends: adduser
+Depends: ${misc:Depends}, ${python:Depends}, python (>= 2.4), python-cheetah (>= 1.0-1.1)
Suggests: karrigell-doc
XB-Python-Version: ${python:Versions}
Description: python web server application framework
diff -ruN orig/karrigell-2.3.2/debian/po/cs.po karrigell-2.3.2/debian/po/cs.po
--- orig/karrigell-2.3.2/debian/po/cs.po 2007-02-01 12:24:20.000000000 +0100
+++ karrigell-2.3.2/debian/po/cs.po 2007-02-01 12:22:00.000000000 +0100
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: karrigell\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2006-11-17 18:37+0100\n"
+"POT-Creation-Date: 2007-02-01 12:22+0100\n"
"PO-Revision-Date: 2005-10-22 15:47+0200\n"
"Last-Translator: Miroslav Kure <[EMAIL PROTECTED]>\n"
"Language-Team: Czech <[EMAIL PROTECTED]>\n"
@@ -25,13 +25,13 @@
#. Type: note
#. Description
-#: ../karrigell.templates:3
+#: ../karrigell.templates:1001
msgid "Important note"
msgstr "Důležitá poznámka"
#. Type: note
#. Description
-#: ../karrigell.templates:3
+#: ../karrigell.templates:1001
msgid ""
"You have installed the Karrigell web service. By default, Karrigell runs as "
"a daemon, listening on port 8080. Please edit the file /etc/karrigell/"
@@ -43,13 +43,13 @@
#. Type: note
#. Description
-#: ../karrigell.templates:3
+#: ../karrigell.templates:1001
msgid "Put your web applications into /var/lib/karrigell/"
msgstr "Své webové aplikace můžete umÃstit do /var/lib/karrigell/"
#. Type: note
#. Description
-#: ../karrigell.templates:3
+#: ../karrigell.templates:1001
msgid ""
"If you install the karrigell-doc and karrigell-demo packages, you can have "
"an interactive demo by pointing your browser to http://localhost:8080/";
@@ -59,7 +59,7 @@
#. Type: note
#. Description
-#: ../karrigell.templates:3
+#: ../karrigell.templates:1001
msgid ""
"However, the demo scripts would be also accessible from the internet, which "
"has security implications. Therefore, entries aliasing 'demo' and 'doc' are "
diff -ruN orig/karrigell-2.3.2/debian/po/fr.po karrigell-2.3.2/debian/po/fr.po
--- orig/karrigell-2.3.2/debian/po/fr.po 2007-02-01 12:24:20.000000000 +0100
+++ karrigell-2.3.2/debian/po/fr.po 2007-02-01 12:22:00.000000000 +0100
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: Karrigell 2.1.9-2\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2006-11-17 18:37+0100\n"
+"POT-Creation-Date: 2007-02-01 12:22+0100\n"
"PO-Revision-Date: 2005-10-09 14:28+0200\n"
"Last-Translator: Sylvain Archenault <[EMAIL PROTECTED]>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -19,13 +19,13 @@
#. Type: note
#. Description
-#: ../karrigell.templates:3
+#: ../karrigell.templates:1001
msgid "Important note"
msgstr "Remarque importante"
#. Type: note
#. Description
-#: ../karrigell.templates:3
+#: ../karrigell.templates:1001
msgid ""
"You have installed the Karrigell web service. By default, Karrigell runs as "
"a daemon, listening on port 8080. Please edit the file /etc/karrigell/"
@@ -38,13 +38,13 @@
#. Type: note
#. Description
-#: ../karrigell.templates:3
+#: ../karrigell.templates:1001
msgid "Put your web applications into /var/lib/karrigell/"
msgstr "Vos applications web doivent être situées dans /var/lib/karrigell/."
#. Type: note
#. Description
-#: ../karrigell.templates:3
+#: ../karrigell.templates:1001
msgid ""
"If you install the karrigell-doc and karrigell-demo packages, you can have "
"an interactive demo by pointing your browser to http://localhost:8080/";
@@ -55,7 +55,7 @@
#. Type: note
#. Description
-#: ../karrigell.templates:3
+#: ../karrigell.templates:1001
msgid ""
"However, the demo scripts would be also accessible from the internet, which "
"has security implications. Therefore, entries aliasing 'demo' and 'doc' are "
diff -ruN orig/karrigell-2.3.2/debian/po/sv.po karrigell-2.3.2/debian/po/sv.po
--- orig/karrigell-2.3.2/debian/po/sv.po 2007-02-01 12:24:20.000000000 +0100
+++ karrigell-2.3.2/debian/po/sv.po 2007-02-01 12:22:00.000000000 +0100
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: karrigell 2.1.9-2\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2006-11-17 18:37+0100\n"
+"POT-Creation-Date: 2007-02-01 12:22+0100\n"
"PO-Revision-Date: 2005-12-01 20:53+0100\n"
"Last-Translator: Daniel Nylander <[EMAIL PROTECTED]>\n"
"Language-Team: Swedish <[EMAIL PROTECTED]>\n"
@@ -25,13 +25,13 @@
#. Type: note
#. Description
-#: ../karrigell.templates:3
+#: ../karrigell.templates:1001
msgid "Important note"
msgstr "Viktig notering"
#. Type: note
#. Description
-#: ../karrigell.templates:3
+#: ../karrigell.templates:1001
msgid ""
"You have installed the Karrigell web service. By default, Karrigell runs as "
"a daemon, listening on port 8080. Please edit the file /etc/karrigell/"
@@ -43,13 +43,13 @@
#. Type: note
#. Description
-#: ../karrigell.templates:3
+#: ../karrigell.templates:1001
msgid "Put your web applications into /var/lib/karrigell/"
msgstr "Lägg dina webbapplikationer i /var/lib/karrigell/"
#. Type: note
#. Description
-#: ../karrigell.templates:3
+#: ../karrigell.templates:1001
msgid ""
"If you install the karrigell-doc and karrigell-demo packages, you can have "
"an interactive demo by pointing your browser to http://localhost:8080/";
@@ -59,7 +59,7 @@
#. Type: note
#. Description
-#: ../karrigell.templates:3
+#: ../karrigell.templates:1001
msgid ""
"However, the demo scripts would be also accessible from the internet, which "
"has security implications. Therefore, entries aliasing 'demo' and 'doc' are "
diff -ruN orig/karrigell-2.3.2/debian/po/templates.pot karrigell-2.3.2/debian/po/templates.pot
--- orig/karrigell-2.3.2/debian/po/templates.pot 2007-02-01 12:24:20.000000000 +0100
+++ karrigell-2.3.2/debian/po/templates.pot 2007-02-01 12:22:00.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2006-11-17 18:37+0100\n"
+"POT-Creation-Date: 2007-02-01 12:22+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
@@ -18,13 +18,13 @@
#. Type: note
#. Description
-#: ../karrigell.templates:3
+#: ../karrigell.templates:1001
msgid "Important note"
msgstr ""
#. Type: note
#. Description
-#: ../karrigell.templates:3
+#: ../karrigell.templates:1001
msgid ""
"You have installed the Karrigell web service. By default, Karrigell runs as "
"a daemon, listening on port 8080. Please edit the file /etc/karrigell/"
@@ -33,13 +33,13 @@
#. Type: note
#. Description
-#: ../karrigell.templates:3
+#: ../karrigell.templates:1001
msgid "Put your web applications into /var/lib/karrigell/"
msgstr ""
#. Type: note
#. Description
-#: ../karrigell.templates:3
+#: ../karrigell.templates:1001
msgid ""
"If you install the karrigell-doc and karrigell-demo packages, you can have "
"an interactive demo by pointing your browser to http://localhost:8080/";
@@ -47,7 +47,7 @@
#. Type: note
#. Description
-#: ../karrigell.templates:3
+#: ../karrigell.templates:1001
msgid ""
"However, the demo scripts would be also accessible from the internet, which "
"has security implications. Therefore, entries aliasing 'demo' and 'doc' are "
diff -ruN orig/karrigell-2.3.2/debugger/k_debugger.py.bak karrigell-2.3.2/debugger/k_debugger.py.bak
--- orig/karrigell-2.3.2/debugger/k_debugger.py.bak 2005-11-24 12:55:36.000000000 +0100
+++ karrigell-2.3.2/debugger/k_debugger.py.bak 1970-01-01 01:00:00.000000000 +0100
@@ -1,109 +0,0 @@
-"""Used in case of errors or exceptions in scripts"""
-
-import cStringIO
-import cgi
-import types
-
-import k_config
-import k_utils
-
-Errors=k_utils.LimitedDict(100)
-
-class Error:
- """An instance of Error is created every time Template handles
- an error or an exception
- The instances are kept in the dictionary Errors, with keys generated
- at random. The key is used by the debugger scripts"""
-
- def __init__(self,tree,tb,exc_info,namespace,initialNs,key):
- """Instances are created from
- - tree : tree[0] is the script (instance of the Script class
- in Template) where the error occured. If it is included in other
- scripts, the following items are its parents
- - tb and exc_info : traceback elements
- - initialNs : a copy of the namespace before the script ran
- - namespace : a copy of the namespace after the script has run
- - key : random string generated in Template"""
-
- self.namespace={0:id(namespace),
- id(namespace):k_utils.Node(None,"namespace",namespace)}
- self.initialNs=initialNs
- self.tree=tree
- self.script=tree[-1]
-
- # browses traceback upwards
- errorLine=0
- for i in range(len(tb)):
- (filename,errorLine,x,y)=tb[len(tb)-i-1]
- if filename=="<string>":
- break
- [exc_type,exc_value]=exc_info[:2]
- if type(exc_type) == types.ClassType:
- stype = exc_type.__name__
- else:
- stype = exc_type
- if exc_type in [SyntaxError,IndentationError]:
- exc_type_value=stype
- try:
- errorMsg,(filename, lineno, offset, line) = exc_value
- errorLine=lineno
- except:
- pass
- else:
- exc_type_value=str(stype)+": "+str(exc_value)
-
- if self.script.lineMapping is None:
- originLineNum=errorLine-1
- else:
- try:
- originLineNum=self.script.lineMapping[errorLine-1]
- except KeyError:
- originLineNum=errorLine-1
- try:
- originErrorLine=open(self.script.name).read().split("\n")[originLineNum]
- except IndexError:
- originErrorLine= '--error fetching error origin line --'
- self.exc_type_value=exc_type_value
- self.originLineNum=originLineNum
- self.originErrorLine=originErrorLine
- self.pythonLine=errorLine
- self.key=key
- Errors[key]=self
-
- def getRawTraceback(self):
- """Used from Template to write the raw Python traceback"""
- self.raw_traceback=cStringIO.StringIO()
- return self.raw_traceback
-
- def errorText(self):
- """Return the HTML code giving minimal info about the error :
- name of the script, name and message of the exception,
- line number in script"""
- errorText=cStringIO.StringIO()
- errorText.write('<font face="verdana" color="red">')
- errorText.write('<b>Error in %s</b></font><p>\n' %self.script.url)
- # if script is included, show tree
- if len(self.tree)>1:
- inclusionTree="".join(["\n"+" "*i+" includes "+s.url for i,s in enumerate(self.tree[1:])])
- errorText.write("<p><pre>"+self.tree[0].url+inclusionTree+'</pre><p>')
- errorText.write('<table border="1">\n<tr><td bgColor="#FFFFCC">\n')
- errorText.write('<pre>Script <b>%s</b><hr>' %self.script.url)
- errorText.write(cgi.escape(self.exc_type_value)+'\n\n')
- errorText.write('Line %s' %(self.originLineNum+1)+" "*4+"\n")
- errorText.write(cgi.escape(self.originErrorLine).strip())
- errorText.write('</pre></td></tr></table>')
- errorText.write("<pre>\n%s\n</pre>\n" %cgi.escape(self.raw_traceback.getvalue()))
- return errorText.getvalue()
-
- def HTML(self):
- """Return the complete HTML code, including a button to launch the
- debugger scripts"""
- HTML=cStringIO.StringIO()
- HTML.write(self.errorText())
- # base url
- debuggerUrl=k_config.base + "/debugger/frame_debug.pih"
- HTML.write("""<form action="%s" target="_blank">
- <input type="hidden" name="key" value="%s">
- <input type="submit" value="Debug">
- </form>""" %(debuggerUrl,self.key))
- return HTML.getvalue()
diff -ruN orig/karrigell-2.3.2/webapps/demo/cheetahTest.ks.bak karrigell-2.3.2/webapps/demo/cheetahTest.ks.bak
--- orig/karrigell-2.3.2/webapps/demo/cheetahTest.ks.bak 2005-12-29 17:39:11.000000000 +0100
+++ karrigell-2.3.2/webapps/demo/cheetahTest.ks.bak 1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-title = 'Cheetah test'
-
-class Client:
-
- def __init__(self,surname,firstname,email):
- self.surname = surname
- self.firstname = firstname
- self.email = email
-
-clients = [ Client('Proust','Marcel','[EMAIL PROTECTED]'),
- Client('Salinger','J.D.','[EMAIL PROTECTED]')]
-
-def index():
- print 'ggg'
- Include('../cheetahTest.tmpl',searchDict = clients)
\ Kein Zeilenumbruch am Dateiende.
