Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv17025

Modified Files:
      Tag: pangocairo-branch
        django-py.info tidy.info tidy.patch trac-py.info 
        webalizer.info 
Added Files:
      Tag: pangocairo-branch
        trac-pysqlite-r6223.patch 
Removed Files:
      Tag: pangocairo-branch
        uw-imap-c-client-10.5.info uw-imap-c-client.info 
Log Message:
sync with HEAD (pangocairo-root-40)


Index: django-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web/django-py.info,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -d -r1.2.2.3 -r1.2.2.4
--- django-py.info      3 Nov 2007 20:25:34 -0000       1.2.2.3
+++ django-py.info      19 Jan 2008 18:37:33 -0000      1.2.2.4
@@ -2,10 +2,10 @@
 Package: django-py%type_pkg[python]
 Type: python (2.4 2.5)
 Version: 0.96.1
-Revision: 1
+Revision: 2
 
 # The only database backend I have tested is pysqlite2:
-Depends: python%type_pkg[python],  setuptools-py%type_pkg[python] (>= 
0.6c2-1), pysqlite2-py%type_pkg[python] | mysql-python-py%type_pkg[python] | 
psycopg-py%type_pkg[python]
+Depends: python%type_pkg[python],  setuptools-py%type_pkg[python] (>= 
0.6c2-1), docutils-py%type_pkg[python], pysqlite2-py%type_pkg[python] | 
mysql-python-py%type_pkg[python] | psycopg2-py%type_pkg[python] | 
psycopg-py%type_pkg[python]
 
 Source: http://media.djangoproject.com/releases/0.96/Django-%v.tar.gz
 Source-MD5: 10aa32e58969c4efeb00ef42ba192b17
@@ -53,15 +53,14 @@
 <<
 
 DescPort:<<
-docutils needs to be changed slightly to export its Python code to other
-applications. As a result, the documentation in the admin interface does not
-work.
+The documentation in the admin interface should work, now that docutils has
+been split into -py* variants.
 
 The install script was cribbed from setuptools-py.info.
 <<
 
 DescPackaging:<<
-$LastChangedRevision: 434 $ in my local repository.
+$LastChangedRevision: 465 $ in my local repository.
 <<
 
 License: BSD

Index: tidy.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web/tidy.info,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -d -r1.7 -r1.7.2.1
--- tidy.info   13 Nov 2006 15:44:21 -0000      1.7
+++ tidy.info   19 Jan 2008 18:37:33 -0000      1.7.2.1
@@ -1,10 +1,10 @@
 Package: tidy
 Version: 051026
-Revision: 3
+Revision: 4
 Epoch: 1
 Description: Utility to clean up HTML/XHTML/XML
 License: BSD
-Maintainer: Adrian Mugnolo <[EMAIL PROTECTED]>
+Maintainer: None <[EMAIL PROTECTED]>
 #
 CustomMirror: <<
   Location1: http://tidy.sourceforge.net/src

--- uw-imap-c-client.info DELETED ---

Index: tidy.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web/tidy.patch,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- tidy.patch  9 Mar 2006 15:35:44 -0000       1.2
+++ tidy.patch  19 Jan 2008 18:37:33 -0000      1.2.2.1
@@ -1,6 +1,6 @@
-diff -urN tidy/build/gmake/Makefile tidy.patched/build/gmake/Makefile
---- tidy/build/gmake/Makefile  2005-07-15 03:58:10.000000000 -0300
-+++ tidy.patched/build/gmake/Makefile  2006-03-09 11:33:58.000000000 -0300
+diff -ruN tidy.orig/build/gmake/Makefile tidy/build/gmake/Makefile
+--- tidy.orig/build/gmake/Makefile     2005-07-15 00:58:10.000000000 -0600
++++ tidy/build/gmake/Makefile  2007-12-11 12:14:38.000000000 -0700
 @@ -58,13 +58,13 @@
  PROJECT=tidy
  
@@ -44,9 +44,9 @@
  
  $(BINDIR)/tab2space: $(APPDIR)/tab2space.c
        if [ ! -d $(BINDIR) ]; then mkdir $(BINDIR); fi
-diff -urN tidy/include/platform.h tidy.patched/include/platform.h
---- tidy/include/platform.h    2005-06-16 03:58:05.000000000 -0300
-+++ tidy.patched/include/platform.h    2006-03-01 10:39:56.000000000 -0300
+diff -ruN tidy.orig/include/platform.h tidy/include/platform.h
+--- tidy.orig/include/platform.h       2005-06-16 00:58:05.000000000 -0600
++++ tidy/include/platform.h    2007-12-11 12:27:04.000000000 -0700
 @@ -33,7 +33,7 @@
    It enables tidy to find config files named ~/.tidyrc if 
    the HTML_TIDY environment variable is not set.
@@ -65,3 +65,20 @@
  
  
  /* Enable/disable support for Big5 and Shift_JIS character encodings */
+@@ -498,14 +498,14 @@
+ 
+ /* hack for gnu sys/types.h file which defines uint and ulong */
+ 
+-#if defined(BE_OS) || defined(SOLARIS_OS) || defined(BSD_BASED_OS) || 
defined(OSF_OS) || defined(IRIX_OS) || defined(AIX_OS)
++#if defined(BE_OS) || defined(SOLARIS_OS) || defined(MAC_OS) || 
defined(BSD_BASED_OS) || defined(OSF_OS) || defined(IRIX_OS) || defined(AIX_OS)
+ #include <sys/types.h>
+ #endif
+ #if !defined(HPUX_OS) && !defined(CYGWIN_OS) && !defined(MAC_OS_X) && 
!defined(BE_OS) && !defined(SOLARIS_OS) && !defined(BSD_BASED_OS) && 
!defined(OSF_OS) && !defined(IRIX_OS) && !defined(AIX_OS) && !defined(LINUX_OS)
+ typedef unsigned int uint;
+ #endif
+ #if defined(HPUX_OS) || defined(CYGWIN_OS) || defined(MAC_OS) || 
defined(BSD_BASED_OS) || defined(_WIN32)
+-typedef unsigned long ulong;
++typedef long ulong;
+ #endif
+ 
+ #ifndef TIDY_EXPORT /* Define it away for most builds */

--- uw-imap-c-client-10.5.info DELETED ---

--- NEW FILE: trac-pysqlite-r6223.patch ---
Index: /trunk/trac/db/sqlite_backend.py
===================================================================
--- /trunk/trac/db/sqlite_backend.py (revision 4493)
+++ /trunk/trac/db/sqlite_backend.py (revision 6223)
@@ -131,4 +131,6 @@
                 raise TracError('Database already exists at %s' % path)
             os.makedirs(os.path.split(path)[0])
+        if isinstance(path, unicode): # needed with 2.4.0
+            path = path.encode('utf-8')
         cnx = sqlite.connect(path, timeout=int(params.get('timeout', 10000)))
         cursor = cnx.cursor()
@@ -168,4 +170,6 @@
             self._active_cursors = weakref.WeakKeyDictionary()
             timeout = int(params.get('timeout', 10.0))
+            if isinstance(path, unicode): # needed with 2.4.0
+                path = path.encode('utf-8')
             cnx = sqlite.connect(path, detect_types=sqlite.PARSE_DECLTYPES,
                                  check_same_thread=sqlite_version < 30301,

Index: trac-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web/trac-py.info,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -u -d -r1.2.2.4 -r1.2.2.5
--- trac-py.info        18 Sep 2007 00:27:44 -0000      1.2.2.4
+++ trac-py.info        19 Jan 2008 18:37:33 -0000      1.2.2.5
@@ -1,7 +1,7 @@
 Info2: <<
 Package: trac-py%type_pkg[python]
 Version: 0.10.4
-Revision: 1000
+Revision: 1001
 Distribution: (%type_pkg[python] = 23) 10.3, (%type_pkg[python] = 23) 10.4
 Type: python(2.3 2.4 2.5)
 Maintainer: Charles Lepple <[EMAIL PROTECTED]>
@@ -15,11 +15,15 @@
 BuildDepends: <<
 python%type_pkg[python] | python%type_pkg[python]-nox
 <<
+
 Conflicts: trac-py22, trac-py23, trac-py24, trac-py25
 Replaces: trac-py22, trac-py23, trac-py24, trac-py25
 Recommends: silvercity-py%type_pkg[python]
+
 Source: http://ftp.edgewall.com/pub/trac/trac-%v.tar.gz
 Source-MD5: 52a3a21ad9faafc3b59cbeb87d5a69d2
+PatchScript: patch -p2 < %a/trac-pysqlite-r6223.patch
+
 CompileScript: <<
   %p/bin/python%type_raw[python] setup.py build
 <<

Index: webalizer.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web/webalizer.info,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- webalizer.info      15 Jul 2007 15:10:44 -0000      1.1.2.1
+++ webalizer.info      19 Jan 2008 18:37:34 -0000      1.1.2.2
@@ -1,6 +1,6 @@
 Package: webalizer
 Version: 2.01-10
-Revision: 4
+Revision: 5
 BuildDepends: gd2, libpng3
 Depends: gd2-shlibs, libpng3-shlibs
 Source: ftp://ftp.mrunix.net/pub/%n/%n-%v-src.tgz
@@ -19,5 +19,5 @@
 Description: Web/ftp/common log processing utility
 License: GPL
 HomePage: http://www.mrunix.net/webalizer/
-Maintainer: Rudy Richter <[EMAIL PROTECTED]>
+Maintainer: Rudy Richter <[EMAIL PROTECTED]>
 Source-MD5: 9217595005aec46a505e1fb349052a8e


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to