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

Modified Files:
      Tag: pangocairo-branch
        astng-py.info bzr-py.info cmake.info epydoc-py.info 
        gengetopt.info libtool14.info logilab-common-py.info 
        perltidy.info pylint-py.info srecord.info 
Log Message:
merge from trunk

Index: perltidy.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/perltidy.info,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -d -r1.3.2.2 -r1.3.2.3
--- perltidy.info       13 Aug 2007 15:56:14 -0000      1.3.2.2
+++ perltidy.info       14 Feb 2008 14:07:18 -0000      1.3.2.3
@@ -1,8 +1,8 @@
 Package: perltidy
-Version: 20070801
+Version: 20071205
 Revision: 1
 Source: mirror:sourceforge:%n/Perl-Tidy-%v.tar.gz
-Source-MD5: 13a5cde87c57f5230148399a0302c9a2
+Source-MD5: d45c12f967308cae59f795172ec8199f 
 UpdatePOD: true
 Type: perl
 DocFiles: BUGS CHANGES COPYING INSTALL MANIFEST README TODO
@@ -15,4 +15,4 @@
 colored HTML output.
 <<
 Homepage: http://perltidy.sourceforge.net/
-Maintainer: Matthew Berginski <[EMAIL PROTECTED]>
+Maintainer: Matthew Berginski <[EMAIL PROTECTED]>

Index: bzr-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/bzr-py.info,v
retrieving revision 1.11.2.6
retrieving revision 1.11.2.7
diff -u -d -r1.11.2.6 -r1.11.2.7
--- bzr-py.info 4 Aug 2007 03:32:56 -0000       1.11.2.6
+++ bzr-py.info 14 Feb 2008 14:07:17 -0000      1.11.2.7
@@ -1,17 +1,17 @@
 Info2: <<
 Package: bzr-py%type_pkg[python]
-Version: 0.18
+Version: 1.1
 Revision: 1
 Conflicts: bzr, bzr-py24-bin
 Replaces: bzr, bzr-py24-bin
 Type: python (2.4 2.5)
 Source: http://www.bazaar-vcs.org/releases/src/bzr-%v.tar.gz
-Source-MD5: c58efdf1967d9f00f8199f30e2fed63f
+Source-MD5: 10e9aed1c63227a5cb12f00b03d4ac37
 Depends: <<
   python%type_pkg[python],
   celementtree-py%type_pkg[python] | elementtree-py%type_pkg[python]
 <<
-BuildDepends: docutils
+BuildDepends: docutils, graphviz
 Recommends: paramiko-py%type_pkg[python]
 
 PatchScript: <<
@@ -20,19 +20,13 @@
 CompileScript: <<
 #!/bin/sh -ev
 python%type_raw[python] setup.py build
-cd doc
-for i in *.txt
-do
-  htmldoc="${i%%txt}htm"
-  echo "Making $htmldoc"
-  rst2html.py "$i" "$htmldoc"
-done
+PYTHONPATH=%p/lib/docutils make PYTHON=python%type_raw[python] docs
 <<
 InstallScript: <<
   python%type_raw[python] setup.py install --prefix %p --root %d
-  mkdir -p %i/share/doc/%n
+  mkdir -p %i/share/doc
+  cp -R doc %i/share/doc/%n
   ln -s %p/share/doc/fink/COPYING %i/share/doc/%n
-  cp doc/*.htm doc/*.css %i/share/doc/%n
 
   mv %i/bin/bzr %i/bin/bzr-py%type_pkg[python]
   mv %i/share/man/man1/bzr.1 %i/share/man/man1/bzr-py%type_pkg[python].1
@@ -46,7 +40,7 @@
     update-alternatives --remove bzr %p/bin/bzr-py%type_pkg[python]
   fi
 <<
-DocFiles: README NEWS TODO bzr.ico doc/README.1st
+DocFiles: README NEWS TODO bzr.ico
 Description: Bazaar distributed SCM
 DescDetail: <<
 An open source distributed version control system that is powerful,

Index: logilab-common-py.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/logilab-common-py.info,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- logilab-common-py.info      4 Aug 2007 03:32:56 -0000       1.1.2.2
+++ logilab-common-py.info      14 Feb 2008 14:07:18 -0000      1.1.2.3
@@ -2,20 +2,22 @@
 
 Package: logilab-common-py%type_pkg[python]
 Type: python (2.5)
-Version: 0.22.2
+Version: 0.26.1
 Revision: 1
 Source: ftp://ftp.logilab.org/pub/common/logilab-common-%v.tar.gz
-Source-MD5: db23b7819fff9f6585cc82b3a9b74a2d
+Source-MD5: 2cdf4f114032b3bc820d516b24dc521d
 Depends: python%type_pkg[python]
 Description: Common functionalities for logilab projects 
 Maintainer: Kurt Schwehr <[EMAIL PROTECTED]>
 Homepage: http://www.logilab.org/projects/common
-DocFiles: 
+DocFiles: PKG-INFO COPYING ChangeLog README DEPENDS
 CompileScript: <<
   echo Skipping Build
 <<
 InstallScript: <<
    %p/bin/python%type_raw[python] setup.py install --root=%d --prefix=%p
+   rm %i/bin/pytest
+   rmdir %i/bin
 <<
 
 LICENSE: GPL

Index: pylint-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/pylint-py.info,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- pylint-py.info      4 Aug 2007 03:32:56 -0000       1.1.2.2
+++ pylint-py.info      14 Feb 2008 14:07:18 -0000      1.1.2.3
@@ -2,10 +2,11 @@
 
 Package: pylint-py%type_pkg[python]
 Type: python (2.5)
-Version: 0.13.2
+Version: 0.14.0
 Revision: 1
-Source: ftp://ftp.logilab.org/pub/pylint/pylint-0.11.0.tar.gz
-Source-MD5: 6c2cd68c49c5a672124c2399b248fb3b
+#Source: ftp://ftp.logilab.org/pub/pylint/pylint-0.11.0.tar.gz
+Source: ftp://ftp.logilab.org/pub/pylint/pylint-%v.tar.gz
+Source-MD5: a6a6a1c68e56506d6fca7569f622767a
 Depends: python%type_pkg[python], astng-py%type_pkg[python]
 Description: Analyzes Python code for bugs and poor quality
 Maintainer: Kurt Schwehr <[EMAIL PROTECTED]>

Index: astng-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/astng-py.info,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- astng-py.info       4 Aug 2007 03:32:56 -0000       1.1.2.2
+++ astng-py.info       14 Feb 2008 14:07:17 -0000      1.1.2.3
@@ -2,10 +2,10 @@
 
 Package: astng-py%type_pkg[python]
 Type: python (2.5)
-Version: 0.17.1
+Version: 0.17.2
 Revision: 1
 Source: ftp://ftp.logilab.fr/pub/astng/logilab-astng-%v.tar.gz
-Source-MD5: 177d70785f0b437b003b92dc80186a9f
+Source-MD5: a654d65a4644fb984d840906cf8b27d5
 Depends: python%type_pkg[python], logilab-common-py%type_pkg[python]
 Description: Python Abstract Syntax Tree New Generation
 Maintainer: Kurt Schwehr <[EMAIL PROTECTED]>

Index: srecord.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/srecord.info,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- srecord.info        15 Jul 2007 15:10:17 -0000      1.1.2.2
+++ srecord.info        14 Feb 2008 14:07:18 -0000      1.1.2.3
@@ -1,14 +1,14 @@
 Info2: <<
 Package: srecord
 
-Version: 1.35
+Version: 1.37
 Revision: 1
 License: GPL
 Description: Set of tools for manipulating EPROM files
 Maintainer: Aleix Conchillo Flaque <[EMAIL PROTECTED]>
 
 Source: mirror:sourceforge:%n/%n-%v.tar.gz
-Source-MD5: 510bc67d9787692c44a92378207d34ef
+Source-MD5: a93248bc8758d090ec74429b397fc01f
 
 ConfigureParams: --mandir=%i/share/man
 

Index: gengetopt.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/gengetopt.info,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- gengetopt.info      3 Nov 2007 20:25:23 -0000       1.1.2.3
+++ gengetopt.info      14 Feb 2008 14:07:18 -0000      1.1.2.4
@@ -1,9 +1,9 @@
 Package: gengetopt
-Version: 2.21
+Version: 2.22
 Revision: 1001
 ###
 Source: gnu
-Source-MD5: f44cc7507a3c069a0374e371efcc69ab
+Source-MD5: 346f35c9e0607733b26dcbba9fbbfa8c
 ###
 GCC: 4.0
 ###

Index: libtool14.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/libtool14.info,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- libtool14.info      19 Jul 2007 22:23:26 -0000      1.2.2.1
+++ libtool14.info      14 Feb 2008 14:07:18 -0000      1.2.2.2
@@ -1,13 +1,13 @@
 Package: libtool14
-Version: 1.5.24
-Revision: 20 
+Version: 1.5.26
+Revision: 1
 Maintainer: Peter O'Gorman <[EMAIL PROTECTED]>
 Depends: %N-shlibs (= %v-%r)
 BuildDependsOnly: true
 Conflicts: libtool, libstroke (<= 0.5.1-2), libstroke-m4
 Replaces: libtool
 Source: mirror:gnu:libtool/libtool-%v.tar.gz
-Source-MD5: d0071c890101fcf4f2be8934a37841b0 
+Source-MD5: aa9c5107f3ec9ef4200eb6556f3b3c29
 ConfigureParams: --program-transform-name=s/libtool/glibtool/ 
--infodir=%p/share/info
 CompileScript: <<
 F77=no ./configure %c
@@ -20,7 +20,7 @@
 SplitOff: <<
   Package: %N-shlibs
   Replaces: libtool14 (<= 1.4.2-4)
-  Files: lib/libltdl.3.1.5.dylib lib/libltdl.3.dylib
+  Files: lib/libltdl.3*.dylib
   Shlibs: %p/lib/libltdl.3.dylib 5.0.0 %n (>= 1.4.2-6)
   Description: Shared libraries for libtool, v1.5
   DocFiles: <<

Index: cmake.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/cmake.info,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -d -r1.3.2.3 -r1.3.2.4
--- cmake.info  17 Oct 2007 17:35:39 -0000      1.3.2.3
+++ cmake.info  14 Feb 2008 14:07:18 -0000      1.3.2.4
@@ -1,8 +1,8 @@
 Package: cmake
-Version: 2.4.7
+Version: 2.4.8
 Revision: 1
 Source: http://www.cmake.org/files/v2.4/%n-%v.tar.gz
-Source-MD5: 4476c423b8f74266136964e42ea88028
+Source-MD5: f5dd061c31765a49dc17ae8bdc986779
 License: BSD
 GCC: 4.0
 BuildDepends: libncurses5 (>= 5.4-20041023-1006)
@@ -12,6 +12,7 @@
  perl -pi -e 's,/sw,%p,g' Modules/*cmake Modules/Platform/Darwin.cmake
 <<
 CompileScript: <<
+#!/bin/sh -ev
 ./bootstrap --prefix=%p --docdir=/share/doc/%n --mandir=/share/man
  make
  make
@@ -38,3 +39,4 @@
 <<
 Maintainer: Martin Costabel <[EMAIL PROTECTED]>
 Homepage: http://www.cmake.org
+

Index: epydoc-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/epydoc-py.info,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -d -r1.3.2.2 -r1.3.2.3
--- epydoc-py.info      27 Feb 2007 22:50:45 -0000      1.3.2.2
+++ epydoc-py.info      14 Feb 2008 14:07:18 -0000      1.3.2.3
@@ -1,8 +1,13 @@
 Info2: <<
 
 Package: epydoc-py%type_pkg[python]
-Version: 3.0beta1
+Version: 3.0.1
 Revision: 2
+
+Conflicts: epydoc-py25-bin, epydoc-py24-bin
+Replaces: epydoc-py25-bin, epydoc-py24-bin
+
+
 Description: Python documentation system
 DescDetail: <<
 Epydoc is a tool for generating API documentation for Python modules,
@@ -19,8 +24,8 @@
   pydoc.
 <<
 Source: mirror:sourceforge:epydoc/epydoc-%v.tar.gz
-Source-MD5: 2432c69c6efc390b0a50741494898d73
-Type: python (2.4 2.5)
+Source-MD5: cdd6f6c76dd8bab5e653a343a0544294
+Type: python (2.5)
 Depends: python%type_pkg[python]
 CompileScript: <<
  #!/bin/bash -ev
@@ -37,19 +42,26 @@
 Homepage: http://epydoc.sourceforge.net/
 Maintainer: Kurt Schwehr <[EMAIL PROTECTED]>
 
-SplitOff: <<
-  Description: Python documentation system - Main binary
-  Package: %N-bin
-  Depends: %N (= %v-%r)
-  Conflicts: epydoc-py25-bin, epydoc-py24-bin
-  Replaces: epydoc-py25, epydoc-py24-bin
-  InstallScript: <<
-    mkdir %i/bin
-    ln -s epydoc-py%type_pkg[python] %i/bin/epydoc
-    ln -s epydocgui-py%type_pkg[python] %i/bin/epydocgui
-    ln -s apirst2html-py%type_pkg[python] %i/bin/apirst2html.py
-  <<
-  DocFiles: README.txt LICENSE.txt
+PostInstScript: <<
+  update-alternatives --install %p/bin/epydoc         epydoc         
%p/bin/epydoc-py%type_raw[python]   %type_pkg[python] 
+  update-alternatives --install %p/bin/epydocgui      epydocgui      
%p/bin/epydocgui%type_raw[python]   %type_pkg[python] 
+  update-alternatives --install %p/bin/apirst2html.py apirst2html.py 
%p/bin/apirst2html%type_raw[python] %type_pkg[python]
+  echo ""
+  echo "The scripts 'epydoc', 'epydocgui', and 'apirst2html.py' "
+  echo "installed in %p/bin/ and %p/lib/cgi-bin"
+  echo "are symlinks automatically updated by the update-alternatives utility."
+  echo "If you install multiple flavours of the featureserver package, the 
symlinks"
+  echo "will point to the higher flavour by default."
+<<
+# Why does this leave symbolic links in %p/bin ???
+# Should this be calling remove-all instead of remove?
+PreRmScript: <<
+  if [ $1 != "upgrade" ]; then
+    echo "Calling update-alternatives --remove"
+    update-alternatives --remove epydoc         
%p/bin/epydoc-py%type_raw[python]
+    update-alternatives --remove epydocgui      
%p/bin/epydoc-py%type_raw[python]
+    update-alternatives --remove apirst2html.py %p/bin/%type_raw[python]
+  fi
 <<
 
 


-------------------------------------------------------------------------
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
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to