From edb2f7f4a386c9fe61283be3cf11e5b9fda2e7d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 24 Jan 2016 07:14:00 +0100 Subject: New upstream release --- debian/patches/0001-disable_search_doc.patch | 16 +-- debian/patches/0100-python_print.patch | 171 --------------------------- debian/patches/series | 1 - 3 files changed, 8 insertions(+), 180 deletions(-) delete mode 100644 debian/patches/0100-python_print.patch (limited to 'debian/patches') diff --git a/debian/patches/0001-disable_search_doc.patch b/debian/patches/0001-disable_search_doc.patch index 0dfcdfb..dc103a6 100644 --- a/debian/patches/0001-disable_search_doc.patch +++ b/debian/patches/0001-disable_search_doc.patch @@ -1,18 +1,18 @@ Description: Disable search in documentation Author: Jörg Frings-Fürst -Last-Update: 2015-05-14 +Last-Update: 2015-12-14 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: trunk/doc/doxygen.cfg.in =================================================================== --- trunk.orig/doc/doxygen.cfg.in +++ trunk/doc/doxygen.cfg.in -@@ -1234,7 +1234,7 @@ MATHJAX_EXTENSIONS = - # typically be disabled. For large projects the javascript based search engine - # can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. - +@@ -184,7 +184,7 @@ MATHJAX_FORMAT = HTML-CSS + MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest + MATHJAX_EXTENSIONS = + MATHJAX_CODEFILE = -SEARCHENGINE = YES +SEARCHENGINE = NO - - # When the SERVER_BASED_SEARCH tag is enabled the search engine will be - # implemented using a web server instead of a web client using Javascript. + SERVER_BASED_SEARCH = NO + EXTERNAL_SEARCH = NO + SEARCHENGINE_URL = diff --git a/debian/patches/0100-python_print.patch b/debian/patches/0100-python_print.patch deleted file mode 100644 index 472dc63..0000000 --- a/debian/patches/0100-python_print.patch +++ /dev/null @@ -1,171 +0,0 @@ -Description: Change to python3 syntacs -Author: Jörg Frings-Fürst -Forwarded: mailto:Uditha Atukorala -Last-Update: 2015-11-21 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/modules/modpy/modules/modpy.py -=================================================================== ---- trunk.orig/modules/modpy/modules/modpy.py -+++ trunk/modules/modpy/modules/modpy.py -@@ -6,15 +6,15 @@ - import bitz - - def init(): -- print "init() called"; -+ print ("init() called"); - - def cleanup(): -- print "cleanup() called"; -+ print ("cleanup() called"); - - def preview( request ): - request = bitz.get_request( request ); - req_payload = request['payload']; -- print "preview payload: \r\n", req_payload; -+ print ("preview payload: \r\n", req_payload); - - # response - if req_payload['ieof']: -@@ -27,7 +27,7 @@ def preview( request ): - def modify( request ): - request = bitz.get_request( request ); - req_payload = request['payload']; -- print "modify payload: \r\n", req_payload; -+ print ("modify payload: \r\n", req_payload); - - # response - resp_payload = {}; -Index: trunk/test/icap-client.py -=================================================================== ---- trunk.orig/test/icap-client.py -+++ trunk/test/icap-client.py -@@ -14,16 +14,16 @@ SERVICE = 'icap://icap.server.net/sample - PORT = 1344 - - # OPTIONS --print "----- OPTIONS -----" -+print ("----- OPTIONS -----") - try: - sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) --except socket.error, msg: -+except socket.error as msg: - sys.stderr.write("[ERROR] %s\n" % msg[1]) - sys.exit(1) - - try: - sock.connect((HOST, PORT)) --except socket.error, msg: -+except socket.error as msg: - sys.stderr.write("[ERROR] %s\n" % msg[1]) - sys.exit(2) - -@@ -40,20 +40,20 @@ while len(data): - data = sock.recv(1024) - sock.close() - --print string -+print (string) - - - # REQMOD, GET --print "----- REQMOD - GET -----" -+print ("----- REQMOD - GET -----") - try: - sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) --except socket.error, msg: -+except socket.error as msg: - sys.stderr.write("[ERROR] %s\n" % msg[1]) - sys.exit(1) - - try: - sock.connect((HOST, PORT)) --except socket.error, msg: -+except socket.error as msg: - sys.stderr.write("[ERROR] %s\n" % msg[1]) - sys.exit(2) - -@@ -78,20 +78,20 @@ while len(data): - data = sock.recv(1024) - sock.close() - --print string -+print (string) - - - # REQMOD, POST --print "----- REQMOD - POST -----" -+print ("----- REQMOD - POST -----") - try: - sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) --except socket.error, msg: -+except socket.error as msg: - sys.stderr.write("[ERROR] %s\n" % msg[1]) - sys.exit(1) - - try: - sock.connect((HOST, PORT)) --except socket.error, msg: -+except socket.error as msg: - sys.stderr.write("[ERROR] %s\n" % msg[1]) - sys.exit(2) - -@@ -118,20 +118,20 @@ while len(data): - data = sock.recv(1024) - sock.close() - --print string -+print (string) - - - # REQMOD - Message preview --print "----- REQMOD - Message preview -----" -+print ("----- REQMOD - Message preview -----") - try: - sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) --except socket.error, msg: -+except socket.error as msg: - sys.stderr.write("[ERROR] %s\n" % msg[1]) - sys.exit(1) - - try: - sock.connect((HOST, PORT)) --except socket.error, msg: -+except socket.error as msg: - sys.stderr.write("[ERROR] %s\n" % msg[1]) - sys.exit(2) - -@@ -158,20 +158,20 @@ while len(data): - data = sock.recv(1024) - sock.close() - --print string -+print (string) - - - # RESPMOD --print "----- RESPMOD -----" -+print ("----- RESPMOD -----") - try: - sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) --except socket.error, msg: -+except socket.error as msg: - sys.stderr.write("[ERROR] %s\n" % msg[1]) - sys.exit(1) - - try: - sock.connect((HOST, PORT)) --except socket.error, msg: -+except socket.error as msg: - sys.stderr.write("[ERROR] %s\n" % msg[1]) - sys.exit(2) - -@@ -204,7 +204,7 @@ while len(data): - data = sock.recv(1024) - sock.close() - --print string -+print (string) - - - sys.exit(0) diff --git a/debian/patches/series b/debian/patches/series index 4705ad2..690742e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -0100-python_print.patch 0001-disable_search_doc.patch -- cgit v1.2.3