Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16523/10.3/unstable/main/finkinfo/gnome
Modified Files:
gnome-desktop.info gnome-desktop.patch
Log Message:
New version.
gnome-desktop pkg is missing a dep on some pkg that contains a browser?
Index: gnome-desktop.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/gnome-desktop.info,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- gnome-desktop.info 8 Jul 2005 02:21:30 -0000 1.14
+++ gnome-desktop.info 19 Aug 2005 19:31:18 -0000 1.15
@@ -1,18 +1,18 @@
Package: gnome-desktop
-Version: 2.6.2
-Revision: 13
-Depends: %N4-shlibs (>= %v-%r), gnome-core (>= %v-%r), atk1-shlibs (>=
1.6.0-1), audiofile-shlibs (>= 0.2.5-1), esound-bin (>= 0.2.34-1), gconf2 (>=
2.6.0-1), glib2 (>= 2.4.0-1), gnome-vfs2 (>= 2.6.0-1) | gnome-vfs2-ssl (>=
2.6.0-1), gtk+2 (>= 2.4.0-1), libart2-shlibs (>= 2.3.16-1), libbonobo2 (>=
2.6.0-1), libbonoboui2 (>= 2.6.0-1), libgnome2 (>= 2.6.0-1), libgnomecanvas2
(>= 2.6.0-1), libgnomeui2 (>= 2.6.0-1), libxml2-shlibs (>= 2.6.7-1), orbit2 (>=
2.10.0-1), pango1-xft2 (>= 1.4.0-1), popt-shlibs, scrollkeeper
-BuildDepends: glib2-dev (>= 2.4.0-1), atk1 (>= 1.6.0-1), pango1-xft2-dev (>=
1.4.0-1), gtk+2-dev (>= 2.4.0-1), gtk+2 (>= 2.4.0-1), libart2 (>= 2.3.16-1),
libgnomecanvas2-dev (>= 2.6.0-1), libjpeg, orbit2-dev (>= 2.10.0-1), gconf2-dev
(>= 2.6.0-1), gnome-vfs2-dev (>= 2.6.0-1) | gnome-vfs2-ssl-dev (>= 2.6.0-1),
libxml2 (>= 2.6.7-1), libbonobo2-dev (>= 2.6.0-1), libgnome2-dev (>= 2.6.0-1),
libbonoboui2-dev (>= 2.6.0-1), libgnomeui2-dev (>= 2.6.0-1), audiofile (>=
0.2.5-1), esound, pkgconfig, gettext-dev, gettext-bin, gettext-tools,
libiconv-dev, startup-notification-dev, gnome-keyring-dev (>= 0.4.3-1),
gdk-pixbuf, intltool, popt, scrollkeeper
+Version: 2.10.2
+Revision: 1
+Depends: %N4-shlibs (>= %v-%r), gnome-core (>= %v-%r), atk1-shlibs (>=
1.6.0-1), audiofile-shlibs (>= 0.2.5-1), esound-bin (>= 0.2.34-1), gconf2 (>=
2.6.0-1), glib2 (>= 2.4.0-1), gnome-vfs2-ssl (>= 2.6.0-1) | gnome-vfs2 (>=
2.6.0-1), gtk+2 (>= 2.4.0-1), libart2-shlibs (>= 2.3.16-1), libbonobo2 (>=
2.6.0-1), libbonoboui2 (>= 2.6.0-1), libgnome2 (>= 2.6.0-1), libgnomecanvas2
(>= 2.6.0-1), libgnomeui2 (>= 2.6.0-1), libxml2-shlibs (>= 2.6.7-1), orbit2 (>=
2.10.0-1), pango1-xft2 (>= 1.4.0-1), popt-shlibs, scrollkeeper, libiconv,
libgettext3-shlibs, x11, libjpeg-shlibs, gnome-keyring-shlibs
+BuildDepends: glib2-dev (>= 2.4.0-1), atk1 (>= 1.6.0-1), pango1-xft2-dev (>=
1.4.0-1), gtk+2-dev (>= 2.4.0-1), gtk+2 (>= 2.4.0-1), libart2 (>= 2.3.16-1),
libgnomecanvas2-dev (>= 2.6.0-1), libjpeg, orbit2-dev (>= 2.10.0-1), gconf2-dev
(>= 2.6.0-1), gnome-vfs2-ssl-dev (>= 2.6.0-1) | gnome-vfs2-dev (>= 2.6.0-1),
libxml2 (>= 2.6.7-1), libbonobo2-dev (>= 2.6.0-1), libgnome2-dev (>= 2.6.0-1),
libbonoboui2-dev (>= 2.6.0-1), libgnomeui2-dev (>= 2.6.0-1), audiofile (>=
0.2.5-1), esound, pkgconfig, libgettext3-dev, gettext-bin, gettext-tools,
libiconv-dev, startup-notification-dev, gnome-keyring-dev (>= 0.4.3-1),
intltool, popt, scrollkeeper, x11-dev
Replaces: gnome-core (<< 2.6.0-1), control-center (<< 2.4.0-1)
Conflicts: gnome-core (<< 2.6.0-1)
-Source: mirror:gnome:sources/%n/2.6/%n-%v.tar.bz2
-Source-MD5: efe9949e7aed8ca143287ec551b6852a
+Source: mirror:gnome:sources/%n/2.10/%n-%v.tar.bz2
+Source-MD5: b912a6878ea307af9e3d015864ec0678
Patch: %n.patch
-PatchScript: perl -pi.bak -e "s/-scrollkeeper-update/#-scrollkeeper-update/g"
desktop-docs/lgpl/*/Makefile.in
+PatchScript: perl -pi.bak -e "s/-scrollkeeper-update/#-scrollkeeper-update/g"
desktop-docs/*/*/Makefile.in
SetCPPFLAGS: -no-cpp-precomp
SetCFLAGS: -O3 -funroll-loops -fstrict-aliasing -pipe
NoSetLDFLAGS: true
-ConfigureParams: --mandir=%p/share/man --with-kde-datadir=%p/share
--with-kde-docdir=%p/share/doc
+ConfigureParams: --mandir=%p/share/man --with-kde-datadir=%p/share
--with-kde-docdir=%p/share/doc --disable-dependency-tracking
CompileScript: ./configure %c; make
InstallScript: <<
make install DESTDIR=%d
@@ -31,26 +31,26 @@
<<
SplitOff: <<
Package: %N4-shlibs
- Depends: gnome-base, atk1-shlibs (>= 1.6.0-1), audiofile-shlibs (>=
0.2.5-1), esound-bin (>= 0.2.34-1), gconf2 (>= 2.6.0-1), glib2 (>= 2.4.0-1),
gnome-vfs2 (>= 2.6.0-1) | gnome-vfs2-ssl (>= 2.6.0-1), gtk+2 (>= 2.4.0-1),
libart2-shlibs (>= 2.3.16-1), libbonobo2 (>= 2.6.0-1), libbonoboui2 (>=
2.6.0-1), libgnome2 (>= 2.6.0-1), libgnomecanvas2 (>= 2.6.0-1), libgnomeui2 (>=
2.6.0-1), libxml2-shlibs (>= 2.6.7-1), orbit2 (>= 2.10.0-1), pango1-xft2 (>=
1.4.0-1), popt-shlibs, startup-notification-shlibs, gnome-keyring-shlibs,
gdk-pixbuf-shlibs
+ Depends: gnome-base, atk1-shlibs (>= 1.6.0-1), audiofile-shlibs (>=
0.2.5-1), esound-bin (>= 0.2.34-1), gconf2 (>= 2.6.0-1), glib2 (>= 2.4.0-1),
gnome-vfs2-ssl-shlibs (>= 2.6.0-1) | gnome-vfs2-shlibs (>= 2.6.0-1), gtk+2 (>=
2.4.0-1), libart2-shlibs (>= 2.3.16-1), libbonobo2 (>= 2.6.0-1), libbonoboui2
(>= 2.6.0-1), libgnome2 (>= 2.6.0-1), libgnomecanvas2 (>= 2.6.0-1), libgnomeui2
(>= 2.6.0-1), libxml2-shlibs (>= 2.6.7-1), orbit2 (>= 2.10.0-1), pango1-xft2
(>= 1.4.0-1), popt-shlibs, startup-notification-shlibs, gnome-keyring-shlibs,
libiconv, libgettext3-shlibs, x11, libjpeg-shlibs
Files: lib/lib*-2.*.dylib
- Shlibs: %p/lib/libgnome-desktop-2.2.dylib 4.0.0 %n (>= 2.6.0-1)
- DocFiles: AUTHORS COPYING* ChangeLog NEWS README
+ Shlibs: %p/lib/libgnome-desktop-2.2.dylib 5.0.0 %n (>= 2.10.2-1)
+ DocFiles: AUTHORS COPYING* ChangeLog HACKING NEWS README
<<
SplitOff2: <<
Package: %N4-dev
- Depends: %N4-shlibs (>= %v-%r)
+ Depends: %N4-shlibs (= %v-%r)
Conflicts: %N-dev
Replaces: %N-dev
BuildDependsOnly: True
- Files: include lib/lib*-2.* lib/pkgconfig
- DocFiles: AUTHORS COPYING* ChangeLog NEWS README
+ Files: include lib
+ DocFiles: AUTHORS COPYING* ChangeLog HACKING NEWS README
<<
SplitOff3: <<
Package: gnome-core
Files: share/doc/dummy/gnome-core
Description: placeholder for gnome-core to allow upgrading over gnome 1.4
packages
<<
-DocFiles: AUTHORS COPYING* ChangeLog NEWS README
+DocFiles: AUTHORS COPYING* ChangeLog HACKING NEWS README
Description: The Gnome desktop
DescDetail: <<
GNOME (GNU Network Object Model Environment) is a user-friendly
@@ -63,6 +63,10 @@
GNOME Desktop provides the core icons and libraries for the gnome
desktop.
<<
+DescPackaging: <<
+ This should really be %n=gnome-desktop2.2-{shlibs,dev} but not gonna
+ change it now.
+<<
License: GPL/LGPL/GFDL
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
Homepage: http://www.gnome.org/
Index: gnome-desktop.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/gnome-desktop.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gnome-desktop.patch 8 Feb 2005 03:28:23 -0000 1.2
+++ gnome-desktop.patch 19 Aug 2005 19:31:18 -0000 1.3
@@ -1,34 +1,6 @@
-diff -Naur gnome-desktop-2.6.2/desktop-docs/fdl/eu/fdl-eu.omf
gnome-desktop-2.6.2-patched/desktop-docs/fdl/eu/fdl-eu.omf
---- gnome-desktop-2.6.2/desktop-docs/fdl/eu/fdl-eu.omf Mon Apr 26 19:00:02 2004
-+++ gnome-desktop-2.6.2-patched/desktop-docs/fdl/eu/fdl-eu.omf Tue Feb 8
01:15:48 2005
-@@ -4,9 +4,7 @@
- <title>
- GNU Free Documentation License
- </title>
-- <subject>
-- <category>General|Licenses</category>
-- </subject>
-+ <subject category="General|Licenses"/>
- <format mime="text/xml"/>
- <identifier url="fdl.xml"/>
- <language code="eu"/>
-diff -Naur gnome-desktop-2.6.2/libgnome-desktop/egg-spawn.c
gnome-desktop-2.6.2-patched/libgnome-desktop/egg-spawn.c
---- gnome-desktop-2.6.2/libgnome-desktop/egg-spawn.c Tue Dec 3 09:01:21 2002
-+++ gnome-desktop-2.6.2-patched/libgnome-desktop/egg-spawn.c Tue Feb 8
01:14:48 2005
-@@ -28,6 +28,10 @@
- #include <glib.h>
- #include <gdk/gdk.h>
-
-+#include <sys/time.h>
-+#include <crt_externs.h>
-+#define environ (*_NSGetEnviron())
-+
- extern char **environ;
-
- /**
-diff -Naur gnome-desktop-2.6.2/libgnome-desktop/gnome-desktop-item.c
gnome-desktop-2.6.2-patched/libgnome-desktop/gnome-desktop-item.c
---- gnome-desktop-2.6.2/libgnome-desktop/gnome-desktop-item.c Sun Feb 29
14:23:40 2004
-+++ gnome-desktop-2.6.2-patched/libgnome-desktop/gnome-desktop-item.c Tue Feb
8 01:14:48 2005
+diff -Nurd -x'*~'
gnome-desktop-2.10.2.orig/libgnome-desktop/gnome-desktop-item.c
gnome-desktop-2.10.2/libgnome-desktop/gnome-desktop-item.c
+--- gnome-desktop-2.10.2.orig/libgnome-desktop/gnome-desktop-item.c
2005-06-27 15:26:23.000000000 -0400
++++ gnome-desktop-2.10.2/libgnome-desktop/gnome-desktop-item.c 2005-08-19
14:50:56.000000000 -0400
@@ -29,6 +29,9 @@
#include "config.h"
@@ -46,12 +18,12 @@
-#include <time.h>
+#include <sys/time.h>
#include <string.h>
- #include <libgnome/gnome-i18n.h>
+ #include <glib/gi18n-lib.h>
#include <libgnome/gnome-util.h>
-diff -Naur gnome-desktop-2.6.2/ltmain.sh gnome-desktop-2.6.2-patched/ltmain.sh
---- gnome-desktop-2.6.2/ltmain.sh Wed May 19 18:14:48 2004
-+++ gnome-desktop-2.6.2-patched/ltmain.sh Tue Feb 8 01:14:48 2005
-@@ -5266,10 +5266,10 @@
+diff -Nurd -x'*~' gnome-desktop-2.10.2.orig/ltmain.sh
gnome-desktop-2.10.2/ltmain.sh
+--- gnome-desktop-2.10.2.orig/ltmain.sh 2005-06-28 03:10:34.000000000
-0400
++++ gnome-desktop-2.10.2/ltmain.sh 2005-08-19 14:50:56.000000000 -0400
+@@ -5301,10 +5301,6 @@
# Directory that this library needs to be installed in:
libdir='$install_libdir'"
@@ -59,10 +31,6 @@
- $echo >> $output "\
-relink_command=\"$relink_command\""
- fi
-+# if test "$installed" = no && test "$need_relink" = yes; then
-+# $echo >> $output "\
-+#relink_command=\"$relink_command\""
-+# fi
done
fi
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
