Hello
On Thu, Aug 19, 2010 at 11:51:40AM +0100, Julien Cristau wrote:
> On Thu, Aug 19, 2010 at 11:30:39 +0200, أحمد المحمودي wrote:
>
> > Here's the changelog entry:
> >
> > dico (2.1-3) unstable; urgency=low
> >
> > * debian/control:
> > + Bumped Standards Version to 3.9.1, no changes needed
> > + Added ${python:Depends} for dicoweb (Closes: #592001)
> > + Add XS-Python-Version field.
> > * Removed debian/pyversions
> > * Added utf8.diff patch to fix Unicode handling (Closes: #591698)
> >
> utf8.diff has unrelated wikipedia.org changes, why?
---end quoted text---
I removed those changes, new debdiff attached.
--
أحمد المحمودي (Ahmed El-Mahmoudy)
Digital design engineer
GPG KeyID: 0xEDDDA1B7
GPG Fingerprint: 8206 A196 2084 7E6D 0DF8 B176 BC19 6A94 EDDD A1B7
diff --git a/debian/changelog b/debian/changelog
index f490994..4dff239 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+dico (2.1-3) unstable; urgency=low
+
+ * debian/control:
+ + Bumped Standards Version to 3.9.1, no changes needed
+ + Added ${python:Depends} for dicoweb (Closes: #592001)
+ + Add XS-Python-Version field.
+ * Removed debian/pyversions
+ * Added utf8.diff patch to fix Unicode handling (Closes: #591698)
+
+ -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy@sabily.org> Thu, 19 Aug 2010 11:25:19 +0200
+
dico (2.1-2) unstable; urgency=low
* debian/rules: Make sure dicoweb is being built before installing
diff --git a/debian/control b/debian/control
index 0a786bc..487d777 100644
--- a/debian/control
+++ b/debian/control
@@ -5,11 +5,12 @@ Maintainer: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy@sabily.or
Build-Depends: debhelper (>= 7.3.5~), autotools-dev, guile-1.8-dev, libldap2-dev,
libgsasl7-dev, zlib1g-dev, libltdl7-dev, python-support (>= 0.5.3),
python-all-dev (>= 2.3.5-11), m4
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
DM-Upload-Allowed: yes
Homepage: http://puszcza.gnu.org.ua/software/dico/
Vcs-Git: git://git.debian.org/git/collab-maint/dico.git
Vcs-Browser: http://git.debian.org/?p=collab-maint/dico.git
+XS-Python-Version: >= 2.5
Package: dicod
Architecture: any
@@ -151,7 +152,7 @@ Description: RFC 2229 compliant dictionary client module and shell
Package: dicoweb
Architecture: all
Section: web
-Depends: ${misc:Depends}, python-dicoclient, python-django, python-memcache, python-wit, libapache2-mod-python | libapache2-mod-wsgi
+Depends: ${python:Depends}, ${misc:Depends}, python-dicoclient, python-django, python-memcache, python-wit, libapache2-mod-python | libapache2-mod-wsgi
Description: RFC 2229 compliant modular dictionary server (web interface)
GNU Dico is an implementation of the DICT protocol as defined in RFC 2229.
It is fully modular: the daemon itself (dicod) provides only the server
diff --git a/debian/patches/series b/debian/patches/series
index 33f37ce..8802a5f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
dico+kbsd.diff
dicoweb-debian.diff
+utf8.diff
diff --git a/debian/patches/utf8.diff b/debian/patches/utf8.diff
new file mode 100644
index 0000000..b054113
--- /dev/null
+++ b/debian/patches/utf8.diff
@@ -0,0 +1,55 @@
+Description: Fix Unicode handling
+Origin: http://git.gnu.org.ua/cgit/dico.git/commit/?id=efd363456bf8c76110bc08b4d98ec318852cc549
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=591698
+diff --git a/app/python/mediawiki.py b/app/python/mediawiki.py
+index 7410c8c..e717c0c 100644
+--- a/app/python/mediawiki.py
++++ b/app/python/mediawiki.py
+@@ -1,7 +1,7 @@
+ # -*- coding: utf-8 -*-
+ #
+ # This file is part of GNU Dico.
+-# Copyright (C) 2008, 2009 Wojciech Polak
++# Copyright (C) 2008, 2009, 2010 Wojciech Polak
+ #
+ # GNU Dico is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -24,6 +24,17 @@ from htmlentitydefs import name2codepoint
+ from xml.dom import minidom
+ from wit import wiki2text
+
++# Set utf-8 as the default encoding.
++# Trying to do so using encode('utf_8')/unicode, which is
++# supposed to be the right way, does not work.
++# Simply calling sys.setdefaultencoding is not possible,
++# because, for some obscure reason, Python chooses to delete
++# this symbol from the namespace after setting its default
++# encoding in site.py. That's why reload is needed.
++
++reload(sys)
++sys.setdefaultencoding('utf-8')
++
+ try:
+ import json
+ except ImportError:
+@@ -31,7 +42,7 @@ except ImportError:
+
+ import dico
+
+-__version__ = '1.01'
++__version__ = '1.03'
+
+ class DicoModule:
+ user_agent = 'Mozilla/1.0'
diff --git a/debian/pyversions b/debian/pyversions
deleted file mode 100644
index b3dc41e..0000000
--- a/debian/pyversions
+++ /dev/null
@@ -1 +0,0 @@
-2.5-
Attachment:
signature.asc
Description: Digital signature