head 1.4; access; symbols OPENPKG_E1_MP_HEAD:1.1 OPENPKG_E1_MP:1.1 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.4 date 2009.08.26.17.49.13; author rse; state Exp; branches; next 1.3; commitid VgnndbFxUG7Dpe1u; 1.3 date 2008.10.26.18.32.33; author rse; state Exp; branches; next 1.2; commitid yxJshP5SrxJkqaot; 1.2 date 2007.09.11.05.59.43; author rse; state Exp; branches; next 1.1; commitid 2tRTjj8emUM9thxs; 1.1 date 2006.06.06.11.58.20; author rse; state Exp; branches 1.1.2.1; next ; commitid vtKH6Oy689ETiWzr; 1.1.2.1 date 2006.06.06.11.58.20; author rse; state dead; branches; next 1.1.2.2; commitid iZxwRSmmWscPXUQr; 1.1.2.2 date 2006.10.16.14.52.04; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; desc @@ 1.4 log @upgrading package: libsigcxx 2.2.3 -> 2.2.4 @ text @Index: Makefile.in --- Makefile.in.orig 2009-08-25 16:39:33 +0200 +++ Makefile.in 2009-08-26 19:42:30 +0200 @@@@ -239,7 +239,7 @@@@ ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS} @@ENABLE_DOCUMENTATION_FALSE@@doc_subdirs = @@ENABLE_DOCUMENTATION_TRUE@@doc_subdirs = docs -SUBDIRS = sigc++ tests examples $(doc_subdirs) +SUBDIRS = sigc++ sigc_configdir = $(libdir)/$(SIGCXX_MODULE_NAME)/include nodist_sigc_config_HEADERS = sigc++config.h pkgconfigdir = $(libdir)/pkgconfig Index: sigc++.pc.in --- sigc++.pc.in.orig 2009-08-25 16:06:32 +0200 +++ sigc++.pc.in 2009-08-26 19:42:56 +0200 @@@@ -14,5 +14,5 @@@@ Description: Typesafe signal and callback system for C++ Version: @@PACKAGE_VERSION@@ URL: http://libsigc.sourceforge.net/ -Libs: -L${libdir} -lsigc-@@SIGCXX_API_VERSION@@ -Cflags: -I${includedir}/sigc++-@@SIGCXX_API_VERSION@@ -I${libdir}/sigc++-@@SIGCXX_API_VERSION@@/include +Libs: -L${libdir} -lsigc +Cflags: -I${includedir}/sigc++ Index: sigc++/Makefile.in --- sigc++/Makefile.in.orig 2009-08-25 16:39:33 +0200 +++ sigc++/Makefile.in 2009-08-26 19:43:34 +0200 @@@@ -299,7 +299,7 @@@@ dist_noinst_DATA = $(sigc_m4) library_includedir = $(includedir)/$(SIGCXX_MODULE_NAME)/sigc++ nobase_library_include_HEADERS = sigc++.h $(sigc_public_h) $(sigc_built_h) -lib_LTLIBRARIES = libsigc-@@SIGCXX_API_VERSION@@.la +lib_LTLIBRARIES = libsigc.la libsigc_@@SIGCXX_API_VERSION@@_la_SOURCES = \ signal.cc \ signal_base.cc \ @@@@ -397,7 +397,7 @@@@ @@: > adaptors/lambda/$(DEPDIR)/$(am__dirstamp) adaptors/lambda/lambda.lo: adaptors/lambda/$(am__dirstamp) \ adaptors/lambda/$(DEPDIR)/$(am__dirstamp) -libsigc-@@SIGCXX_API_VERSION@@.la: $(libsigc_@@SIGCXX_API_VERSION@@_la_OBJECTS) $(libsigc_@@SIGCXX_API_VERSION@@_la_DEPENDENCIES) +libsigc.la: $(libsigc_@@SIGCXX_API_VERSION@@_la_OBJECTS) $(libsigc_@@SIGCXX_API_VERSION@@_la_DEPENDENCIES) $(libsigc_@@SIGCXX_API_VERSION@@_la_LINK) -rpath $(libdir) $(libsigc_@@SIGCXX_API_VERSION@@_la_OBJECTS) $(libsigc_@@SIGCXX_API_VERSION@@_la_LIBADD) $(LIBS) mostlyclean-compile: @ 1.3 log @upgrading package: libsigcxx 2.0.18 -> 2.2.3 @ text @d2 7 a8 7 --- Makefile.in.orig 2008-10-14 17:52:18 +0200 +++ Makefile.in 2008-10-26 19:30:20 +0100 @@@@ -210,7 +210,7 @@@@ # other stuff here EXTRA_DIST = autogen.sh sigc++config.h.in libsigc++-2.0.spec.in # ACLOCAL_FLAGS = -I scripts -SUBDIRS = sigc++ tests docs examples scripts MSVC_Net2005 MSVC_Net2008 d10 7 a16 8 DIST_SUBDIRS = $(SUBDIRS) sigc_configdir = $(libdir)/sigc++-2.0/include sigc_config_DATA = sigc++config.h Index: sigc++-2.0.pc.in --- sigc++-2.0.pc.in.orig 2008-02-26 20:44:35 +0100 +++ sigc++-2.0.pc.in 2008-10-26 19:29:59 +0100 @@@@ -6,5 +6,5 @@@@ Name: libsigc++ 2 d18 4 a21 3 Version: @@VERSION@@ -Libs: -L${libdir} -lsigc-2.0 -Cflags: -I${includedir}/sigc++-2.0 -I${libdir}/sigc++-2.0/include d25 7 a31 7 --- sigc++/Makefile.in.orig 2008-10-14 17:52:18 +0200 +++ sigc++/Makefile.in 2008-10-26 19:29:59 +0100 @@@@ -267,7 +267,7 @@@@ @@PLATFORM_WIN32_TRUE@@win32_dlls_ldflags = -no-undefined -Wl,--export-all-symbols # build the library -lib_LTLIBRARIES = libsigc-2.0.la d33 10 a42 10 libsigc_2_0_la_SOURCES = signal.cc signal_base.cc trackable.cc connection.cc \ functors/slot.cc functors/slot_base.cc \ adaptors/lambda/lambda.cc @@@@ -345,7 +345,7 @@@@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libsigc-2.0.la: $(libsigc_2_0_la_OBJECTS) $(libsigc_2_0_la_DEPENDENCIES) +libsigc.la: $(libsigc_2_0_la_OBJECTS) $(libsigc_2_0_la_DEPENDENCIES) $(libsigc_2_0_la_LINK) -rpath $(libdir) $(libsigc_2_0_la_OBJECTS) $(libsigc_2_0_la_LIBADD) $(LIBS) @ 1.2 log @upgrading package: libsigcxx 2.0.17 -> 2.0.18 @ text @d2 3 a4 3 --- Makefile.in.orig 2007-09-10 17:26:26 +0200 +++ Makefile.in 2007-09-11 07:50:32 +0200 @@@@ -206,7 +206,7 @@@@ d8 1 a8 1 -SUBDIRS = sigc++ tests docs examples scripts MSVC_Net2003 d14 2 a15 2 --- sigc++-2.0.pc.in.orig 2007-08-13 13:17:42 +0200 +++ sigc++-2.0.pc.in 2007-09-11 07:50:32 +0200 d25 3 a27 3 --- sigc++/Makefile.in.orig 2007-09-10 17:26:25 +0200 +++ sigc++/Makefile.in 2007-09-11 07:57:46 +0200 @@@@ -263,7 +263,7 @@@@ d36 1 a36 1 @@@@ -341,7 +341,7 @@@@ @ 1.1 log @requires GNU make; cleanup packaging @ text @d1 12 d14 2 a15 2 --- sigc++-2.0.pc.in.orig 2004-04-12 23:53:37 +0200 +++ sigc++-2.0.pc.in 2006-06-06 13:49:27 +0200 d25 3 a27 3 --- sigc++/Makefile.in.orig 2005-12-20 09:42:07 +0100 +++ sigc++/Makefile.in 2006-06-06 13:52:33 +0200 @@@@ -261,7 +261,7 @@@@ d36 1 a36 1 @@@@ -339,7 +339,7 @@@@ d42 1 a42 1 $(CXXLINK) -rpath $(libdir) $(libsigc_2_0_la_LDFLAGS) $(libsigc_2_0_la_OBJECTS) $(libsigc_2_0_la_LIBADD) $(LIBS) a44 12 Index: Makefile.in --- Makefile.in.orig 2005-12-20 09:42:07 +0100 +++ Makefile.in 2006-06-06 13:54:30 +0200 @@@@ -205,7 +205,7 @@@@ # other stuff here EXTRA_DIST = autogen.sh sigc++config.h.in libsigc++-2.0.spec.in # ACLOCAL_FLAGS = -I scripts -SUBDIRS = sigc++ tests docs examples scripts MSVC_Net2003 +SUBDIRS = sigc++ DIST_SUBDIRS = $(SUBDIRS) sigc_configdir = $(libdir)/sigc++-2.0/include sigc_config_DATA = sigc++config.h @ 1.1.2.1 log @file libsigcxx.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:52:04 +0000 @ text @d1 44 @ 1.1.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 44 Index: sigc++-2.0.pc.in --- sigc++-2.0.pc.in.orig 2004-04-12 23:53:37 +0200 +++ sigc++-2.0.pc.in 2006-06-06 13:49:27 +0200 @@@@ -6,5 +6,5 @@@@ Name: libsigc++ 2 Description: Typesafe signal and callback system for C++ Version: @@VERSION@@ -Libs: -L${libdir} -lsigc-2.0 -Cflags: -I${includedir}/sigc++-2.0 -I${libdir}/sigc++-2.0/include +Libs: -L${libdir} -lsigc +Cflags: -I${includedir}/sigc++ Index: sigc++/Makefile.in --- sigc++/Makefile.in.orig 2005-12-20 09:42:07 +0100 +++ sigc++/Makefile.in 2006-06-06 13:52:33 +0200 @@@@ -261,7 +261,7 @@@@ @@PLATFORM_WIN32_TRUE@@win32_dlls_ldflags = -no-undefined -Wl,--export-all-symbols # build the library -lib_LTLIBRARIES = libsigc-2.0.la +lib_LTLIBRARIES = libsigc.la libsigc_2_0_la_SOURCES = signal.cc signal_base.cc trackable.cc connection.cc \ functors/slot.cc functors/slot_base.cc \ adaptors/lambda/lambda.cc @@@@ -339,7 +339,7 @@@@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libsigc-2.0.la: $(libsigc_2_0_la_OBJECTS) $(libsigc_2_0_la_DEPENDENCIES) +libsigc.la: $(libsigc_2_0_la_OBJECTS) $(libsigc_2_0_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(libsigc_2_0_la_LDFLAGS) $(libsigc_2_0_la_OBJECTS) $(libsigc_2_0_la_LIBADD) $(LIBS) mostlyclean-compile: Index: Makefile.in --- Makefile.in.orig 2005-12-20 09:42:07 +0100 +++ Makefile.in 2006-06-06 13:54:30 +0200 @@@@ -205,7 +205,7 @@@@ # other stuff here EXTRA_DIST = autogen.sh sigc++config.h.in libsigc++-2.0.spec.in # ACLOCAL_FLAGS = -I scripts -SUBDIRS = sigc++ tests docs examples scripts MSVC_Net2003 +SUBDIRS = sigc++ DIST_SUBDIRS = $(SUBDIRS) sigc_configdir = $(libdir)/sigc++-2.0/include sigc_config_DATA = sigc++config.h @