Update of /cvsroot/fink/experimental/mommsen/10.4/main
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2645
Modified Files:
libgdl1.0.info
Log Message:
Merge changes from unstable branch
Index: libgdl1.0.info
===================================================================
RCS file: /cvsroot/fink/experimental/mommsen/10.4/main/libgdl1.0.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libgdl1.0.info 23 Oct 2008 13:55:34 -0000 1.1
+++ libgdl1.0.info 5 Nov 2008 13:11:08 -0000 1.2
@@ -1,6 +1,7 @@
Package: libgdl1.0
Version: 2.23.90
Revision: 1
+# do not upgrade this package to 2.24!
Source: mirror:gnome:sources/gdl/2.23/gdl-%v.tar.bz2
Source-MD5: 1a3faf400b0232d53e507f0a801bdfec
@@ -8,42 +9,44 @@
BuildDependsOnly: true
Depends: %N-shlibs (= %v-%r)
+Conflicts: libgdl-1.0
+Replaces: libgdl-1.0
SourceDirectory: gdl-%v
BuildDepends: <<
atk1 (>= 1.20.0-1),
- audiofile (>= 0.2.5-1),
- avahi-dev,
+ audiofile (>= 0.2.5-1),
+ avahi-dev,
cairo (>= 1.6-1),
- dbus-dev (>= 1.2.1-1),
- esound (>= 0.2.38-1),
+ dbus-dev (>= 1.2.1-1),
+ esound (>= 0.2.38-1),
expat1,
- intltool40,
+ intltool40,
fontconfig2-dev (>= 2.4.1-1),
freetype219 (>= 2.3.5-1),
- gconf2-dev (>= 2.24.0-1),
+ gconf2-dev (>= 2.24.0-1),
glib2-dev (>= 2.18.0-1),
glitz,
- gnome-keyring-dev (>= 2.24.0-1),
- gnome-vfs2-unified-dev (>= 1:2.24.0-1),
+ gnome-keyring-dev (>= 2.24.0-1),
+ gnome-vfs2-unified-dev (>= 1:2.24.0-1),
gtk+2-dev (>= 2.12.0-1),
- libart2 (>= 2.3.16-1),
- libavahi-glib1-dev,
- libbonobo2-dev (>= 2.24.0-1),
- libbonoboui2-dev (>= 2.24.0-1),
+ libart2 (>= 2.3.16-1),
+ libavahi-glib1-dev,
+ libbonobo2-dev (>= 2.24.0-1),
+ libbonoboui2-dev (>= 2.24.0-1),
libgettext3-dev,
libglade2 (>= 2.6.2-1),
- libgnome2-dev (>= 2.24.0-1),
- libgnomecanvas2-dev (>= 2.20.0-1),
- libgnomeui2-dev (>= 2.24.0-1),
+ libgnome2-dev (>= 2.24.0-1),
+ libgnomecanvas2-dev (>= 2.20.0-1),
+ libgnomeui2-dev (>= 2.24.0-1),
libiconv-dev,
libpng3,
libxml2 (>= 2.6.30-1),
- orbit2-dev (>= 2.14.16-1),
+ orbit2-dev (>= 2.14.16-1),
pango1-xft2-ft219-dev (>= 1.22.0-4),
pixman (>= 0.10.0-1),
pkgconfig (>= 0.23),
- popt,
+ popt,
x11-dev
<<
@@ -62,48 +65,48 @@
Package: %N-shlibs
Depends: <<
atk1-shlibs (>= 1.20.0-1),
- audiofile-shlibs (>= 0.2.5-1),
- cairo-shlibs (>= 1.6-1),
- dbus-shlibs (>= 1.2.1-1),
- esound-shlibs (>= 0.2.38-1),
- expat1-shlibs,
- freetype219-shlibs (>= 2.3.5-1),
- gconf2-shlibs (>= 2.24.0-1),
+ audiofile-shlibs (>= 0.2.5-1),
+ cairo-shlibs (>= 1.6-1),
+ dbus-shlibs (>= 1.2.1-1),
+ esound-shlibs (>= 0.2.38-1),
+ expat1-shlibs,
+ freetype219-shlibs (>= 2.3.5-1),
+ gconf2-shlibs (>= 2.24.0-1),
glib2-shlibs (>= 2.18.0-1),
- glitz-shlibs,
- gnome-keyring-shlibs (>= 2.24.0-1),
- gnome-vfs2-unified-shlibs (>= 1:2.24.0-1),
+ glitz-shlibs,
+ gnome-keyring-shlibs (>= 2.24.0-1),
+ gnome-vfs2-unified-shlibs (>= 1:2.24.0-1),
gtk+2-shlibs (>= 2.12.0-1),
- libart2-shlibs (>= 2.3.16-1),
- libavahi-client3-shlibs,
- libavahi-common3-shlibs,
- libavahi-glib1-shlibs,
- libbonobo2-shlibs (>= 2.24.0-1),
- libbonoboui2-shlibs (>= 2.24.0-1),
+ libart2-shlibs (>= 2.3.16-1),
+ libavahi-client3-shlibs,
+ libavahi-common3-shlibs,
+ libavahi-glib1-shlibs,
+ libbonobo2-shlibs (>= 2.24.0-1),
+ libbonoboui2-shlibs (>= 2.24.0-1),
libgettext3-shlibs,
libglade2-shlibs (>= 2.6.2-1),
- libgnome2-shlibs (>= 2.24.0-1),
- libgnomecanvas2-shlibs (>= 2.20.0-1),
- libgnomeui2-shlibs (>= 2.24.0-1),
+ libgnome2-shlibs (>= 2.24.0-1),
+ libgnomecanvas2-shlibs (>= 2.20.0-1),
+ libgnomeui2-shlibs (>= 2.24.0-1),
libiconv,
libpng3-shlibs,
libxml2-shlibs (>= 2.6.30-1),
- orbit2-shlibs (>= 2.14.16-1),
+ orbit2-shlibs (>= 2.14.16-1),
pango1-xft2-ft219-shlibs (>= 1.22.0-4),
- pixman-shlibs (>= 0.10.0-1),
- popt-shlibs,
+ pixman-shlibs (>= 0.10.0-1),
+ popt-shlibs,
x11-shlibs
<<
Replaces: %N (<< 0.7.11-1)
Files: <<
lib/libgdl-1.0.*dylib
- lib/libgdl-gnome-1.0.*dylib
+ lib/libgdl-gnome-1.0.*dylib
share/gdl-1.0
share/locale
<<
Shlibs: <<
%p/lib/libgdl-1.0.dylib 1.0.0 %n (>= 0.6.1-1)
- %p/lib/libgdl-gnome-1.0.dylib 1.0.0 %n (>= 0.7.11-1)
+ %p/lib/libgdl-gnome-1.0.dylib 1.0.0 %n (>= 0.7.11-1)
<<
DocFiles: AUTHORS COPYING ChangeLog po/ChangeLog:ChangeLog.po
MAINTAINERS NEWS README
<<
@@ -115,6 +118,12 @@
Rename runtime support files directory and gettext message catalogs
to match install_name versioning so they can be in -shlibs and not
conflict with different-libversion packages.
+
+ The public gdl-gnome shared library was dropped in the transition
+ from version 2.23.x to 2.24.x. To maintain compatibility with other
+ packages that use it, we rename from libgdl1.0 to libgdl-1.0 and
+ change the install_name so cankeep "old" dual-library pkg installed
+ and also install "new".
<<
Description: Gnome Devtool Libraries
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs