Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/text
In directory vz-cvs-3.sog:/tmp/cvs-serv17880/stable/main/finkinfo/text
Modified Files:
scribus-aqua.info scribus.info
Added Files:
scribus-x11.info scribus135-aqua.info scribus135.info
Removed Files:
scribus.patch
Log Message:
Refactoring the scribus packages in view of the imminent release of the new
stable version 1.4.0.
Dumping everything into stable, removing from unstable. Crossing fingers.
--- NEW FILE: scribus135.info ---
Package: scribus135
Type: bundle
Version: 1.4.0
Revision: 1
Epoch: 1
Depends: scribus-x11, fink-obsolete-packages
Description: OBSOLETE, use package 'scribus-x11' instead
Maintainer: Martin Costabel <[email protected]>
Homepage: http://www.scribus.net/
Index: scribus.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/text/scribus.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- scribus.info 26 Aug 2009 07:14:22 -0000 1.11
+++ scribus.info 22 Oct 2011 15:12:53 -0000 1.12
@@ -1,97 +1,20 @@
Package: scribus
-Version: 1.3.3.12
-Revision: 2
-Distribution: 10.4, 10.5
-GCC: 4.0
-Source: mirror:sourceforge:%n/%n-%v.tar.bz2
-Source-MD5: 48f6d762809ad714b366d8d4fc82d5c3
-SourceDirectory: scribus-%v
+Type: nosource
+Version: 1.4.0
+Revision: 1
+Epoch: 1
License: GPL
-Conflicts: scribus12, scribus-i18n-en, scribus-scripting, scribus134
-Replaces: scribus12, scribus-i18n-en, scribus-scripting, scribus134
-Recommends: x-ghostscript-fonts, msttcorefonts, applesystemfonts
-Depends: x11, ghostscript, qt3-shlibs (>= 3.3.5-1023), libjpeg-shlibs,
libjpeg-bin, lcms-shlibs, libart2-shlibs, libpng3-shlibs, libtiff-shlibs,
freetype219-shlibs, libxml2-shlibs, libiconv, python25, pil-py25
-BuildDepends: fink (>= 0.24.12), x11-dev, lcms, libjpeg, qt3 (>= 3.3.5-1023),
libart2, cups-dev, libpng3, libtiff, freetype219, libxml2, libiconv-dev, cmake
(>= 2.6.0-1)
-SetLDFLAGS: -dylib_file
/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
-PatchFile: %n.patch
-PatchFile-MD5: a0c9dadc5b4651f8fcb59601903ebe73
-PatchScript: <<
-#!/bin/sh -ev
-# Try to make cmake find Fink's freetype219. Needs quite some coaxing..
- patch -p1 < %{PatchFile}
- rm cmake/modules/FREETYPEConfig.cmake
-# Also don't build an app bundle in this version. We are using X11 here.
- perl -pi.bak -e 's|(BUILD_MAC_BUNDLE) 1|\1 0|g;' CMakeLists.txt
-<<
-CompileScript: <<
-#!/bin/sh -ev
- export PATH=%p/lib/freetype219/bin:$PATH
- mkdir build
- cd build
- cmake --debug-output -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
- -DCMAKE_INSTALL_PREFIX:PATH=%p \
- -DFREETYPE_DIR:PATH=%p/lib/freetype219 \
- -DFREETYPE_INCLUDE_DIR_ft2build:PATH=%p/lib/freetype219/include \
-
-DFREETYPE_INCLUDE_DIR_freetype2:PATH=%p/lib/freetype219/include/freetype2 \
- -DFREETYPE_LIBRARY:FILEPATH=%p/lib/freetype219/lib/libfreetype.dylib \
- -DBUILD_MAC_BUNDLE:BOOL=0 \
-
-DPYTHON_DEBUG_LIBRARY:FILEPATH=%p/lib/python2.5/config/libpython2.5.dylib \
- -DPYTHON_INCLUDE_PATH:PATH=%p/include/python2.5 \
- -DPYTHON_LIBRARY:FILEPATH=%p/lib/python2.5/config/libpython2.5.dylib \
- ..
- make
-<<
+Depends: scribus-x11, fink-obsolete-packages
+CompileScript: echo "none needed"
InstallScript: <<
#!/bin/sh -ev
- cd build
- make install DESTDIR=%d
- /bin/cp /System/Library/ColorSync/Profiles/* %i/lib/scribus/profiles/ ||
/usr/bin/true
-<<
-DocFiles: AUTHORS COPYING ChangeLog README
-Description: Layout program (stable branch 1.3.3.x)
-DescDetail: <<
- Scribus is an open-source program that brings professional
- page layout to Linux/Unix, MacOS X, OS/2 and Windows desktops
- with a combination of "press-ready" output and new approaches
- to page layout.
-
- Underneath the modern and user friendly interface, Scribus
- supports professional publishing features, such as CMYK color,
- separations, ICC color management and versatile PDF creation.
-<<
-DescUsage: <<
- This version contains extensive online help.
- Additional up-to-date documentation is on the Scribus web site.
-
- Fonts: By default, the X11 Type1 fonts are recognized. If you
- want more fonts, you can do one or more of the following:
- - Install the x-ghostscript-fonts or msttcorefonts or xfonts-intl
- or applesystemfont packages.
- (The gimp-sharefonts and similar packages work, too,
- but these fonts are of rather bad quality)
- - Put lines like
- /Library/Fonts
- /System/Library/Fonts
- into your ~/.scribus/scribusfont13.rc file (create it if it doesn't exist)
- This will give you many (not all) of the Apple system fonts.
- If you use FontBook to create your own collections, put also
- ~/Library/Fonts
- into this file.
-
- Note that scribus-1.2.x, scribus-1.3.3.x and scribus-1.3.4 all
- use incompatible file formats.
- So be careful when switching between these versions.
-<<
-DescPackaging: <<
- The default profiles folder is now populated with a minimal set
- of color profiles from /System/Library/ColorSync/Profiles/
- so that color management can be activated.
+ install -d -m 755 %i/share/doc/installed-packages
+ touch %i/share/doc/installed-packages/%n
<<
-DescPort: <<
- The CMake find mechanisms for freetype and for python
- have to be overridden in order to find Fink's
- freetype219 and python2.5
+Description: Dummy upgrade to new "scribus-x11" package
+DescDetail: <<
+The stable "scribus" package is now called "scribus-x11".
+Once you have installed "scribus-x11", you can uninstall this package.
<<
Maintainer: Martin Costabel <[email protected]>
Homepage: http://www.scribus.net/
-
--- NEW FILE: scribus-x11.info ---
Package: scribus-x11
Version: 1.4.0
Revision: 1.rc6
Epoch: 1
Source: mirror:sourceforge:scribus/scribus-%v.rc6.tar.bz2
Source-MD5: 8b3b1da78b1f4ac05f2ebee247724d64
License: GPL
Recommends: x-ghostscript-fonts, msttcorefonts, applesystemfonts
Depends: <<
x11,
ghostscript,
glib2-shlibs,
qt4-base-x11-qtcore-shlibs,
qt4-base-x11-qtgui-shlibs,
qt4-base-x11-qtnetwork-shlibs,
qt4-base-x11-qtsql-shlibs,
qt4-base-x11-qtxml-shlibs,
libjpeg8-shlibs,
libjpeg-bin,
lcms-shlibs,
cairo-shlibs,
libpng15-shlibs,
libtiff-shlibs,
freetype219-shlibs,
libxml2-shlibs,
libiconv,
fontconfig2-shlibs,
podofo-shlibs,
python26, python26-shlibs,
pil-py26
<<
BuildDepends: <<
x11-dev,
glib2-dev,
lcms,
libjpeg8,
qt4-base-x11,
cairo,
cups-dev,
libpng15,
libtiff,
freetype219,
libxml2,
libiconv-dev,
fontconfig2-dev,
expat1,
cmake,
podofo-dev,
boost1.35.systempython,
glitz
<<
BuildConflicts: qt3
Conflicts: scribus (<< 1.4.0-1), scribus134, scribus135
Replaces: scribus, scribus134, scribus135
PatchScript: <<
#!/bin/sh -ev
# Place all source tree include dirs before %p/include
perl -pi -e
's|\$\{CMAKE_BINARY_DIR\}/scribus|$&\n\$\{CMAKE_SOURCE_DIR\}/scribus|g'
CMakeLists.txt
# improve finding of PIL in the FontSample script
perl -pi -e 's|import Image|from PIL $&|g'
scribus/plugins/scriptplugin/scripts/FontSample.py
# qt4-x11 seems not to define Q_OS_MAC, which is bad
perl -pi -e 's,#if.*Q_OS_MAC.*,#if ( defined(Q_OS_MAC) ||
defined(Q_OS_DARWIN)),' scribus/scclocale.h
<<
CompileScript: <<
#!/bin/sh -ex
# Use Fink's freetype219, qt4-x11, python26
export PATH=%p/lib/freetype219/bin:$PATH
unset QMAKESPEC
export QTDIR=%p/lib/qt4-x11
mkdir build
cd build
cmake --debug-output -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-DCMAKE_INSTALL_PREFIX:PATH=%p/ \
-DFREETYPE_DIR:PATH=%p/lib/freetype219 \
-DFREETYPE_INCLUDE_DIR_ft2build:PATH=%p/lib/freetype219/include \
-DFREETYPE_INCLUDE_DIR_freetype2:PATH=%p/lib/freetype219/include/freetype2 \
-DFREETYPE_LIBRARY:FILEPATH=%p/lib/freetype219/lib/libfreetype.dylib \
-DBUILD_OSX_BUNDLE:BOOL=0 \
-DPYTHON_DEBUG_LIBRARY:FILEPATH=%p/lib/python2.6/config/libpython2.6.dylib \
-DPYTHON_INCLUDE_PATH:PATH=%p/include/python2.6 \
-DPYTHON_LIBRARY:FILEPATH=%p/lib/python2.6/config/libpython2.6.dylib \
..
make
<<
InstallScript: <<
#!/bin/sh -ex
cd build
make install DESTDIR=%d
/bin/cp /System/Library/ColorSync/Profiles/* %i/lib/scribus/profiles/ ||
/usr/bin/true
<<
DocFiles: AUTHORS COPYING ChangeLog ChangeLogCVS ChangeLogSVN PACKAGING README
TRANSLATION
Description: Layout program (stable branch)
DescDetail: <<
Scribus is an open-source program that brings professional
page layout to Linux/Unix, MacOS X, OS/2 and Windows desktops
with a combination of "press-ready" output and new approaches
to page layout.
Underneath the modern and user friendly interface, Scribus
supports professional publishing features, such as CMYK color,
separations, ICC color management and versatile PDF creation.
Version 1.4.0 is the new stable release,
currently at release candidate 6.
<<
DescUsage: <<
This version contains extensive online help.
Additional up-to-date documentation is on the Scribus web site.
Fonts: By default, the X11 Type1 fonts are recognized. If you
want more fonts, you can do one or more of the following:
- Install the x-ghostscript-fonts or msttcorefonts or xfonts-intl
or applesystemfont packages.
(The gimp-sharefonts and similar packages work, too,
but these fonts are of rather bad quality)
- Put lines like
/Library/Fonts
/System/Library/Fonts
/sw/lib/X11/fonts/applettf
/sw/lib/X11/fonts/msttf
into your ~/.scribus/scribusfont135.rc file (create it if it doesn't exist)
This will give you many (not all) of the Apple system fonts.
If you use FontBook to create your own collections, put also
~/Library/Fonts
into this file.
<<
DescPackaging: <<
The new version 1.4.0 replaces both the old stable version 1.3.3.4 and the 135
development branch. The package names are now scribus-x11 and scribus-aqua,
like variants, but they have separate info files, because there are too many
differences.
The new development branch is 1.5.0, and I may consider packaging it in
a future scribus-ng or scribus-devel package, if they start releasing tarballs.
<<
Maintainer: Martin Costabel <[email protected]>
Homepage: http://www.scribus.net/
--- scribus.patch DELETED ---
Index: scribus-aqua.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/text/scribus-aqua.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- scribus-aqua.info 27 Aug 2009 08:51:24 -0000 1.8
+++ scribus-aqua.info 22 Oct 2011 15:12:53 -0000 1.9
@@ -1,76 +1,68 @@
Package: scribus-aqua
-Version: 1.3.3.12
-Revision: 3
-Distribution: 10.4, 10.5
-Source: mirror:sourceforge:scribus/scribus-%v.tar.bz2
-Source-MD5: 48f6d762809ad714b366d8d4fc82d5c3
-SourceDirectory: scribus-%v
-Source2: http://perso.wanadoo.fr/costabel/Scribusapp-skeleton.tar.bz2
-Source2-MD5: 7aa33546b4113007bdc0e3fef94a0f81
+Version: 1.4.0
+Revision: 1.rc6
+Epoch: 1
+Source: mirror:sourceforge:scribus/scribus-%v.rc6.tar.bz2
+Source-MD5: 8b3b1da78b1f4ac05f2ebee247724d64
License: GPL
-GCC: 4.0
Recommends: x-ghostscript-fonts, msttcorefonts, applesystemfonts
-Depends: ghostscript, qt3mac-shlibs (>= 3.3.5-13), qt3mac-apps (>= 3.3.5-13),
libjpeg-shlibs, libjpeg-bin, lcms-shlibs, libart2-shlibs, libpng3-shlibs,
libtiff-shlibs, freetype219-shlibs, libxml2-shlibs, libiconv, fontconfig2-shlibs
-BuildDepends: fink (>= 0.24.12), lcms, libjpeg, qt3mac (>= 3.3.5-13), libart2,
cups-dev, libpng3, libtiff, freetype219, libxml2, libiconv-dev,
fontconfig2-dev, expat1, cmake (>= 2.6.0-1)
+Depends: ghostscript, qt4-base-mac-qtcore-shlibs, qt4-base-mac-qtgui-shlibs,
libjpeg8-shlibs, libjpeg-bin, lcms-shlibs, cairo-shlibs, libpng14-shlibs,
libtiff-shlibs, freetype219-shlibs, libxml2-shlibs, libiconv,
fontconfig2-shlibs, podofo-shlibs
+BuildDepends: fink (>= 0.24.12), lcms, libjpeg8, qt4-base-mac, cairo,
cups-dev, libpng14, libtiff, freetype219, libxml2, libiconv-dev,
fontconfig2-dev, expat1, cmake, podofo-dev, boost1.35.systempython, glitz
BuildConflicts: qt3, qt3-dev
-Conflicts: scribus134-aqua
-Replaces: scribus134-aqua
-SetLDFLAGS: -dylib_file
/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
-PatchFile: scribus.patch
-PatchFile-MD5: a0c9dadc5b4651f8fcb59601903ebe73
+Conflicts: scribus135-aqua (<<1.4.0-1)
+Replaces: scribus135-aqua
PatchScript: <<
#!/bin/sh -ev
-#don't build pixbuf stuff that wants to pull in X11
- perl -pi.bak -e 's|^.*pixbuf.*$||g; s|^.*PIXBUF.*$||g' scribus/CMakeLists.txt
-# Use Fink's freetype219
-# and place all source tree include dirs before %p/include
-# with cmake-2.6.0 this gets too messy to do with a patch script, we need a
patch file now
- patch -p1 < %{PatchFile}
+# Place all source tree include dirs before %p/include
+ perl -pi -e
's|\$\{CMAKE_BINARY_DIR\}/scribus|$&\n\$\{CMAKE_SOURCE_DIR\}/scribus|g'
CMakeLists.txt
+# improve finding of PIL in the FontSample script
+ perl -pi -e 's|import Image|from PIL $&|g'
scribus/plugins/scriptplugin/scripts/FontSample.py
<<
CompileScript: <<
#!/bin/sh -ex
-# Use Fink's freetype219, qt3mac, fontconfig2,
-# but Apple's Python framework (this means no PIL, sorry)
-# For fontconfig2, we have to bypass Scribus' CMake find mechanism,
-# so that it finds Fink's fontconfig2, which is still important
-# on Tiger.
-# For freetype219, we provide both
-# FREETYPE_INCLUDE_DIR_FT2BUILD (understood by cmake-2.4, used by scribus) and
-# FREETYPE_INCLUDE_DIR_ft2build (understood by cmake-2.6)
-#
+# Use Fink's freetype219, qt4-mac, fontconfig2,
+# but Apple's Python framework
export PATH=%p/lib/freetype219/bin:$PATH
unset QMAKESPEC
- export QTDIR=%p/lib/qt3mac
+ export QTDIR=%p/lib/qt4-mac
mkdir build
cd build
cmake --debug-output -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
- -DCMAKE_INSTALL_PREFIX:PATH=%p \
+ -DCMAKE_INSTALL_PREFIX:PATH=%p/Applications/Scribus.app/Contents \
-DFREETYPE_DIR:PATH=%p/lib/freetype219 \
-DFREETYPE_INCLUDE_DIR_ft2build:PATH=%p/lib/freetype219/include \
-DFREETYPE_INCLUDE_DIR_freetype2:PATH=%p/lib/freetype219/include/freetype2 \
-DFREETYPE_LIBRARY:FILEPATH=%p/lib/freetype219/lib/libfreetype.dylib \
-DFONTCONFIG_INCLUDE_DIR:PATH=%p/lib/fontconfig2/include \
-DFONTCONFIG_LIBRARY:FILEPATH=%p/lib/fontconfig2/lib/libfontconfig.dylib \
+
-DPYTHON_INCLUDE_PATH:PATH=/System/Library/Frameworks/Python.framework/Headers \
+ -DPYTHON_LIBRARY:FILEPATH="-framework Python" \
+ -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING="" \
+ -DCMAKE_OSX_SYSROOT:PATH="/" \
..
make
<<
InstallScript: <<
#!/bin/sh -ex
-# 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/
- /bin/cp -p -R ../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/
+ /bin/cp /System/Library/ColorSync/Profiles/*
%i/Applications/Scribus.app/Contents/lib/scribus/profiles/ || /usr/bin/true
+# Wrapper script; for now mainly useful if Fink's pil-systempython25 package
is installed,
+# because this will want PYTHONPATH="%p/Library/Python/2.5/site-packages"
+ mv %i/Applications/Scribus.app/Contents/MacOS/Scribus
%i/Applications/Scribus.app/Contents/MacOS/Scribus.bin
+ ln -s scribus.sh %i/Applications/Scribus.app/Contents/MacOS/Scribus
+ cat > %i/Applications/Scribus.app/Contents/MacOS/scribus.sh << "EOF"
+#!/bin/sh
+source %p/bin/init.sh
+exec %p/Applications/Scribus.app/Contents/MacOS/Scribus.bin "${@}"
+EOF
+ chmod +x %i/Applications/Scribus.app/Contents/MacOS/scribus.sh
<<
-DocFiles: AUTHORS COPYING ChangeLog README ChangeLogSVN
+DocFiles: AUTHORS COPYING ChangeLog ChangeLogCVS ChangeLogSVN PACKAGING README
TRANSLATION
PostInstScript: <<
if ! test -e /Applications/Fink; then /usr/bin/install -d -m 755
/Applications/Fink; fi
ln -nfs %p/Applications/Scribus.app /Applications/Fink/
@@ -78,7 +70,7 @@
PostRmScript: <<
if test -h /Applications/Fink/Scribus.app; then rm -f
/Applications/Fink/Scribus.app; fi
<<
-Description: Layout program (stable branch 1.3.3.x)
+Description: Layout program (stable branch)
DescDetail: <<
Scribus is an open-source program that brings professional
page layout to Linux/Unix, MacOS X, OS/2 and Windows desktops
@@ -88,6 +80,9 @@
Underneath the modern and user friendly interface, Scribus
supports professional publishing features, such as CMYK color,
separations, ICC color management and versatile PDF creation.
+
+ Version 1.4.0 is the new stable release,
+ currently still at release candidate 6.
<<
DescUsage: <<
This version does not need X11 for running.
@@ -97,6 +92,10 @@
This version contains extensive online help.
Additional up-to-date documentation is on the Scribus web site.
+ If you are on 10.5 and you want the Font-Sampler script
+ run fully, with display of the glyphs, you can install the
+ pil-systempython25 package.
+
Fonts: Since X11 is not used, the X11 fonts are not automatically
recognized. You have to tell Scribus where to find fonts.
- Install the x-ghostscript-fonts or msttcorefonts or xfonts-intl
@@ -116,16 +115,16 @@
<<
DescPort: <<
This is a native Aqua version of Scribus.
- A standalone version prepared by Andreas Vox can be downloaded
- from the web at http://aqua.scribus.net
-
- Uses fontconfig2-dev and freetype219 from Fink,
- and qt3-mac-free as packaged in the qt3mac packaqge.
- This version uses the new CMake build system.
- It follows the proposed installation of everything
- into the app bundle, in the Contents directory.
+ Uses fontconfig2-dev and freetype219 from Fink, not from X11,
+ and qt4-mac-free as packaged in the qt4-mac package.
+<<
+DescPackaging: <<
+ The new version 1.4.0 replaces both the old stable version 1.3.3.4 and the
135 development branch. The package names are now scribus-x11 and scribus-aqua,
+like variants, but they have separate info files, because there are too many
+differences.
+The new development branch is 1.5.0, and I may consider packaging it in
+a future scribus-ng or scribus-devel package, if they start releasing tarballs.
<<
Maintainer: Martin Costabel <[email protected]>
Homepage: http://www.scribus.net/
-
--- NEW FILE: scribus135-aqua.info ---
Package: scribus135-aqua
Type: bundle
Version: 1.4.0
Revision: 1
Epoch: 1
Depends: scribus-aqua ( >= 1.4.0-1), fink-obsolete-packages
Description: OBSOLETE, use package 'scribus-aqua' instead
Maintainer: Martin Costabel <[email protected]>
Homepage: http://www.scribus.net/
------------------------------------------------------------------------------
The demand for IT networking professionals continues to grow, and the
demand for specialized networking skills is growing even more rapidly.
Take a complimentary Learning@Cisco Self-Assessment and learn
about Cisco certifications, training, and career opportunities.
http://p.sf.net/sfu/cisco-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
