head 1.2; access; symbols OPENPKG_E1_MP_HEAD:1.2 OPENPKG_E1_MP:1.2 OPENPKG_E1_MP_2_STABLE:1.1.2.2 OPENPKG_E1_FP:1.1.2.2 OPENPKG_2_STABLE_MP:1.1 OPENPKG_2_STABLE_20061018:1.1.2.2 OPENPKG_2_STABLE:1.1.0.2; locks; strict; comment @# @; 1.2 date 2006.11.10.21.34.04; author rse; state Exp; branches; next 1.1; commitid bBjVbtXsB7WwraUr; 1.1 date 2005.08.14.10.18.00; author rse; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2005.08.14.10.18.00; author rse; state dead; branches; next 1.1.2.2; commitid iZxwRSmmWscPXUQr; 1.1.2.2 date 2006.10.16.14.51.54; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; desc @@ 1.2 log @upgrading package: libgnomeprint 2.12.1 -> 2.17.0 @ text @Index: configure --- configure.orig 2006-11-10 11:54:51 +0100 +++ configure 2006-11-10 22:18:23 +0100 @@@@ -24202,11 +24202,11 @@@@ -GNOME_PRINT_MODULES_DIR='${libdir}/libgnomeprint/${VERSION}/modules' +GNOME_PRINT_MODULES_DIR='${libdir}/libgnomeprint/modules' GNOME_PRINT_MODULES_DIR=$GNOME_PRINT_MODULES_DIR -GNOME_PRINT_DATA_DIR='${datadir}/libgnomeprint/${VERSION}' +GNOME_PRINT_DATA_DIR='${datadir}/libgnomeprint' GNOME_PRINT_DATA_DIR=$GNOME_PRINT_DATA_DIR Index: libgnomeprint/Makefile.in --- libgnomeprint/Makefile.in.orig 2006-11-10 11:54:53 +0100 +++ libgnomeprint/Makefile.in 2006-11-10 22:18:23 +0100 @@@@ -424,7 +424,7 @@@@ $(font_sources) \ $(temp_sources) -libgnomeprintincdir = $(includedir)/libgnomeprint-2.2/libgnomeprint +libgnomeprintincdir = $(includedir)/libgnomeprint libgnomeprintinc_HEADERS = \ $(nox_headers) \ $(font_headers) \ Index: libgnomeprint/gpa/Makefile.in --- libgnomeprint/gpa/Makefile.in.orig 2006-11-10 11:54:54 +0100 +++ libgnomeprint/gpa/Makefile.in 2006-11-10 22:19:12 +0100 @@@@ -297,7 +297,7 @@@@ \ gpa-utils.c gpa-utils.h -libgpaincdir = $(includedir)/libgnomeprint-2.2/libgnomeprint/private +libgpaincdir = $(includedir)/libgnomeprint/private libgpainc_HEADERS = \ gpa-node.h \ gpa-utils.h \ Index: libgnomeprint/libgnomeprint-2.2-uninstalled.pc.in --- libgnomeprint/libgnomeprint-2.2-uninstalled.pc.in.orig 2005-10-05 18:23:14 +0200 +++ libgnomeprint/libgnomeprint-2.2-uninstalled.pc.in 2006-11-10 22:18:23 +0100 @@@@ -3,7 +3,7 @@@@ libdir=@@libdir@@ includedir=@@includedir@@ -privateincludedir=${includedir}/libgnomeprint-2.2/libgnomeprint/private +privateincludedir=${includedir}/libgnomeprint/private Name: libgnomeprint-2.2 Description: libgnomeprint - Printing library for gtk+ based applications Index: libgnomeprint/libgnomeprint-2.2.pc.in --- libgnomeprint/libgnomeprint-2.2.pc.in.orig 2005-10-05 18:23:14 +0200 +++ libgnomeprint/libgnomeprint-2.2.pc.in 2006-11-10 22:19:38 +0100 @@@@ -3,11 +3,11 @@@@ libdir=@@libdir@@ includedir=@@includedir@@ -privateincludedir=${includedir}/libgnomeprint-2.2/libgnomeprint/private +privateincludedir=${includedir}/libgnomeprint/private Name: libgnomeprint-2.2 Description: libgnomeprint - Printing library for gtk+ based applications Requires: libart-2.0 glib-2.0 gmodule-no-export-2.0 gobject-2.0 libxml-2.0 pango Version: @@VERSION@@ Libs: -L${libdir} -lgnomeprint-2-2 -lz -Cflags: -I${includedir}/libgnomeprint-2.2 +Cflags: -I${includedir} Index: tests/tools/xmlfix.c --- tests/tools/xmlfix.c.orig 2006-10-30 12:12:03 +0100 +++ tests/tools/xmlfix.c 2006-11-10 22:18:23 +0100 @@@@ -32,13 +32,9 @@@@ exit (-1); } -/* #undef xmlStringText */ -const xmlChar xmlStringText[] = { 't', 'e', 'x', 't', 0 }; -/* #undef xmlStringTextNoenc */ -const xmlChar xmlStringTextNoenc[] = - { 't', 'e', 'x', 't', 'n', 'o', 'e', 'n', 'c', 0 }; -/* #undef xmlStringComment */ -const xmlChar xmlStringComment[] = { 'c', 'o', 'm', 'm', 'e', 'n', 't', 0 }; +extern const xmlChar xmlStringText[]; +extern const xmlChar xmlStringTextNoenc[]; +extern const xmlChar xmlStringComment[]; static xmlNodePtr xmlStaticCopyNodeList (xmlNodePtr node, xmlDocPtr doc, xmlNodePtr parent); @ 1.1 log @new package: libgnomeprint 2.11.0 (GNOME Printing Engine) @ text @d2 3 a4 3 --- configure.orig 2005-04-19 17:02:39 +0200 +++ configure 2005-08-14 11:11:35 +0200 @@@@ -24097,11 +24097,11 @@@@ d19 4 a22 3 --- libgnomeprint/Makefile.in.orig 2005-06-11 15:54:03 +0200 +++ libgnomeprint/Makefile.in 2005-08-14 11:11:35 +0200 @@@@ -344,7 +344,7 @@@@ a24 1 d31 4 a34 3 --- libgnomeprint/gpa/Makefile.in.orig 2005-04-19 17:02:42 +0200 +++ libgnomeprint/gpa/Makefile.in 2005-08-14 11:14:34 +0200 @@@@ -246,7 +246,7 @@@@ a36 1 a38 1 d41 1 d43 2 a44 2 --- libgnomeprint/libgnomeprint-2.2-uninstalled.pc.in.orig 2004-03-05 13:02:29 +0100 +++ libgnomeprint/libgnomeprint-2.2-uninstalled.pc.in 2005-08-14 11:11:35 +0200 d55 2 a56 2 --- libgnomeprint/libgnomeprint-2.2.pc.in.orig 2003-06-25 00:16:05 +0200 +++ libgnomeprint/libgnomeprint-2.2.pc.in 2005-08-14 11:11:35 +0200 d66 1 a66 1 Requires: libart-2.0 glib-2.0 gmodule-2.0 gobject-2.0 libxml-2.0 pango d72 3 a74 3 --- tests/tools/xmlfix.c.orig 2002-08-29 19:12:52 +0200 +++ tests/tools/xmlfix.c 2005-08-14 11:11:35 +0200 @@@@ -30,13 +30,9 @@@@ @ 1.1.2.1 log @file libgnomeprint.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:51:54 +0000 @ text @d1 90 @ 1.1.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 90 Index: configure --- configure.orig 2005-04-19 17:02:39 +0200 +++ configure 2005-08-14 11:11:35 +0200 @@@@ -24097,11 +24097,11 @@@@ -GNOME_PRINT_MODULES_DIR='${libdir}/libgnomeprint/${VERSION}/modules' +GNOME_PRINT_MODULES_DIR='${libdir}/libgnomeprint/modules' GNOME_PRINT_MODULES_DIR=$GNOME_PRINT_MODULES_DIR -GNOME_PRINT_DATA_DIR='${datadir}/libgnomeprint/${VERSION}' +GNOME_PRINT_DATA_DIR='${datadir}/libgnomeprint' GNOME_PRINT_DATA_DIR=$GNOME_PRINT_DATA_DIR Index: libgnomeprint/Makefile.in --- libgnomeprint/Makefile.in.orig 2005-06-11 15:54:03 +0200 +++ libgnomeprint/Makefile.in 2005-08-14 11:11:35 +0200 @@@@ -344,7 +344,7 @@@@ $(temp_sources) -libgnomeprintincdir = $(includedir)/libgnomeprint-2.2/libgnomeprint +libgnomeprintincdir = $(includedir)/libgnomeprint libgnomeprintinc_HEADERS = \ $(nox_headers) \ $(font_headers) \ Index: libgnomeprint/gpa/Makefile.in --- libgnomeprint/gpa/Makefile.in.orig 2005-04-19 17:02:42 +0200 +++ libgnomeprint/gpa/Makefile.in 2005-08-14 11:14:34 +0200 @@@@ -246,7 +246,7 @@@@ gpa-utils.c gpa-utils.h -libgpaincdir = $(includedir)/libgnomeprint-2.2/libgnomeprint/private +libgpaincdir = $(includedir)/libgnomeprint/private libgpainc_HEADERS = \ gpa-node.h \ Index: libgnomeprint/libgnomeprint-2.2-uninstalled.pc.in --- libgnomeprint/libgnomeprint-2.2-uninstalled.pc.in.orig 2004-03-05 13:02:29 +0100 +++ libgnomeprint/libgnomeprint-2.2-uninstalled.pc.in 2005-08-14 11:11:35 +0200 @@@@ -3,7 +3,7 @@@@ libdir=@@libdir@@ includedir=@@includedir@@ -privateincludedir=${includedir}/libgnomeprint-2.2/libgnomeprint/private +privateincludedir=${includedir}/libgnomeprint/private Name: libgnomeprint-2.2 Description: libgnomeprint - Printing library for gtk+ based applications Index: libgnomeprint/libgnomeprint-2.2.pc.in --- libgnomeprint/libgnomeprint-2.2.pc.in.orig 2003-06-25 00:16:05 +0200 +++ libgnomeprint/libgnomeprint-2.2.pc.in 2005-08-14 11:11:35 +0200 @@@@ -3,11 +3,11 @@@@ libdir=@@libdir@@ includedir=@@includedir@@ -privateincludedir=${includedir}/libgnomeprint-2.2/libgnomeprint/private +privateincludedir=${includedir}/libgnomeprint/private Name: libgnomeprint-2.2 Description: libgnomeprint - Printing library for gtk+ based applications Requires: libart-2.0 glib-2.0 gmodule-2.0 gobject-2.0 libxml-2.0 pango Version: @@VERSION@@ Libs: -L${libdir} -lgnomeprint-2-2 -lz -Cflags: -I${includedir}/libgnomeprint-2.2 +Cflags: -I${includedir} Index: tests/tools/xmlfix.c --- tests/tools/xmlfix.c.orig 2002-08-29 19:12:52 +0200 +++ tests/tools/xmlfix.c 2005-08-14 11:11:35 +0200 @@@@ -30,13 +30,9 @@@@ exit (-1); } -/* #undef xmlStringText */ -const xmlChar xmlStringText[] = { 't', 'e', 'x', 't', 0 }; -/* #undef xmlStringTextNoenc */ -const xmlChar xmlStringTextNoenc[] = - { 't', 'e', 'x', 't', 'n', 'o', 'e', 'n', 'c', 0 }; -/* #undef xmlStringComment */ -const xmlChar xmlStringComment[] = { 'c', 'o', 'm', 'm', 'e', 'n', 't', 0 }; +extern const xmlChar xmlStringText[]; +extern const xmlChar xmlStringTextNoenc[]; +extern const xmlChar xmlStringComment[]; static xmlNodePtr xmlStaticCopyNodeList (xmlNodePtr node, xmlDocPtr doc, xmlNodePtr parent); @