Author: megabajt Date: Wed Jan 9 18:34:00 2008 GMT
Module: SOURCES Tag: DEVEL
---- Log message:
- updated for 2.21.1
---- Files affected:
SOURCES:
GConf2-NO_MAJOR_VERSION.patch (1.6 -> 1.6.2.1)
---- Diffs:
================================================================
Index: SOURCES/GConf2-NO_MAJOR_VERSION.patch
diff -u SOURCES/GConf2-NO_MAJOR_VERSION.patch:1.6
SOURCES/GConf2-NO_MAJOR_VERSION.patch:1.6.2.1
--- SOURCES/GConf2-NO_MAJOR_VERSION.patch:1.6 Thu Oct 5 16:19:59 2006
+++ SOURCES/GConf2-NO_MAJOR_VERSION.patch Wed Jan 9 19:33:55 2008
@@ -1,21 +1,21 @@
-diff -Nur GConf-1.2.1/backends/Makefile.am GConf-1.2.1.new/backends/Makefile.am
---- GConf-1.2.1/backends/Makefile.am Wed Jun 12 22:32:12 2002
-+++ GConf-1.2.1.new/backends/Makefile.am Thu Aug 15 02:19:08 2002
-@@ -4,7 +4,7 @@
-
- EXTRA_DIST=README.bdb
+diff -urN GConf-2.21.1/backends/Makefile.am
GConf-2.21.1.new/backends/Makefile.am
+--- GConf-2.21.1/backends/Makefile.am 2007-06-25 13:11:19.000000000 +0200
++++ GConf-2.21.1.new/backends/Makefile.am 2008-01-09 18:35:59.000000000
+0100
+@@ -2,7 +2,7 @@
+ $(DEPENDENT_WITH_XML_CFLAGS) \
+ -DGCONF_ENABLE_INTERNALS=1 -DG_LOG_DOMAIN=\"GConf-Backends\"
-backenddir = $(pkglibdir)/$(MAJOR_VERSION)
+backenddir = $(pkglibdir)$(MAJOR_VERSION)
- if BDB
- BDBBACKEND=libgconfbackend-bdb.la
-diff -Nur GConf-1.2.1/gconf/Makefile.am GConf-1.2.1.new/gconf/Makefile.am
---- GConf-1.2.1/gconf/Makefile.am Tue Jul 23 19:14:07 2002
-+++ GConf-1.2.1.new/gconf/Makefile.am Thu Aug 15 02:21:59 2002
-@@ -9,12 +9,12 @@
- -DG_LOG_DOMAIN=\"GConf\" \
- -DGCONF_LOCALE_DIR=\""$(gconflocaledir)"\" \
+ if LDAP_SUPPORT
+ EVOLDAP_BACKEND = libgconfbackend-evoldap.la
+diff -urN GConf-2.21.1/gconf/Makefile.am GConf-2.21.1.new/gconf/Makefile.am
+--- GConf-2.21.1/gconf/Makefile.am 2007-11-01 20:35:40.000000000 +0100
++++ GConf-2.21.1.new/gconf/Makefile.am 2008-01-09 18:38:09.000000000 +0100
+@@ -10,12 +10,12 @@
+ -DPREFIX=\""$(prefix)"\" \
+ -DGCONF_LOCALE_DIR=\""$(datadir)/locale"\" \
-DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\" \
- -DGCONF_CONFDIR=\""$(sysgconfdir)/$(MAJOR_VERSION)"\" \
+ -DGCONF_CONFDIR=\""$(sysgconfdir)"\" \
@@ -24,11 +24,11 @@
-DGCONF_SERVERDIR=\""$(libexecdir)"\" \
-DGCONF_BUILDDIR=\""$(top_builddir)"\" \
- -DGCONF_BACKEND_DIR=\""$(pkglibdir)/$(MAJOR_VERSION)"\" \
-+ -DGCONF_BACKEND_DIR=\""$(pkglibdir)$(MAJOR_VERSION)"\"
\
++ -DGCONF_BACKEND_DIR=\""$(pkglibdir)$(MAJOR_VERSION)"\" \
-DVERSION=\""$(VERSION)"\" \
-DGCONF_ENABLE_INTERNALS=1 \
- -DGCONFD=\""$(GCONFD_BINARY_NAME)"\" \
-@@ -63,7 +63,7 @@
+ -DGCONFD=\""$(GCONFD_BINARY_NAME)$(EXEEXT)"\" \
+@@ -60,7 +60,7 @@
gconf-engine.h \
gconf-client.h
@@ -37,23 +37,32 @@
gconfinclude_HEADERS = \
$(gconf_headers) \
gconf-enum-types.h
-@@ -122,8 +122,8 @@
- EXTRA_DIST=GConf.idl default.path.in gconfmarshal.list
regenerate-enum-header.sh regenerate-enum-footer.sh
+@@ -128,15 +128,15 @@
+ <$(srcdir)/default.path.in >default.path
install-data-local: default.path
- $(mkinstalldirs) $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)
-- $(INSTALL_DATA) default.path
$(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path
+- if test -f $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path; then
\
+ $(mkinstalldirs) $(DESTDIR)$(sysgconfdir)
-+ $(INSTALL_DATA) default.path $(DESTDIR)$(sysgconfdir)/path
++ if test -f $(DESTDIR)$(sysgconfdir)/path; then
\
+ echo "Existing path configuration file not changed";
\
+ else
\
+- $(INSTALL_DATA) default.path
$(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path; \
++ $(INSTALL_DATA) default.path $(DESTDIR)$(sysgconfdir)/path;
\
+ fi
uninstall-local:
- rm -f $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path
-diff -Nur GConf-1.2.1/gconf-2.0.pc.in GConf-1.2.1.new/gconf-2.0.pc.in
---- GConf-1.2.1/gconf-2.0.pc.in Tue Jul 23 19:14:07 2002
-+++ GConf-1.2.1.new/gconf-2.0.pc.in Thu Aug 15 02:19:08 2002
-@@ -10,4 +10,4 @@
- Version: @VERSION@
- Requires: ORBit-2.0
+- rm -f $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path
++ rm -f $(DESTDIR)$(sysgconfdir)/path
+
+ gconfmarshal.h: gconfmarshal.list $(GLIB_GENMARSHAL)
+ $(GLIB_GENMARSHAL) $< --header --prefix=gconf_marshal > $@
+diff -urN GConf-2.21.1/gconf-2.0.pc.in GConf-2.21.1.new/gconf-2.0.pc.in
+--- GConf-2.21.1/gconf-2.0.pc.in 2008-01-08 15:43:09.000000000 +0100
++++ GConf-2.21.1.new/gconf-2.0.pc.in 2008-01-09 18:38:43.000000000 +0100
+@@ -11,4 +11,4 @@
+ Requires: glib
+ Requires.private: ORBit-2.0
Libs: -L${libdir} [EMAIL PROTECTED]@
-Cflags: -I${includedir}/gconf/@MAJOR_VERSION@
+Cflags: -I${includedir}/[EMAIL PROTECTED]@
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/GConf2-NO_MAJOR_VERSION.patch?r1=1.6&r2=1.6.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
