Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv15395
Modified Files:
Tag: pangocairo-branch
dblatex.info docbook-utils.info docutils.info ghostscript.info
scribus-aqua.info scribus.info tetex-texmf.info texinfo.info
Added Files:
Tag: pangocairo-branch
docutils-py.info swish-e.info texinfo.patch
Log Message:
sync with HEAD (pangocairo-root-40)
Index: scribus.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/scribus.info,v
retrieving revision 1.10.2.7
retrieving revision 1.10.2.8
diff -u -d -r1.10.2.7 -r1.10.2.8
--- scribus.info 11 Dec 2007 17:36:14 -0000 1.10.2.7
+++ scribus.info 19 Jan 2008 18:33:56 -0000 1.10.2.8
@@ -1,12 +1,9 @@
Package: scribus
-Version: 1.3.3.9
-Revision: 1003
+Version: 1.3.3.10
+Revision: 1001
GCC: 4.0
Source: mirror:sourceforge:%n/%n-%v.tar.bz2
-#Source-MD5: 137941773eaa6975393c1aa97236e1e8
-# upstream released this tarball twice with different MD5s
-Source-MD5: a3d7af62d99d4e0f7485ae549de50df0
-SourceRename: scribus-%v_20070509.tar.bz2
+Source-MD5: a39de265be245f8dcc6815147c6c1feb
SourceDirectory: scribus-%v
License: GPL
Conflicts: scribus12, scribus-i18n-en, scribus-scripting, scribus134
--- NEW FILE: docutils-py.info ---
Info2: <<
Package: docutils-py%type_pkg[python]
Type: python (2.3 2.4 2.5)
Version: 0.4
Revision: 3
Source: mirror:sourceforge:docutils/docutils-%v.tar.gz
Source-MD5: 0fe7b42bb3c2aa3680fe30f9a5fbf712
Depends: python%type_pkg[python]
Conflicts: docutils (<= 0.4-2)
Replaces: docutils (<= 0.4-2)
Provides: docutils
CompileScript: <<
/usr/bin/python setup.py build
<<
InstallScript: <<
#!/bin/sh -ev
%p/bin/python%type_raw[python] setup.py install --root %d
for i in *.txt ; do
htmldoc=${i%%txt}html
echo "Making $htmldoc"
PYTHONPATH=.:extras tools/rst2html.py $i $htmldoc
done
cd docs
for i in `find . -name '*.txt'` ; do
destdir="%i/share/doc/%n/html/"${i%%/*}
htmldoc=${i%%txt}html
echo "Making $htmldoc"
PYTHONPATH=..:../extras ../tools/rst2html.py $i $htmldoc
mkdir -p "$destdir"
cp $htmldoc $destdir
done
cd %i/bin
for i in rst2*; do
mv $i ${i%%.py}-%type_raw[python].py
done
<<
PostInstScript: <<
for i in rst2html rst2latex rst2newlatex rst2pseudoxml rst2s5 rst2xml; do
# link name path (source)
priority
update-alternatives --install %p/bin/$i $i
%p/bin/$i-%type_raw[python].py %type_pkg[python] \
--slave %p/bin/$i.py $i-py
%p/bin/$i-%type_raw[python].py
done
<<
PreRmScript: <<
if [ $1 != "upgrade" ]; then
for i in rst2html rst2latex rst2newlatex rst2pseudoxml rst2s5 rst2xml; do
update-alternatives --remove-all $i
update-alternatives --remove-all $i-py
done
fi
<<
DocFiles: README.html BUGS.html COPYING.html HISTORY.html FAQ.html THANKS.html
Description: Python-approved WYSIWYG text markup toolkit
DescDetail: <<
Docutils is an open-source text processing system for processing
plaintext documentation into useful formats, such as HTML or LaTeX. It
includes reStructuredText, the easy to read, easy to use,
what-you-see-is-what-you-get plaintext markup language.
<<
License: GPL
Homepage: http://docutils.sourceforge.net/
#Maintainer: Brendan Cully <[EMAIL PROTECTED]>
Maintainer: Charles Lepple <[EMAIL PROTECTED]>
# closes Info2:
<<
--- NEW FILE: swish-e.info ---
Package: swish-e
Version: 2.4.5
Revision: 3
BuildDepends: pkgconfig, libxml2
#Depends: libxml2 # you're not allowed to Depend on libxml2
ConfigureParams: CPPFLAGS='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
Source: http://swish-e.org/distribution/swish-e-%v.tar.gz
Source-md5: feae5ca1f5f4352190156b54a19c0153
UpdateConfigGuess: true
DocFiles: COPYING INSTALL README* TODO
SplitOff: <<
Package: %N2-shlibs
Files: lib/libswish-e.*.dylib
Shlibs: %p/lib/libswish-e.2.dylib 3.0.0 %n (>= 2.4.5-2)
DocFiles:
Suggests: %N
<<
SplitOff2: <<
Package: %N2-dev
Depends: %N2-shlibs (= %v-%r)
BuildDependsOnly: true
Files: include lib/libswish-e* lib/pkgconfig
DocFiles:
<<
License: GPL
Description: Simple Web Indexing Sys. for Humans, Enhanced
#DescPort:
Maintainer: Josh Rabinowitz <[EMAIL PROTECTED]>
Homepage: http://swish-e.org/
Index: texinfo.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/texinfo.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
--- texinfo.info 11 Dec 2007 17:36:14 -0000 1.3.2.3
+++ texinfo.info 19 Jan 2008 18:33:57 -0000 1.3.2.4
@@ -1,12 +1,16 @@
Package: texinfo
-Version: 4.8a
-Revision: 1003
+Version: 4.11
+Revision: 1001
Source: gnu
-Source-MD5: 6611b6f95a5f133aa52889be93bfbf31
-SourceDirectory: %n-4.8
+Source-MD5: 0c652adddc75b385ee1509fc55ff2837
+SourceDirectory: %n-4.11
BuildDepends: libiconv-dev, libncurses5 (>= 5.4-20041023-1006),
libgettext3-dev, gettext-tools
Depends: ncurses (>= 5.4-20041023-1006), libncurses5-shlibs (>=
5.4-20041023-1006), libgettext3-shlibs, libiconv
Replaces: tetex-base (<< 3.0-1)
+PatchScript: <<
+chmod a+x build-aux/install-sh
+<<
+Patch: %n.patch
ConfigureParams: --mandir=%p/share/man --infodir=%p/share/info
CompileScript: <<
./configure %c
Index: docutils.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/docutils.info,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- docutils.info 14 Mar 2006 01:48:52 -0000 1.4
+++ docutils.info 19 Jan 2008 18:33:55 -0000 1.4.2.1
@@ -1,50 +1,20 @@
-Info2: <<
Package: docutils
+Type: bundle
Version: 0.4
-Revision: 2
-Source: mirror:sourceforge:%n/%n-%v.tar.gz
-Source-MD5: 0fe7b42bb3c2aa3680fe30f9a5fbf712
-PatchScript: <<
-#!/bin/sh -ev
-for script in tools/rst2*.py
-do
- sed -i.bak -e 's,^from docutils,import sys\
-sys.path.append('\''%p/lib/%n'\'')\
-&,' $script
-done
-<<
-CompileScript: <<
- /usr/bin/python setup.py build
-<<
-InstallScript: <<
-#!/bin/sh -ev
-/usr/bin/python setup.py install --prefix %p --root %d --install-lib %p/lib/%n
--install-data %p/lib/%n
-for i in *.txt
-do
- htmldoc=${i%%txt}html
- echo "Making $htmldoc"
- PYTHONPATH=.:extras tools/rst2html.py $i $htmldoc
-done
-cd docs
-for i in `find . -name '*.txt'`
-do
- destdir="%i/share/doc/%n/html/"${i%%/*}
- htmldoc=${i%%txt}html
- echo "Making $htmldoc"
- PYTHONPATH=..:../extras ../tools/rst2html.py $i $htmldoc
- mkdir -p "$destdir"
- cp $htmldoc $destdir
-done
-<<
-DocFiles: README.html BUGS.html COPYING.html HISTORY.html FAQ.html THANKS.html
+Revision: 3
+Depends: docutils-py25 | docutils-py24 | docutils-py23, fink-obsolete-packages
+
Description: Python-approved WYSIWYG text markup toolkit
DescDetail: <<
Docutils is an open-source text processing system for processing
plaintext documentation into useful formats, such as HTML or LaTeX. It
includes reStructuredText, the easy to read, easy to use,
what-you-see-is-what-you-get plaintext markup language.
+
+This placeholder package depends on the versioned package which holds the
+actual docutils code.
<<
+
License: GPL
Homepage: http://docutils.sourceforge.net/
-Maintainer: Brendan Cully <[EMAIL PROTECTED]>
-<<
+Maintainer: Charles Lepple <[EMAIL PROTECTED]>
Index: tetex-texmf.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/tetex-texmf.info,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- tetex-texmf.info 5 Sep 2006 04:42:21 -0000 1.2
+++ tetex-texmf.info 19 Jan 2008 18:33:57 -0000 1.2.2.1
@@ -5,10 +5,10 @@
Conflicts: tetex (<= 1.0-13), carlisle, natbib, revtex, seminar
Replaces: tetex (<= 1.0-13), tetex-base (<= 2.0-5), carlisle, context,
dvipdfm, epstopdf, hyperref, natbib, oberdiek, revtex, seminar
Provides: carlisle, hyperref, natbib, oberdiek, revtex, seminar
-Source:
ftp://cam.ctan.org/tex-archive/systems/unix/teTeX/3.0/distrib/tetex-texmf-%v.tar.gz
+Source:
ftp://cam.ctan.org/tex-archive/systems/unix/teTeX/%v/distrib/%n-%v.tar.gz
Source-MD5: 11aa15c8d3e28ee7815e0d5fcdf43fd4
NoSourceDirectory: True
-Source2:
ftp://cam.ctan.org/tex-archive/systems/unix/teTeX/3.0/distrib/tetex-texmfsrc-%v.tar.gz
+Source2:
ftp://cam.ctan.org/tex-archive/systems/unix/teTeX/%v/distrib/tetex-texmfsrc-%v.tar.gz
Source2-MD5: 66c32a11964a49982ba2a32d3bbfe7f5
CompileScript: echo "Nothing to do ..."
InstallScript: <<
--- NEW FILE: texinfo.patch ---
diff -ru texinfo-4.11-orig/makeinfo/cmds.c texinfo-4.11/makeinfo/cmds.c
--- texinfo-4.11-orig/makeinfo/cmds.c 2008-01-08 04:58:26.000000000 +0100
+++ texinfo-4.11/makeinfo/cmds.c 2008-01-08 05:01:06.000000000 +0100
@@ -1638,9 +1638,10 @@
if (!no_headers && !html)
{
kill_self_indent (-1); /* make sure there's no indentation */
- insert_string ("INFO-DIR-SECTION ");
- insert_string (line);
- insert ('\n');
+ cm_noindent (); /* make sure again */
+ add_word ("INFO-DIR-SECTION ");
+ add_word (line);
+ add_char ('\n');
}
free (line);
Only in texinfo-4.11/makeinfo: cmds.c~
Index: docbook-utils.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/docbook-utils.info,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -d -r1.7 -r1.7.2.1
--- docbook-utils.info 5 Sep 2006 04:42:20 -0000 1.7
+++ docbook-utils.info 19 Jan 2008 18:33:55 -0000 1.7.2.1
@@ -10,9 +10,10 @@
perl -pi.bak -e 's,nsgmls,onsgmls,g' backends/{man,texi}.in doc/refentry/*
doc/man/Makefile.am helpers/docbook2man-spec.pl configure.in bin/sgmldiff.in
perl -pi.bak -e 's,/usr/bin,%p/bin,g; s,/usr/share,%p/share,g' backends/txt
doc/refentry/{{back,front}end-spec,jw}.sgml
perl -pi.bak -e 's,/etc,%p/etc,g' doc/man/Makefile.am bin/jw.in
doc/refentry/{frontend-spec,jw}.sgml doc/HTML/Makefile.am
- autoconf
+ perl -pi.bak2 -e 's/(AC_DEFUN\()([^[]+)(,)/\1\[\2]\3/' configure.in
+ autoreconf
<<
-BuildDepends: autoconf (>= 2.60-1), automake1.8
+BuildDepends: autoconf (>= 2.60-1), automake1.9
Depends: opensp4 (>= 1.5.1-1002), openjade (>= 1.3.2-1028), docbook-dtd,
docbook-dsssl-nwalsh, jadetex, sgmls-pm, lynx-ssl | lynx | links-ssl | links |
w3m-ssl (>= 0.5.1-1003) | w3m (>= 0.5.1-1003) | elinks | elinks-ssl
ConfigureParams: --mandir='${prefix}/share/man'
InstallScript: <<
Index: dblatex.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/dblatex.info,v
retrieving revision 1.4.2.6
retrieving revision 1.4.2.7
diff -u -d -r1.4.2.6 -r1.4.2.7
--- dblatex.info 19 Jul 2007 22:23:33 -0000 1.4.2.6
+++ dblatex.info 19 Jan 2008 18:33:55 -0000 1.4.2.7
@@ -15,19 +15,19 @@
# maintainership of) the affected package.
Package: dblatex
-Version: 0.2.6
+Version: 0.2.8
Revision: 1
Maintainer: Max Horn <[EMAIL PROTECTED]>
Depends: <<
- python24 (>= 1:2.4.3-1001),
+ python25 (>= 1:2.4.3-1001),
libxslt-bin,
docbook-dtd (>= 4.1.2),
tetex-base
<<
Source: mirror:sourceforge:%n/%n-%v.tar.bz2
-Source-MD5: 13138b13f81dd47f87558f038e7ea987
-CompileScript: %p/bin/python2.4 setup.py build
-InstallScript: %p/bin/python2.4 setup.py install --root=%d --use-python-path
+Source-MD5: 1bb57c3d63cd5ff7e02d4cd2cb53960f
+CompileScript: %p/bin/python2.5 setup.py build
+InstallScript: %p/bin/python2.5 setup.py install --root=%d --use-python-path
DocFiles: COPYRIGHT
Description: DocBook to LaTeX/ConTeXt Publishing
License: GPL
Index: scribus-aqua.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/scribus-aqua.info,v
retrieving revision 1.11.2.9
retrieving revision 1.11.2.10
diff -u -d -r1.11.2.9 -r1.11.2.10
--- scribus-aqua.info 11 Dec 2007 17:36:14 -0000 1.11.2.9
+++ scribus-aqua.info 19 Jan 2008 18:33:56 -0000 1.11.2.10
@@ -1,14 +1,11 @@
Package: scribus-aqua
-Version: 1.3.3.9
-Revision: 2
+Version: 1.3.3.10
+Revision: 1
Source: mirror:sourceforge:scribus/scribus-%v.tar.bz2
-#Source-MD5: 137941773eaa6975393c1aa97236e1e8
-# upstream released this tarball twice with different MD5s
-Source-MD5: a3d7af62d99d4e0f7485ae549de50df0
-SourceRename: scribus-%v_20070509.tar.bz2
+Source-MD5: a39de265be245f8dcc6815147c6c1feb
SourceDirectory: scribus-%v
-#Source2: http://perso.wanadoo.fr/costabel/Scribusapp-skeleton.tar.bz2
-#Source2-MD5: 7aa33546b4113007bdc0e3fef94a0f81
+Source2: http://perso.wanadoo.fr/costabel/Scribusapp-skeleton.tar.bz2
+Source2-MD5: 7aa33546b4113007bdc0e3fef94a0f81
License: GPL
GCC: 4.0
Recommends: x-ghostscript-fonts, msttcorefonts, applesystemfonts
@@ -52,15 +49,20 @@
<<
InstallScript: <<
#!/bin/sh -ex
- tar zxf Scribus.app.tgz
+# This version has no Scribus.app skeleton, so we take the one from cvs
+# tar zxf Scribus.app.tgz
mkdir -p %i/Applications
- mv Scribus.app %i/Applications/
+# mv Scribus.app %i/Applications/
+ /bin/cp -p -R ../Scribus.app %i/Applications/
+ mkdir %i/Applications/Scribus.app/Contents/MacOS
+ ln -s ../bin/scribus %i/Applications/Scribus.app/Contents/MacOS/Scribus
+#
cd build
make install DESTDIR=%d
/bin/cp /System/Library/ColorSync/Profiles/* %i/lib/scribus/profiles/ ||
/usr/bin/true
mv %i/{bin,lib,share} %i/Applications/Scribus.app/Contents/
<<
-DocFiles: AUTHORS COPYING ChangeLog README ChangeLogCVS
+DocFiles: AUTHORS COPYING ChangeLog README ChangeLogSVN
PostInstScript: <<
if ! test -e /Applications/Fink; then /usr/bin/install -d -m 755
/Applications/Fink; fi
ln -nfs %p/Applications/Scribus.app /Applications/Fink/
Index: ghostscript.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/ghostscript.info,v
retrieving revision 1.7.2.3
retrieving revision 1.7.2.4
diff -u -d -r1.7.2.3 -r1.7.2.4
--- ghostscript.info 18 Sep 2007 00:27:42 -0000 1.7.2.3
+++ ghostscript.info 19 Jan 2008 18:33:56 -0000 1.7.2.4
@@ -1,21 +1,22 @@
Package: ghostscript
-Version: 8.60
-Revision: 1
+Version: 8.61
+Revision: 3
Description: Interpreter for PostScript and PDF
Source: mirror:sourceforge:%n/%n-%v.tar.gz
-Source-MD5: ce7c276891411e0865e006f0310ea1ec
-Depends: x11, x11-shlibs, ghostscript-fonts
-BuildDepends: x11-dev
+Source-MD5: aa55ca90b891c1b3b7402a09a2146a87
+Depends: x11, x11-shlibs, ghostscript-fonts, libiconv
+BuildDepends: x11-dev, libiconv-dev
Conflicts: ghostscript-nox, ghostscript6, ghostscript6-nox, system-ghostscript8
Replaces: ghostscript-nox, ghostscript6, ghostscript6-nox, system-ghostscript8
-License: GPL
+#License: GPL
+License: Restrictive/Distributable
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
SetLIBRARY_PATH: %p/lib
-ConfigureParams: --mandir='${prefix}/share/man'
+ConfigureParams: --mandir=%p/share/man
CompileScript: <<
#!/bin/sh -ev
export CPATH=%p/include:/usr/X11R6/include
@@ -23,8 +24,11 @@
make CFLAGS_STANDARD="-O2"
<<
InstallScript: <<
- make install install-doc prefix=%i
+ make install install-doc DESTDIR=%d
+ mkdir -p %i/share/doc
+ ln -s %p/share/ghostscript/%v %i/share/doc/html
<<
+DocFiles: LICENSE
DescPackaging: <<
The LIBRARY_PATH and CPATH lines above can apparently be removed w/o changing
the deb.
Left as "documentatation", or as a safeguard for future versions.
-------------------------------------------------------------------------
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
