Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2096
Modified Files:
gconf2.info gconf2.patch
Log Message:
New version. Prev had wrong filename in Shlibs (actual pkg filename has not
changed).
Index: gconf2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/gconf2.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gconf2.patch 2 Jul 2004 15:36:58 -0000 1.3
+++ gconf2.patch 9 Jun 2005 11:24:16 -0000 1.4
@@ -1,7 +1,7 @@
-diff -Naur GConf-2.6.1-old/doc/gconf/Makefile.in
GConf-2.6.1/doc/gconf/Makefile.in
---- GConf-2.6.1-old/doc/gconf/Makefile.in 2004-04-19 08:12:05.000000000
-0400
-+++ GConf-2.6.1/doc/gconf/Makefile.in 2004-06-17 15:22:08.000000000 -0400
-@@ -180,7 +180,7 @@
+diff -Naur GConf-2.10.1-old/doc/gconf/Makefile.in
GConf-2.10.1/doc/gconf/Makefile.in
+--- GConf-2.10.0-old/doc/gconf/Makefile.in 2004-04-19 08:12:05.000000000
-0400
++++ GConf-2.10.0/doc/gconf/Makefile.in 2005-06-09 06:31:22.000000000 -0400
+@@ -236,7 +236,7 @@
# CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty.
@@ -9,38 +9,41 @@
+GTKDOC_CFLAGS = -I$(top_srcdir) $(CFLAGS) $(CPPFLAGS) $(DEPENDENT_CFLAGS)
GTKDOC_LIBS = $(LDFLAGS) $(DEPENDENT_LIBS)
$(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la
-
-diff -Naur GConf-2.6.1-old/gconf/Makefile.in GConf-2.6.1/gconf/Makefile.in
---- GConf-2.6.1-old/gconf/Makefile.in 2004-04-19 08:11:03.000000000 -0400
-+++ GConf-2.6.1/gconf/Makefile.in 2004-06-17 16:10:52.000000000 -0400
-@@ -174,7 +174,7 @@
- gconfd_2_SOURCES = gconf-database.h gconf-database.c
gconf-sources.h gconfd.h gconfd.c
+ @[EMAIL PROTECTED] = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
+diff -Naur GConf-2.10.0-old/gconf/Makefile.in GConf-2.10.0/gconf/Makefile.in
+--- GConf-2.10.0-old/gconf/Makefile.in 2004-04-19 08:11:03.000000000 -0400
++++ GConf-2.10.0/gconf/Makefile.in 2005-06-09 06:31:22.000000000 -0400
+@@ -256,7 +256,7 @@
+ gconfd.c
-gconfd_2_LDADD = $(EFENCE) $(INTLLIBS) $(DEPENDENT_LIBS)
libgconf-$(MAJOR_VERSION).la
+gconfd_2_LDADD = libgconf-$(MAJOR_VERSION).la $(EFENCE) $(INTLLIBS)
$(DEPENDENT_LIBS)
+
# gconf_testclient_SOURCES = \
- # testclient.c
-@@ -184,12 +184,12 @@
- gconftool_2_SOURCES = gconftool.c
+@@ -267,7 +267,7 @@
+ gconftool.c
-gconftool_2_LDADD = $(EFENCE) $(INTLLIBS) $(DEPENDENT_WITH_XML_LIBS)
$(POPT_LIBS) libgconf-$(MAJOR_VERSION).la
+gconftool_2_LDADD = libgconf-$(MAJOR_VERSION).la $(EFENCE) $(INTLLIBS)
$(DEPENDENT_WITH_XML_LIBS) $(POPT_LIBS)
- gconf_sanity_check_2_SOURCES = gconf-sanity-check.c
+ gconf_sanity_check_2_SOURCES = \
+ gconf-sanity-check.c
+@@ -273,7 +273,7 @@
+ gconf-sanity-check.c
-gconf_sanity_check_2_LDADD = $(EFENCE) $(INTLLIBS)
$(DEPENDENT_WITH_XML_AND_GTK_LIBS) $(POPT_LIBS) libgconf-$(MAJOR_VERSION).la
+gconf_sanity_check_2_LDADD = libgconf-$(MAJOR_VERSION).la $(EFENCE)
$(INTLLIBS) $(DEPENDENT_WITH_XML_AND_GTK_LIBS) $(POPT_LIBS)
- libgconf_2_la_SOURCES = gconf-internals.c
gconf-internals.h gconf-backend.h gconf-backend.c
gconf-changeset.c gconf-error.c
gconf-listeners.c gconf-locale.h gconf-locale.c
gconf-schema.c gconf-sources.c
gconf-value.c gconf.c gconf-client.c
gconf-enum-types.c $(CORBA_SOURCECODE)
-
-diff -Naur GConf-2.6.1-old/gconf/gconf-internals.c
GConf-2.6.1/gconf/gconf-internals.c
---- GConf-2.6.1-old/gconf/gconf-internals.c 2004-04-19 06:08:20.000000000
-0400
-+++ GConf-2.6.1/gconf/gconf-internals.c 2004-06-17 15:22:08.000000000
-0400
-@@ -2581,6 +2581,9 @@
+ libgconf_2_la_SOURCES = \
+ gconf-internals.c \
+diff -Naur GConf-2.10.-old/gconf/gconf-internals.c
GConf-2.10.0/gconf/gconf-internals.c
+--- GConf-2.10.0-old/gconf/gconf-internals.c 2004-04-19 06:08:20.000000000
-0400
++++ GConf-2.10.0/gconf/gconf-internals.c 2005-06-09 06:31:22.000000000
-0400
+@@ -2606,6 +2606,9 @@
}
}
@@ -50,10 +53,10 @@
return lock;
}
-diff -Naur GConf-2.6.1-old/ltmain.sh GConf-2.6.1/ltmain.sh
---- GConf-2.6.1-old/ltmain.sh 2004-04-19 08:03:11.000000000 -0400
-+++ GConf-2.6.1/ltmain.sh 2004-06-17 15:22:08.000000000 -0400
-@@ -3763,6 +3763,11 @@
+diff -Naur GConf-2.10.0-old/ltmain.sh GConf-2.10.0/ltmain.sh
+--- GConf-2.10.0-old/ltmain.sh 2004-04-19 08:03:11.000000000 -0400
++++ GConf-2.10.0/ltmain.sh 2005-06-09 06:31:22.000000000 -0400
+@@ -3845,6 +3845,11 @@
eval test_cmds=\"$archive_expsym_cmds\"
cmds=$archive_expsym_cmds
else
Index: gconf2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/gconf2.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- gconf2.info 21 Mar 2005 18:57:51 -0000 1.10
+++ gconf2.info 9 Jun 2005 11:24:16 -0000 1.11
@@ -1,43 +1,49 @@
Package: gconf2
-Version: 2.6.3
-Revision: 10
-Depends: %N-shlibs (>= %v-%r), atk1-shlibs (>= 1.6.0-1), gettext, glib2 (>=
2.4.0-1), libiconv, libxml2-shlibs (>= 2.6.6-1), orbit2 (>= 2.10.0-1),
popt-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), orbit2-dev (>= 2.10.0-1),
libxml2 (>= 2.6.6-1), gtk-doc (>= 1.2-1), pkgconfig, gettext-dev, gettext-bin,
gettext-tools, libiconv-dev, libxslt, popt
-Source: mirror:gnome:sources/GConf/2.6/GConf-%v.tar.bz2
-Source-MD5: 5230454d8855aa578954af55eae14059
+Version: 2.10.0
+Revision: 1
+Depends: %N-shlibs (>= %v-%r), atk1-shlibs (>= 1.6.0-1), gettext, glib2 (>=
2.4.0-1), libiconv, libxml2-shlibs (>= 2.6.6-1), orbit2 (>= 2.10.0-1), x11,
popt-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), orbit2-dev (>= 2.10.0-1),
libxml2 (>= 2.6.6-1), gtk-doc (>= 1.2-1), pkgconfig, gettext-dev, gettext-bin,
gettext-tools, libiconv-dev, x11-dev, popt
+Source: mirror:gnome:sources/GConf/2.10/GConf-%v.tar.bz2
+Source-MD5: a7cd37be4e317195a6668a086fc72033
Patch: %n.patch
SetCPPFLAGS: -no-cpp-precomp
SetCFLAGS: -O3 -funroll-loops -fstrict-aliasing
NoSetLDFLAGS: true
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
-ConfigureParams: --mandir=%p/share/man --libexecdir=%p/lib/%n --disable-debug
+ConfigureParams: --mandir=%p/share/man --libexecdir=%p/lib/%n --disable-debug
--disable-dependency-tracking
InstallScript: make install DESTDIR=%d
SplitOff: <<
Package: %N-shlibs
Depends: atk1-shlibs (>= 1.6.0-1), gettext, glib2-shlibs (>= 2.4.0-1),
libiconv, libxml2-shlibs (>= 2.6.6-1), orbit2-shlibs (>= 2.10.0-1), popt-shlibs
- Files: lib/libgconf-2.*.dylib lib/GConf
- Shlibs: %p/lib/libgconf-2.5.dylib 6.0.0 %n (>= 2.6.0-2)
+ Files: <<
+ lib/libgconf-2.*.dylib
+ lib/GConf
+ <<
+ Shlibs: %p/lib/libgconf-2.4.dylib 6.0.0 %n (>= 2.10.0-1)
DocFiles: AUTHORS COPYING ChangeLog NEWS README TODO
<<
SplitOff2: <<
Package: %N-dev
Depends: %N-shlibs (= %v-%r)
DescPackaging: <<
- Uses pkgconfig.
+ Uses pkgconfig to allow other packages to link against this one.
Any package which BuildDepends on this one must also BuildDepend on:
glib2-dev (>= 2.4.0-1), glib2 (>= 2.4.0-1), orbit2-dev (>= 2.10.0-1)
<<
BuildDependsOnly: True
- Files: include lib/libgconf-2.* lib/pkgconfig share/aclocal share/gtk-doc
+ Files: <<
+ include
+ lib/libgconf-2.*
+ lib/pkgconfig
+ share/aclocal
+ share/gtk-doc
+ <<
DocFiles: AUTHORS COPYING ChangeLog NEWS README TODO
<<
ConfFiles: %p/etc/gconf/2/path
DocFiles: AUTHORS COPYING ChangeLog NEWS README TODO
-Description: Gnome Config System
-DescDetail: <<
-GConf is the GNOME Configuration database system.
-<<
+Description: Gnome configuration database system
DescPort: <<
The global header file, gconf.h, clashes with the header generated
from the CORBA IDL description, GConf.h. Solved by renaming the IDL
-------------------------------------------------------
This SF.Net email is sponsored by: NEC IT Guy Games. How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
