head	1.16;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.14
	OPENPKG_E1_MP:1.14
	OPENPKG_E1_MP_2_STABLE:1.11.2.2
	OPENPKG_E1_FP:1.11.2.2
	OPENPKG_2_STABLE_MP:1.11
	OPENPKG_2_STABLE_20061018:1.11.2.2
	OPENPKG_2_STABLE:1.11.0.2
	OPENPKG_CW_FP:1.5;
locks; strict;
comment	@# @;


1.16
date	2008.07.14.06.44.49;	author rse;	state Exp;
branches;
next	1.15;
commitid	fnXOQIoSt7iOQJat;

1.15
date	2008.03.21.12.22.26;	author rse;	state Exp;
branches;
next	1.14;
commitid	fjSVuFOYIFbOpZVs;

1.14
date	2007.01.04.17.10.46;	author rse;	state Exp;
branches;
next	1.13;
commitid	AGFWgiLXwJyAdd1s;

1.13
date	2006.11.12.09.07.35;	author rse;	state Exp;
branches;
next	1.12;
commitid	MS8ECbXh47hsfmUr;

1.12
date	2006.11.11.21.17.57;	author rse;	state Exp;
branches;
next	1.11;
commitid	UfuENA1XAob0kiUr;

1.11
date	2006.05.22.09.37.15;	author rse;	state Exp;
branches
	1.11.2.1;
next	1.10;
commitid	KKNUsTHeslho00yr;

1.10
date	2006.05.16.07.45.26;	author rse;	state Exp;
branches;
next	1.9;
commitid	L0QSi4OAtnnZzdxr;

1.9
date	2006.05.04.08.27.01;	author rse;	state Exp;
branches;
next	1.8;
commitid	0FLgOrKorvCacGvr;

1.8
date	2005.09.09.08.15.26;	author steve;	state Exp;
branches;
next	1.7;

1.7
date	2005.08.14.07.41.03;	author rse;	state Exp;
branches;
next	1.6;

1.6
date	2005.08.02.17.44.16;	author thl;	state Exp;
branches;
next	1.5;

1.5
date	2004.12.26.08.42.26;	author rse;	state Exp;
branches;
next	1.4;

1.4
date	2004.11.16.09.57.50;	author rse;	state Exp;
branches;
next	1.3;

1.3
date	2004.10.18.07.56.55;	author rse;	state Exp;
branches;
next	1.2;

1.2
date	2004.08.26.09.08.21;	author tho;	state Exp;
branches;
next	1.1;

1.1
date	2004.08.14.09.00.56;	author rse;	state Exp;
branches;
next	;

1.11.2.1
date	2006.05.22.09.37.15;	author rse;	state dead;
branches;
next	1.11.2.2;
commitid	iZxwRSmmWscPXUQr;

1.11.2.2
date	2006.10.16.14.51.51;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.16
log
@upgrading package: libextractor 0.5.20b -> 0.5.20c
@
text
@Index: configure
--- configure.orig	2008-07-14 03:33:26 +0200
+++ configure	2008-07-14 08:34:09 +0200
@@@@ -40732,20 +40732,6 @@@@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${HAVE_MPEG2_TRUE}" && test -z "${HAVE_MPEG2_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"HAVE_MPEG2\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HAVE_MPEG2\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${HAVE_MPEG2_TRUE}" && test -z "${HAVE_MPEG2_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"HAVE_MPEG2\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HAVE_MPEG2\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 if test -z "${HAVE_GLIB_TRUE}" && test -z "${HAVE_GLIB_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"HAVE_GLIB\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
Index: src/main/Makefile.in
--- src/main/Makefile.in.orig	2008-07-14 03:33:39 +0200
+++ src/main/Makefile.in	2008-07-14 08:34:09 +0200
@@@@ -90,6 +90,7 @@@@
 	getopt1.$(OBJEXT)
 extract_OBJECTS = $(am_extract_OBJECTS)
 extract_DEPENDENCIES = $(top_builddir)/src/main/libextractor.la
+extract_LDFLAGS = -static
 am_test_binary_OBJECTS = test_binary.$(OBJEXT)
 test_binary_OBJECTS = $(am_test_binary_OBJECTS)
 test_binary_DEPENDENCIES = $(top_builddir)/src/main/libextractor.la
@@@@ -313,7 +314,8 @@@@
   libextractor.la 
 
 extract_LDADD = \
-  $(top_builddir)/src/main/libextractor.la 
+  $(top_builddir)/src/main/libextractor.la \
+  $(top_builddir)/libltdl/libltdl.la
 
 @@MINGW_FALSE@@@@SOMEBSD_FALSE@@dlflag = -ldl
 @@HAVE_ZLIB_TRUE@@zlib = -lz
Index: src/plugins/Makefile.in
--- src/plugins/Makefile.in.orig	2008-07-14 03:33:45 +0200
+++ src/plugins/Makefile.in	2008-07-14 08:35:05 +0200
@@@@ -199,7 +199,7 @@@@
 	$(libextractor_mp3_la_LDFLAGS) $(LDFLAGS) -o $@@
 libextractor_mpeg_la_DEPENDENCIES =
 am__libextractor_mpeg_la_SOURCES_DIST = mpegextractor.c
-@@HAVE_MPEG2_TRUE@@am_libextractor_mpeg_la_OBJECTS = mpegextractor.lo
+@@HAVE_MPEG2_TRUE@@am_libextractor_mpeg_la_OBJECTS =
 libextractor_mpeg_la_OBJECTS = $(am_libextractor_mpeg_la_OBJECTS)
 libextractor_mpeg_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@@@ -500,14 +500,14 @@@@
 LDFLAGS = @@LDFLAGS@@
 LIBADD_DL = @@LIBADD_DL@@
 LIBEXT = @@LIBEXT@@
-LIBICONV = @@LIBICONV@@
+LIBICONV =
 LIBINTL = @@LIBINTL@@
 LIBLTDL = @@LIBLTDL@@
 LIBMULTITHREAD = @@LIBMULTITHREAD@@
 LIBOBJS = @@LIBOBJS@@
 LIBPTH = @@LIBPTH@@
 LIBS = \
- @@LTLIBINTL@@ @@LIBS@@
+ @@LIBS@@
 
 LIBTHREAD = @@LIBTHREAD@@
 LIBTOOL = @@LIBTOOL@@
@@@@ -1532,23 +1532,6 @@@@
 
 
 install-exec-hook:
-	mkdir -p $(DESTDIR)$(plugindir) &> /dev/null || true
-	rm -f $(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT)
-	rm -f $(DESTDIR)$(plugindir)/libextractor_thumbnail.la
-	if test "$(thumbffmpeg)" != ""; then \
-		$(LN_S) $(plugindir)/libextractor_thumbnailffmpeg$(LIBEXT) \
-			$(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT); \
-	else \
-		if test "$(thumbgtk)" != ""; then \
-			$(LN_S) $(plugindir)/libextractor_thumbnailgtk$(LIBEXT) \
-				$(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT); \
-		else \
-			if test "$(thumbqt)" != ""; then \
-				$(LN_S) $(plugindir)/libextractor_thumbnailqt$(LIBEXT) \
-					$(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT); \
-			fi \
-		fi \
-	fi
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
Index: src/plugins/exiv2/Makefile.in
--- src/plugins/exiv2/Makefile.in.orig	2008-07-14 03:33:45 +0200
+++ src/plugins/exiv2/Makefile.in	2008-07-14 08:35:23 +0200
@@@@ -192,14 +192,14 @@@@
 LDFLAGS = @@LDFLAGS@@
 LIBADD_DL = @@LIBADD_DL@@
 LIBEXT = @@LIBEXT@@
-LIBICONV = @@LIBICONV@@
+LIBICONV =
 LIBINTL = @@LIBINTL@@
 LIBLTDL = @@LIBLTDL@@
 LIBMULTITHREAD = @@LIBMULTITHREAD@@
 LIBOBJS = @@LIBOBJS@@
 LIBPTH = @@LIBPTH@@
 LIBS = \
- @@LTLIBINTL@@ @@LIBS@@
+ @@LIBS@@
 
 LIBTHREAD = @@LIBTHREAD@@
 LIBTOOL = @@LIBTOOL@@
Index: src/plugins/hash/Makefile.in
--- src/plugins/hash/Makefile.in.orig	2008-07-14 03:33:46 +0200
+++ src/plugins/hash/Makefile.in	2008-07-14 08:35:41 +0200
@@@@ -199,14 +199,14 @@@@
 LDFLAGS = @@LDFLAGS@@
 LIBADD_DL = @@LIBADD_DL@@
 LIBEXT = @@LIBEXT@@
-LIBICONV = @@LIBICONV@@
+LIBICONV =
 LIBINTL = @@LIBINTL@@
 LIBLTDL = @@LIBLTDL@@
 LIBMULTITHREAD = @@LIBMULTITHREAD@@
 LIBOBJS = @@LIBOBJS@@
 LIBPTH = @@LIBPTH@@
 LIBS = \
- @@LTLIBINTL@@ @@LIBS@@
+ @@LIBS@@
 
 LIBTHREAD = @@LIBTHREAD@@
 LIBTOOL = @@LIBTOOL@@
Index: src/plugins/ole2/Makefile.in
--- src/plugins/ole2/Makefile.in.orig	2008-07-14 03:33:46 +0200
+++ src/plugins/ole2/Makefile.in	2008-07-14 08:35:55 +0200
@@@@ -173,14 +173,14 @@@@
 LDFLAGS = @@LDFLAGS@@
 LIBADD_DL = @@LIBADD_DL@@
 LIBEXT = @@LIBEXT@@
-LIBICONV = @@LIBICONV@@
+LIBICONV =
 LIBINTL = @@LIBINTL@@
 LIBLTDL = @@LIBLTDL@@
 LIBMULTITHREAD = @@LIBMULTITHREAD@@
 LIBOBJS = @@LIBOBJS@@
 LIBPTH = @@LIBPTH@@
 LIBS = \
- @@LTLIBINTL@@ @@LIBS@@
+ @@LIBS@@
 
 LIBTHREAD = @@LIBTHREAD@@
 LIBTOOL = @@LIBTOOL@@
Index: src/plugins/oo/Makefile.in
--- src/plugins/oo/Makefile.in.orig	2008-07-14 03:33:46 +0200
+++ src/plugins/oo/Makefile.in	2008-07-14 08:36:06 +0200
@@@@ -179,14 +179,14 @@@@
 LDFLAGS = @@LDFLAGS@@
 LIBADD_DL = @@LIBADD_DL@@
 LIBEXT = @@LIBEXT@@
-LIBICONV = @@LIBICONV@@
+LIBICONV =
 LIBINTL = @@LIBINTL@@
 LIBLTDL = @@LIBLTDL@@
 LIBMULTITHREAD = @@LIBMULTITHREAD@@
 LIBOBJS = @@LIBOBJS@@
 LIBPTH = @@LIBPTH@@
 LIBS = \
- @@LTLIBINTL@@ @@LIBS@@
+ @@LIBS@@
 
 LIBTHREAD = @@LIBTHREAD@@
 LIBTOOL = @@LIBTOOL@@
Index: src/plugins/pdf/Makefile.in
--- src/plugins/pdf/Makefile.in.orig	2008-07-14 03:33:47 +0200
+++ src/plugins/pdf/Makefile.in	2008-07-14 08:36:20 +0200
@@@@ -180,14 +180,14 @@@@
 LDFLAGS = @@LDFLAGS@@
 LIBADD_DL = @@LIBADD_DL@@
 LIBEXT = @@LIBEXT@@
-LIBICONV = @@LIBICONV@@
+LIBICONV =
 LIBINTL = @@LIBINTL@@
 LIBLTDL = @@LIBLTDL@@
 LIBMULTITHREAD = @@LIBMULTITHREAD@@
 LIBOBJS = @@LIBOBJS@@
 LIBPTH = @@LIBPTH@@
 LIBS = \
- @@LTLIBINTL@@ @@LIBS@@
+ @@LIBS@@
 
 LIBTHREAD = @@LIBTHREAD@@
 LIBTOOL = @@LIBTOOL@@
Index: src/plugins/printable/Makefile.in
--- src/plugins/printable/Makefile.in.orig	2008-07-14 03:33:48 +0200
+++ src/plugins/printable/Makefile.in	2008-07-14 08:36:32 +0200
@@@@ -356,14 +356,14 @@@@
 LDFLAGS = @@LDFLAGS@@
 LIBADD_DL = @@LIBADD_DL@@
 LIBEXT = @@LIBEXT@@
-LIBICONV = @@LIBICONV@@
+LIBICONV =
 LIBINTL = @@LIBINTL@@
 LIBLTDL = @@LIBLTDL@@
 LIBMULTITHREAD = @@LIBMULTITHREAD@@
 LIBOBJS = @@LIBOBJS@@
 LIBPTH = @@LIBPTH@@
 LIBS = \
- @@LTLIBINTL@@ @@LIBS@@
+ @@LIBS@@
 
 LIBTHREAD = @@LIBTHREAD@@
 LIBTOOL = @@LIBTOOL@@
Index: src/plugins/rpm/Makefile.in
--- src/plugins/rpm/Makefile.in.orig	2008-07-14 03:33:48 +0200
+++ src/plugins/rpm/Makefile.in	2008-07-14 08:36:44 +0200
@@@@ -178,14 +178,14 @@@@
 LDFLAGS = @@LDFLAGS@@
 LIBADD_DL = @@LIBADD_DL@@
 LIBEXT = @@LIBEXT@@
-LIBICONV = @@LIBICONV@@
+LIBICONV =
 LIBINTL = @@LIBINTL@@
 LIBLTDL = @@LIBLTDL@@
 LIBMULTITHREAD = @@LIBMULTITHREAD@@
 LIBOBJS = @@LIBOBJS@@
 LIBPTH = @@LIBPTH@@
 LIBS = \
- @@LTLIBINTL@@ @@LIBS@@
+ @@LIBS@@
 
 LIBTHREAD = @@LIBTHREAD@@
 LIBTOOL = @@LIBTOOL@@
Index: src/plugins/thumbnail/Makefile.in
--- src/plugins/thumbnail/Makefile.in.orig	2008-07-14 03:33:48 +0200
+++ src/plugins/thumbnail/Makefile.in	2008-07-14 08:36:57 +0200
@@@@ -172,14 +172,14 @@@@
 LDFLAGS = @@LDFLAGS@@
 LIBADD_DL = @@LIBADD_DL@@
 LIBEXT = @@LIBEXT@@
-LIBICONV = @@LIBICONV@@
+LIBICONV =
 LIBINTL = @@LIBINTL@@
 LIBLTDL = @@LIBLTDL@@
 LIBMULTITHREAD = @@LIBMULTITHREAD@@
 LIBOBJS = @@LIBOBJS@@
 LIBPTH = @@LIBPTH@@
 LIBS = \
- @@LTLIBINTL@@ @@LIBS@@
+ @@LIBS@@
 
 LIBTHREAD = @@LIBTHREAD@@
 LIBTOOL = @@LIBTOOL@@
@@@@ -295,7 +295,7 @@@@
   $(GLIB_CFLAGS) $(GTK_CFLAGS)
 
 libextractor_thumbnailgtk_la_LIBADD = \
-  $(LIBADD) -lgobject-2.0 @@GTK_LIBS@@ \
+  $(LIBADD) -lgobject2 @@GTK_LIBS@@ \
   $(top_builddir)/src/main/libextractor.la 
 
 libextractor_thumbnailgtk_la_LDFLAGS = \
@


1.15
log
@upgrading package: libextractor 0.5.18 -> 0.5.20
@
text
@d2 3
a4 3
--- configure.orig	2008-03-21 06:40:45 +0100
+++ configure	2008-03-21 12:44:50 +0100
@@@@ -33577,20 +33577,6 @@@@
d26 3
a28 3
--- src/main/Makefile.in.orig	2008-03-21 06:40:55 +0100
+++ src/main/Makefile.in	2008-03-21 12:44:50 +0100
@@@@ -79,6 +79,7 @@@@
d36 1
a36 1
@@@@ -269,7 +270,8 @@@@
d47 3
a49 3
--- src/plugins/Makefile.in.orig	2008-03-21 06:40:55 +0100
+++ src/plugins/Makefile.in	2008-03-21 12:44:50 +0100
@@@@ -187,7 +187,7 @@@@
d58 1
a58 1
@@@@ -467,12 +467,12 @@@@
d66 1
d68 1
d73 1
d75 1
a75 2
 LN_S = @@LN_S@@
@@@@ -1484,18 +1484,6 @@@@
d82 2
a83 2
-	if test "$(thumbgtk)" != ""; then \
-		$(LN_S) $(plugindir)/libextractor_thumbnailgtk$(LIBEXT) \
d86 2
a87 2
-		if test "$(thumbqt)" != ""; then \
-			$(LN_S) $(plugindir)/libextractor_thumbnailqt$(LIBEXT) \
d89 7
a95 2
-		fi; \
-	fi;
d100 3
a102 3
--- src/plugins/exiv2/Makefile.in.orig	2008-03-21 06:40:56 +0100
+++ src/plugins/exiv2/Makefile.in	2008-03-21 12:44:50 +0100
@@@@ -161,12 +161,12 @@@@
d110 1
d112 1
d117 1
a118 1
 LN_S = @@LN_S@@
d120 3
a122 3
--- src/plugins/hash/Makefile.in.orig	2008-03-21 06:40:56 +0100
+++ src/plugins/hash/Makefile.in	2008-03-21 12:44:50 +0100
@@@@ -168,12 +168,12 @@@@
d130 1
d132 1
d137 1
a138 1
 LN_S = @@LN_S@@
d140 3
a142 3
--- src/plugins/ole2/Makefile.in.orig	2008-03-21 06:40:56 +0100
+++ src/plugins/ole2/Makefile.in	2008-03-21 12:44:50 +0100
@@@@ -142,12 +142,12 @@@@
d147 1
a147 1
+LIBICONV = 
d150 1
d152 1
d157 1
a158 1
 LN_S = @@LN_S@@
d160 3
a162 3
--- src/plugins/oo/Makefile.in.orig	2008-03-21 06:40:56 +0100
+++ src/plugins/oo/Makefile.in	2008-03-21 12:44:50 +0100
@@@@ -148,12 +148,12 @@@@
d167 1
a167 1
+LIBICONV = 
d170 1
d172 1
d177 1
a178 1
 LN_S = @@LN_S@@
d180 3
a182 3
--- src/plugins/pdf/Makefile.in.orig	2008-03-21 06:40:57 +0100
+++ src/plugins/pdf/Makefile.in	2008-03-21 12:44:50 +0100
@@@@ -149,12 +149,12 @@@@
d190 1
d192 1
d197 1
a198 1
 LN_S = @@LN_S@@
d200 3
a202 3
--- src/plugins/printable/Makefile.in.orig	2008-03-21 06:40:57 +0100
+++ src/plugins/printable/Makefile.in	2008-03-21 12:44:50 +0100
@@@@ -325,12 +325,12 @@@@
d210 1
d212 1
d217 1
a218 1
 LN_S = @@LN_S@@
d220 3
a222 3
--- src/plugins/rpm/Makefile.in.orig	2008-03-21 06:40:57 +0100
+++ src/plugins/rpm/Makefile.in	2008-03-21 12:44:50 +0100
@@@@ -147,12 +147,12 @@@@
d230 1
d232 1
d237 1
a238 1
 LN_S = @@LN_S@@
d240 3
a242 3
--- src/plugins/thumbnail/Makefile.in.orig	2008-03-21 06:40:58 +0100
+++ src/plugins/thumbnail/Makefile.in	2008-03-21 12:44:50 +0100
@@@@ -141,12 +141,12 @@@@
d247 1
a247 1
+LIBICONV = 
d250 1
d252 1
d257 1
d259 1
a259 2
 LN_S = @@LN_S@@
@@@@ -254,7 +254,7 @@@@
@


1.14
log
@upgrading package: libextractor 0.5.17 -> 0.5.17a
@
text
@d2 3
a4 3
--- configure.orig	2007-01-03 04:14:39 +0100
+++ configure	2007-01-04 08:55:01 +0100
@@@@ -30450,20 +30450,6 @@@@
d26 3
a28 3
--- src/main/Makefile.in.orig	2007-01-03 04:14:47 +0100
+++ src/main/Makefile.in	2007-01-04 08:53:22 +0100
@@@@ -73,6 +73,7 @@@@
d36 1
a36 1
@@@@ -293,7 +294,8 @@@@
d47 4
a50 4
--- src/plugins/Makefile.in.orig	2007-01-03 04:14:48 +0100
+++ src/plugins/Makefile.in	2007-01-04 08:53:22 +0100
@@@@ -112,7 +112,7 @@@@
 libextractor_mp3_la_OBJECTS = $(am_libextractor_mp3_la_OBJECTS)
d56 3
a58 3
 libextractor_nsf_la_DEPENDENCIES =  \
 	$(top_builddir)/src/main/libextractor.la
@@@@ -374,12 +374,12 @@@@
d73 1
a73 1
@@@@ -1336,21 +1336,6 @@@@
d78 6
a83 3
-	rm -f $(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT); \
-	rm -f $(DESTDIR)$(plugindir)/libextractor_thumbnail.la; \
-	if test "$(thumbdir)" != ""; then \
a86 3
-		else \
-			$(LN_S) $(plugindir)/libextractor_thumbnailgtk$(LIBEXT) \
-				$(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT); \
a87 3
-	else \
-		$(LN_S) $(plugindir)/libextractor_thumbnailqt$(LIBEXT) \
-			$(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT); \
d93 3
a95 3
--- src/plugins/exiv2/Makefile.in.orig	2007-01-03 04:14:48 +0100
+++ src/plugins/exiv2/Makefile.in	2007-01-04 08:53:22 +0100
@@@@ -192,12 +192,12 @@@@
d111 3
a113 3
--- src/plugins/hash/Makefile.in.orig	2007-01-03 04:14:48 +0100
+++ src/plugins/hash/Makefile.in	2007-01-04 08:53:22 +0100
@@@@ -181,12 +181,12 @@@@
d129 3
a131 3
--- src/plugins/ole2/Makefile.in.orig	2007-01-03 04:14:49 +0100
+++ src/plugins/ole2/Makefile.in	2007-01-04 08:53:22 +0100
@@@@ -163,12 +163,12 @@@@
d147 3
a149 3
--- src/plugins/oo/Makefile.in.orig	2007-01-03 04:14:49 +0100
+++ src/plugins/oo/Makefile.in	2007-01-04 08:53:22 +0100
@@@@ -167,12 +167,12 @@@@
d165 3
a167 3
--- src/plugins/pdf/Makefile.in.orig	2007-01-03 04:14:49 +0100
+++ src/plugins/pdf/Makefile.in	2007-01-04 08:53:22 +0100
@@@@ -184,12 +184,12 @@@@
d183 3
a185 3
--- src/plugins/printable/Makefile.in.orig	2007-01-03 04:14:50 +0100
+++ src/plugins/printable/Makefile.in	2007-01-04 08:53:22 +0100
@@@@ -493,12 +493,12 @@@@
d201 3
a203 3
--- src/plugins/rpm/Makefile.in.orig	2007-01-03 04:14:50 +0100
+++ src/plugins/rpm/Makefile.in	2007-01-04 08:53:22 +0100
@@@@ -166,12 +166,12 @@@@
d219 3
a221 3
--- src/plugins/thumbnail/Makefile.in.orig	2007-01-03 04:14:51 +0100
+++ src/plugins/thumbnail/Makefile.in	2007-01-04 08:53:22 +0100
@@@@ -162,12 +162,12 @@@@
d236 1
a236 1
@@@@ -278,7 +278,7 @@@@
@


1.13
log
@upgrading package: libextractor 0.5.15 -> 0.5.16
@
text
@d2 4
a5 3
--- configure.orig	2006-11-12 05:56:28 +0100
+++ configure	2006-11-12 09:58:43 +0100
@@@@ -35550,8 +35550,3 @@@@
d8 13
a20 5
 
-if test "x$HAVE_MPEG2_TRUE" = "x#"
-then
- { echo "$as_me:$LINENO: NOTICE: libmpeg2 not found" >&5
-echo "$as_me: NOTICE: libmpeg2 not found" >&6;}
d22 3
d26 3
a28 3
--- src/main/Makefile.in.orig	2006-11-12 05:56:22 +0100
+++ src/main/Makefile.in	2006-11-12 09:59:41 +0100
@@@@ -72,6 +72,7 @@@@
d36 1
a36 1
@@@@ -286,7 +287,8 @@@@
d47 3
a49 3
--- src/plugins/Makefile.in.orig	2006-11-12 05:56:23 +0100
+++ src/plugins/Makefile.in	2006-11-12 10:00:14 +0100
@@@@ -111,7 +111,7 @@@@
d58 1
a58 1
@@@@ -365,12 +365,12 @@@@
d73 1
a73 1
@@@@ -1280,21 +1280,6 @@@@
d96 3
a98 3
--- src/plugins/exiv2/Makefile.in.orig	2006-11-12 05:56:23 +0100
+++ src/plugins/exiv2/Makefile.in	2006-11-12 09:58:43 +0100
@@@@ -191,12 +191,12 @@@@
d114 3
a116 3
--- src/plugins/hash/Makefile.in.orig	2006-11-12 05:56:23 +0100
+++ src/plugins/hash/Makefile.in	2006-11-12 09:58:43 +0100
@@@@ -180,12 +180,12 @@@@
d132 3
a134 3
--- src/plugins/ole2/Makefile.in.orig	2006-11-12 05:56:23 +0100
+++ src/plugins/ole2/Makefile.in	2006-11-12 09:58:43 +0100
@@@@ -162,12 +162,12 @@@@
d150 3
a152 3
--- src/plugins/oo/Makefile.in.orig	2006-11-12 05:56:24 +0100
+++ src/plugins/oo/Makefile.in	2006-11-12 09:58:43 +0100
@@@@ -166,12 +166,12 @@@@
d168 3
a170 3
--- src/plugins/pdf/Makefile.in.orig	2006-11-12 05:56:24 +0100
+++ src/plugins/pdf/Makefile.in	2006-11-12 09:58:43 +0100
@@@@ -183,12 +183,12 @@@@
d186 3
a188 3
--- src/plugins/printable/Makefile.in.orig	2006-11-12 05:56:25 +0100
+++ src/plugins/printable/Makefile.in	2006-11-12 09:58:43 +0100
@@@@ -492,12 +492,12 @@@@
d204 3
a206 3
--- src/plugins/rpm/Makefile.in.orig	2006-11-12 05:56:25 +0100
+++ src/plugins/rpm/Makefile.in	2006-11-12 09:58:43 +0100
@@@@ -165,12 +165,12 @@@@
d222 3
a224 3
--- src/plugins/thumbnail/Makefile.in.orig	2006-11-12 05:56:25 +0100
+++ src/plugins/thumbnail/Makefile.in	2006-11-12 09:58:43 +0100
@@@@ -161,12 +161,12 @@@@
d239 1
a239 1
@@@@ -271,7 +271,7 @@@@
@


1.12
log
@upgrading package: libextractor 0.5.14 -> 0.5.15
@
text
@d2 3
a4 3
--- configure.orig	2006-09-06 23:07:19 +0200
+++ configure	2006-11-11 22:04:54 +0100
@@@@ -35545,8 +35545,3 @@@@
d14 3
a16 3
--- src/main/Makefile.in.orig	2006-09-06 23:07:45 +0200
+++ src/main/Makefile.in	2006-11-11 22:04:54 +0100
@@@@ -70,6 +70,7 @@@@
d24 1
a24 1
@@@@ -284,7 +285,8 @@@@
a33 9
@@@@ -293,7 +295,7 @@@@
   -export-dynamic -version-info 2:0:1 $(LIBICONV)
 
 libextractor_la_LIBADD = \
-  $(LIBLTDL) $(dlflag) $(zlib) $(bz2lib)
+  $(LIBLTDL) $(zlib) $(bz2lib)
 
 libextractor_la_DEPENDENCIES = \
   $(LIBLTDL) 
d35 2
a36 2
--- src/plugins/Makefile.in.orig	2006-09-06 23:07:15 +0200
+++ src/plugins/Makefile.in	2006-11-11 22:11:16 +0100
d44 3
a46 11
 libextractor_ogg_la_LIBADD =
 am__libextractor_ogg_la_SOURCES_DIST = oggextractor.c
@@@@ -186,7 +186,6 @@@@
 @@AMDEP_TRUE@@	./$(DEPDIR)/manextractor.Plo \
 @@AMDEP_TRUE@@	./$(DEPDIR)/mimeextractor.Plo \
 @@AMDEP_TRUE@@	./$(DEPDIR)/mp3extractor.Plo \
-@@AMDEP_TRUE@@	./$(DEPDIR)/mpegextractor.Plo \
 @@AMDEP_TRUE@@	./$(DEPDIR)/oggextractor.Plo ./$(DEPDIR)/pack.Plo \
 @@AMDEP_TRUE@@	./$(DEPDIR)/pdfextractor.Plo \
 @@AMDEP_TRUE@@	./$(DEPDIR)/pngextractor.Plo \
@@@@ -358,12 +357,12 @@@@
d61 1
a61 9
@@@@ -920,7 +919,6 @@@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/manextractor.Plo@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/mimeextractor.Plo@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/mp3extractor.Plo@@am__quote@@
-@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/mpegextractor.Plo@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/oggextractor.Plo@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/pack.Plo@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/pdfextractor.Plo@@am__quote@@
@@@@ -1260,20 +1258,6 @@@@
d65 1
d70 1
a70 1
-			$(LN_S) $(DESTDIR)$(plugindir)/libextractor_thumbnailqt$(LIBEXT) \
d73 1
a73 1
-			$(LN_S) $(DESTDIR)$(plugindir)/libextractor_thumbnailgtk$(LIBEXT) \
d77 1
a77 1
-		$(LN_S) $(DESTDIR)$(plugindir)/libextractor_thumbnailqt$(LIBEXT) \
d84 2
a85 2
--- src/plugins/exiv2/Makefile.in.orig	2006-09-06 23:07:15 +0200
+++ src/plugins/exiv2/Makefile.in	2006-11-11 22:04:54 +0100
d102 2
a103 2
--- src/plugins/hash/Makefile.in.orig	2006-09-06 23:07:15 +0200
+++ src/plugins/hash/Makefile.in	2006-11-11 22:04:54 +0100
d120 2
a121 2
--- src/plugins/ole2/Makefile.in.orig	2006-09-06 23:07:16 +0200
+++ src/plugins/ole2/Makefile.in	2006-11-11 22:04:54 +0100
d138 2
a139 2
--- src/plugins/oo/Makefile.in.orig	2006-09-06 23:07:16 +0200
+++ src/plugins/oo/Makefile.in	2006-11-11 22:04:54 +0100
d156 2
a157 2
--- src/plugins/pdf/Makefile.in.orig	2006-09-06 23:07:16 +0200
+++ src/plugins/pdf/Makefile.in	2006-11-11 22:04:54 +0100
d174 2
a175 2
--- src/plugins/printable/Makefile.in.orig	2006-09-06 23:07:17 +0200
+++ src/plugins/printable/Makefile.in	2006-11-11 22:04:54 +0100
d192 2
a193 2
--- src/plugins/rpm/Makefile.in.orig	2006-09-06 23:07:17 +0200
+++ src/plugins/rpm/Makefile.in	2006-11-11 22:04:54 +0100
d210 2
a211 2
--- src/plugins/thumbnail/Makefile.in.orig	2006-09-06 23:07:17 +0200
+++ src/plugins/thumbnail/Makefile.in	2006-11-11 22:04:54 +0100
@


1.11
log
@work-off packaging
@
text
@d2 3
a4 3
--- configure.orig	2006-05-17 11:07:22 +0200
+++ configure	2006-05-18 08:59:05 +0200
@@@@ -31623,9 +31623,3 @@@@
d10 2
a11 3
- { { echo "$as_me:$LINENO: error: FATAL: libmpeg2 not found" >&5
-echo "$as_me: error: FATAL: libmpeg2 not found" >&2;}
-   { (exit 1); exit 1; }; }
d14 2
a15 2
--- src/main/Makefile.in.orig	2006-05-17 11:07:29 +0200
+++ src/main/Makefile.in	2006-05-18 09:35:27 +0200
d24 2
a25 2
@@@@ -278,7 +279,8 @@@@
   -DPLUGIN_PATH="\"${plugindir}\""
d34 1
a34 1
@@@@ -287,7 +289,7 @@@@
d44 3
a46 4
--- src/plugins/Makefile.in.orig	2006-05-17 11:07:30 +0200
+++ src/plugins/Makefile.in	2006-05-18 08:59:05 +0200
@@@@ -110,7 +110,7 @@@@
 am_libextractor_mp3_la_OBJECTS = mp3extractor.lo
d49 3
a51 2
-am_libextractor_mpeg_la_OBJECTS = mpegextractor.lo
+am_libextractor_mpeg_la_OBJECTS = 
d55 1
a55 1
@@@@ -180,7 +180,6 @@@@
d63 1
a63 2
@@@@ -333,12 +332,12 @@@@
 ISOLOCALEDIR = @@ISOLOCALEDIR@@
d66 1
d68 1
a68 1
+LIBICONV = 
d78 1
a78 27
@@@@ -462,7 +461,6 @@@@
   libextractor_man.la \
   libextractor_mime.la \
   libextractor_mp3.la \
-  libextractor_mpeg.la \
   $(extraogg) \
   libextractor_png.la \
   libextractor_ps.la \
@@@@ -654,15 +652,11 @@@@
   $(top_builddir)/src/main/libextractor.la \
   $(PLUGINFLAGS)  $(retaincommand)
 
-libextractor_mpeg_la_SOURCES = \
-  mpegextractor.c 
+libextractor_mpeg_la_SOURCES =
 
-libextractor_mpeg_la_LDFLAGS = \
-  $(top_builddir)/src/main/libextractor.la \
-  $(PLUGINFLAGS)  $(retaincommand)
+libextractor_mpeg_la_LDFLAGS =
 
 libextractor_mpeg_la_LIBADD = \
-  -lmpeg2
 
 libextractor_man_la_SOURCES = \
   manextractor.c 
@@@@ -877,7 +871,6 @@@@
d86 21
d108 3
a110 4
--- src/plugins/exiv2/Makefile.in.orig	2006-05-17 11:07:31 +0200
+++ src/plugins/exiv2/Makefile.in	2006-05-18 08:59:05 +0200
@@@@ -185,12 +185,12 @@@@
 ISOLOCALEDIR = @@ISOLOCALEDIR@@
d113 1
d115 1
a115 1
+LIBICONV = 
d126 3
a128 4
--- src/plugins/hash/Makefile.in.orig	2006-05-17 11:07:31 +0200
+++ src/plugins/hash/Makefile.in	2006-05-18 08:59:05 +0200
@@@@ -174,12 +174,12 @@@@
 ISOLOCALEDIR = @@ISOLOCALEDIR@@
d131 1
d133 1
a133 1
+LIBICONV = 
d144 3
a146 4
--- src/plugins/ole2/Makefile.in.orig	2006-05-17 11:07:31 +0200
+++ src/plugins/ole2/Makefile.in	2006-05-18 08:59:05 +0200
@@@@ -156,12 +156,12 @@@@
 ISOLOCALEDIR = @@ISOLOCALEDIR@@
d149 1
d162 3
a164 4
--- src/plugins/oo/Makefile.in.orig	2006-05-17 11:07:32 +0200
+++ src/plugins/oo/Makefile.in	2006-05-18 08:59:05 +0200
@@@@ -160,12 +160,12 @@@@
 ISOLOCALEDIR = @@ISOLOCALEDIR@@
d167 1
d180 3
a182 4
--- src/plugins/pdf/Makefile.in.orig	2006-05-17 11:07:32 +0200
+++ src/plugins/pdf/Makefile.in	2006-05-18 08:59:05 +0200
@@@@ -177,12 +177,12 @@@@
 ISOLOCALEDIR = @@ISOLOCALEDIR@@
d185 1
d187 1
a187 1
+LIBICONV = 
d198 3
a200 4
--- src/plugins/printable/Makefile.in.orig	2006-05-17 11:07:33 +0200
+++ src/plugins/printable/Makefile.in	2006-05-18 08:59:05 +0200
@@@@ -486,12 +486,12 @@@@
 ISOLOCALEDIR = @@ISOLOCALEDIR@@
d203 1
d205 1
a205 1
+LIBICONV = 
d216 3
a218 4
--- src/plugins/rpm/Makefile.in.orig	2006-05-17 11:07:33 +0200
+++ src/plugins/rpm/Makefile.in	2006-05-18 08:59:05 +0200
@@@@ -159,12 +159,12 @@@@
 ISOLOCALEDIR = @@ISOLOCALEDIR@@
d221 1
d223 1
a223 1
+LIBICONV = 
d234 3
a236 4
--- src/plugins/thumbnail/Makefile.in.orig	2006-05-17 11:07:33 +0200
+++ src/plugins/thumbnail/Makefile.in	2006-05-18 08:59:05 +0200
@@@@ -155,12 +155,12 @@@@
 ISOLOCALEDIR = @@ISOLOCALEDIR@@
d239 1
d251 1
a251 1
@@@@ -262,7 +262,7 @@@@
d254 1
a254 1
 libextractor_thumbnail_la_LIBADD = \
d259 1
a259 1
 libextractor_thumbnail_la_LDFLAGS = \
@


1.11.2.1
log
@file libextractor.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:51:51 +0000
@
text
@d1 265
@


1.11.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 265
Index: configure
--- configure.orig	2006-05-17 11:07:22 +0200
+++ configure	2006-05-18 08:59:05 +0200
@@@@ -31623,9 +31623,3 @@@@
    { (exit 1); exit 1; }; }
 fi
 
-if test "x$HAVE_MPEG2_TRUE" = "x#"
-then
- { { echo "$as_me:$LINENO: error: FATAL: libmpeg2 not found" >&5
-echo "$as_me: error: FATAL: libmpeg2 not found" >&2;}
-   { (exit 1); exit 1; }; }
-fi
Index: src/main/Makefile.in
--- src/main/Makefile.in.orig	2006-05-17 11:07:29 +0200
+++ src/main/Makefile.in	2006-05-18 09:35:27 +0200
@@@@ -70,6 +70,7 @@@@
 	getopt1.$(OBJEXT)
 extract_OBJECTS = $(am_extract_OBJECTS)
 extract_DEPENDENCIES = $(top_builddir)/src/main/libextractor.la
+extract_LDFLAGS = -static
 am_test_binary_OBJECTS = test_binary.$(OBJEXT)
 test_binary_OBJECTS = $(am_test_binary_OBJECTS)
 test_binary_DEPENDENCIES = $(top_builddir)/src/main/libextractor.la
@@@@ -278,7 +279,8 @@@@
   -DPLUGIN_PATH="\"${plugindir}\""
 
 extract_LDADD = \
-  $(top_builddir)/src/main/libextractor.la 
+  $(top_builddir)/src/main/libextractor.la \
+  $(top_builddir)/libltdl/libltdl.la
 
 @@MINGW_FALSE@@@@SOMEBSD_FALSE@@dlflag = -ldl
 @@HAVE_ZLIB_TRUE@@zlib = -lz
@@@@ -287,7 +289,7 @@@@
   -export-dynamic -version-info 2:0:1 $(LIBICONV)
 
 libextractor_la_LIBADD = \
-  $(LIBLTDL) $(dlflag) $(zlib) $(bz2lib)
+  $(LIBLTDL) $(zlib) $(bz2lib)
 
 libextractor_la_DEPENDENCIES = \
   $(LIBLTDL) 
Index: src/plugins/Makefile.in
--- src/plugins/Makefile.in.orig	2006-05-17 11:07:30 +0200
+++ src/plugins/Makefile.in	2006-05-18 08:59:05 +0200
@@@@ -110,7 +110,7 @@@@
 am_libextractor_mp3_la_OBJECTS = mp3extractor.lo
 libextractor_mp3_la_OBJECTS = $(am_libextractor_mp3_la_OBJECTS)
 libextractor_mpeg_la_DEPENDENCIES =
-am_libextractor_mpeg_la_OBJECTS = mpegextractor.lo
+am_libextractor_mpeg_la_OBJECTS = 
 libextractor_mpeg_la_OBJECTS = $(am_libextractor_mpeg_la_OBJECTS)
 libextractor_ogg_la_LIBADD =
 am__libextractor_ogg_la_SOURCES_DIST = oggextractor.c
@@@@ -180,7 +180,6 @@@@
 @@AMDEP_TRUE@@	./$(DEPDIR)/manextractor.Plo \
 @@AMDEP_TRUE@@	./$(DEPDIR)/mimeextractor.Plo \
 @@AMDEP_TRUE@@	./$(DEPDIR)/mp3extractor.Plo \
-@@AMDEP_TRUE@@	./$(DEPDIR)/mpegextractor.Plo \
 @@AMDEP_TRUE@@	./$(DEPDIR)/oggextractor.Plo ./$(DEPDIR)/pack.Plo \
 @@AMDEP_TRUE@@	./$(DEPDIR)/pdfextractor.Plo \
 @@AMDEP_TRUE@@	./$(DEPDIR)/pngextractor.Plo \
@@@@ -333,12 +332,12 @@@@
 ISOLOCALEDIR = @@ISOLOCALEDIR@@
 LDFLAGS = @@LDFLAGS@@
 LIBADD_DL = @@LIBADD_DL@@
-LIBICONV = @@LIBICONV@@
+LIBICONV = 
 LIBINTL = @@LIBINTL@@
 LIBLTDL = @@LIBLTDL@@
 LIBOBJS = @@LIBOBJS@@
 LIBS = \
- @@LTLIBINTL@@ @@LIBS@@
+ @@LIBS@@
 
 LIBTOOL = @@LIBTOOL@@
 LN_S = @@LN_S@@
@@@@ -462,7 +461,6 @@@@
   libextractor_man.la \
   libextractor_mime.la \
   libextractor_mp3.la \
-  libextractor_mpeg.la \
   $(extraogg) \
   libextractor_png.la \
   libextractor_ps.la \
@@@@ -654,15 +652,11 @@@@
   $(top_builddir)/src/main/libextractor.la \
   $(PLUGINFLAGS)  $(retaincommand)
 
-libextractor_mpeg_la_SOURCES = \
-  mpegextractor.c 
+libextractor_mpeg_la_SOURCES =
 
-libextractor_mpeg_la_LDFLAGS = \
-  $(top_builddir)/src/main/libextractor.la \
-  $(PLUGINFLAGS)  $(retaincommand)
+libextractor_mpeg_la_LDFLAGS =
 
 libextractor_mpeg_la_LIBADD = \
-  -lmpeg2
 
 libextractor_man_la_SOURCES = \
   manextractor.c 
@@@@ -877,7 +871,6 @@@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/manextractor.Plo@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/mimeextractor.Plo@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/mp3extractor.Plo@@am__quote@@
-@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/mpegextractor.Plo@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/oggextractor.Plo@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/pack.Plo@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/pdfextractor.Plo@@am__quote@@
Index: src/plugins/exiv2/Makefile.in
--- src/plugins/exiv2/Makefile.in.orig	2006-05-17 11:07:31 +0200
+++ src/plugins/exiv2/Makefile.in	2006-05-18 08:59:05 +0200
@@@@ -185,12 +185,12 @@@@
 ISOLOCALEDIR = @@ISOLOCALEDIR@@
 LDFLAGS = @@LDFLAGS@@
 LIBADD_DL = @@LIBADD_DL@@
-LIBICONV = @@LIBICONV@@
+LIBICONV = 
 LIBINTL = @@LIBINTL@@
 LIBLTDL = @@LIBLTDL@@
 LIBOBJS = @@LIBOBJS@@
 LIBS = \
- @@LTLIBINTL@@ @@LIBS@@
+ @@LIBS@@
 
 LIBTOOL = @@LIBTOOL@@
 LN_S = @@LN_S@@
Index: src/plugins/hash/Makefile.in
--- src/plugins/hash/Makefile.in.orig	2006-05-17 11:07:31 +0200
+++ src/plugins/hash/Makefile.in	2006-05-18 08:59:05 +0200
@@@@ -174,12 +174,12 @@@@
 ISOLOCALEDIR = @@ISOLOCALEDIR@@
 LDFLAGS = @@LDFLAGS@@
 LIBADD_DL = @@LIBADD_DL@@
-LIBICONV = @@LIBICONV@@
+LIBICONV = 
 LIBINTL = @@LIBINTL@@
 LIBLTDL = @@LIBLTDL@@
 LIBOBJS = @@LIBOBJS@@
 LIBS = \
- @@LTLIBINTL@@ @@LIBS@@
+ @@LIBS@@
 
 LIBTOOL = @@LIBTOOL@@
 LN_S = @@LN_S@@
Index: src/plugins/ole2/Makefile.in
--- src/plugins/ole2/Makefile.in.orig	2006-05-17 11:07:31 +0200
+++ src/plugins/ole2/Makefile.in	2006-05-18 08:59:05 +0200
@@@@ -156,12 +156,12 @@@@
 ISOLOCALEDIR = @@ISOLOCALEDIR@@
 LDFLAGS = @@LDFLAGS@@
 LIBADD_DL = @@LIBADD_DL@@
-LIBICONV = @@LIBICONV@@
+LIBICONV = 
 LIBINTL = @@LIBINTL@@
 LIBLTDL = @@LIBLTDL@@
 LIBOBJS = @@LIBOBJS@@
 LIBS = \
- @@LTLIBINTL@@ @@LIBS@@
+ @@LIBS@@
 
 LIBTOOL = @@LIBTOOL@@
 LN_S = @@LN_S@@
Index: src/plugins/oo/Makefile.in
--- src/plugins/oo/Makefile.in.orig	2006-05-17 11:07:32 +0200
+++ src/plugins/oo/Makefile.in	2006-05-18 08:59:05 +0200
@@@@ -160,12 +160,12 @@@@
 ISOLOCALEDIR = @@ISOLOCALEDIR@@
 LDFLAGS = @@LDFLAGS@@
 LIBADD_DL = @@LIBADD_DL@@
-LIBICONV = @@LIBICONV@@
+LIBICONV = 
 LIBINTL = @@LIBINTL@@
 LIBLTDL = @@LIBLTDL@@
 LIBOBJS = @@LIBOBJS@@
 LIBS = \
- @@LTLIBINTL@@ @@LIBS@@
+ @@LIBS@@
 
 LIBTOOL = @@LIBTOOL@@
 LN_S = @@LN_S@@
Index: src/plugins/pdf/Makefile.in
--- src/plugins/pdf/Makefile.in.orig	2006-05-17 11:07:32 +0200
+++ src/plugins/pdf/Makefile.in	2006-05-18 08:59:05 +0200
@@@@ -177,12 +177,12 @@@@
 ISOLOCALEDIR = @@ISOLOCALEDIR@@
 LDFLAGS = @@LDFLAGS@@
 LIBADD_DL = @@LIBADD_DL@@
-LIBICONV = @@LIBICONV@@
+LIBICONV = 
 LIBINTL = @@LIBINTL@@
 LIBLTDL = @@LIBLTDL@@
 LIBOBJS = @@LIBOBJS@@
 LIBS = \
- @@LTLIBINTL@@ @@LIBS@@
+ @@LIBS@@
 
 LIBTOOL = @@LIBTOOL@@
 LN_S = @@LN_S@@
Index: src/plugins/printable/Makefile.in
--- src/plugins/printable/Makefile.in.orig	2006-05-17 11:07:33 +0200
+++ src/plugins/printable/Makefile.in	2006-05-18 08:59:05 +0200
@@@@ -486,12 +486,12 @@@@
 ISOLOCALEDIR = @@ISOLOCALEDIR@@
 LDFLAGS = @@LDFLAGS@@
 LIBADD_DL = @@LIBADD_DL@@
-LIBICONV = @@LIBICONV@@
+LIBICONV = 
 LIBINTL = @@LIBINTL@@
 LIBLTDL = @@LIBLTDL@@
 LIBOBJS = @@LIBOBJS@@
 LIBS = \
- @@LTLIBINTL@@ @@LIBS@@
+ @@LIBS@@
 
 LIBTOOL = @@LIBTOOL@@
 LN_S = @@LN_S@@
Index: src/plugins/rpm/Makefile.in
--- src/plugins/rpm/Makefile.in.orig	2006-05-17 11:07:33 +0200
+++ src/plugins/rpm/Makefile.in	2006-05-18 08:59:05 +0200
@@@@ -159,12 +159,12 @@@@
 ISOLOCALEDIR = @@ISOLOCALEDIR@@
 LDFLAGS = @@LDFLAGS@@
 LIBADD_DL = @@LIBADD_DL@@
-LIBICONV = @@LIBICONV@@
+LIBICONV = 
 LIBINTL = @@LIBINTL@@
 LIBLTDL = @@LIBLTDL@@
 LIBOBJS = @@LIBOBJS@@
 LIBS = \
- @@LTLIBINTL@@ @@LIBS@@
+ @@LIBS@@
 
 LIBTOOL = @@LIBTOOL@@
 LN_S = @@LN_S@@
Index: src/plugins/thumbnail/Makefile.in
--- src/plugins/thumbnail/Makefile.in.orig	2006-05-17 11:07:33 +0200
+++ src/plugins/thumbnail/Makefile.in	2006-05-18 08:59:05 +0200
@@@@ -155,12 +155,12 @@@@
 ISOLOCALEDIR = @@ISOLOCALEDIR@@
 LDFLAGS = @@LDFLAGS@@
 LIBADD_DL = @@LIBADD_DL@@
-LIBICONV = @@LIBICONV@@
+LIBICONV = 
 LIBINTL = @@LIBINTL@@
 LIBLTDL = @@LIBLTDL@@
 LIBOBJS = @@LIBOBJS@@
 LIBS = \
- @@LTLIBINTL@@ @@LIBS@@
+ @@LIBS@@
 
 LIBTOOL = @@LIBTOOL@@
 LN_S = @@LN_S@@
@@@@ -262,7 +262,7 @@@@
   $(GLIB_CFLAGS) $(GTK_CFLAGS)
 
 libextractor_thumbnail_la_LIBADD = \
-  $(LIBADD) -lgobject-2.0 @@GTK_LIBS@@ \
+  $(LIBADD) -lgobject2 @@GTK_LIBS@@ \
   $(top_builddir)/src/main/libextractor.la 
 
 libextractor_thumbnail_la_LDFLAGS = \
@


1.10
log
@requires GNU make
@
text
@d1 13
d15 3
a17 3
--- src/main/Makefile.in.orig	2006-04-22 20:33:16 +0200
+++ src/main/Makefile.in	2006-05-07 08:34:20 +0200
@@@@ -69,6 +69,7 @@@@
d25 11
a35 1
@@@@ -272,7 +273,7 @@@@
d45 21
a65 4
--- src/plugins/Makefile.in.orig	2006-04-22 20:33:17 +0200
+++ src/plugins/Makefile.in	2006-05-07 08:34:20 +0200
@@@@ -326,12 +326,12 @@@@
 INTLLIBS = @@INTLLIBS@@
d79 34
d114 4
a117 4
--- src/plugins/exiv2/Makefile.in.orig	2006-04-22 20:33:18 +0200
+++ src/plugins/exiv2/Makefile.in	2006-05-07 08:34:20 +0200
@@@@ -177,12 +177,12 @@@@
 INTLLIBS = @@INTLLIBS@@
d132 4
a135 4
--- src/plugins/hash/Makefile.in.orig	2006-04-22 20:33:18 +0200
+++ src/plugins/hash/Makefile.in	2006-05-07 08:34:20 +0200
@@@@ -166,12 +166,12 @@@@
 INTLLIBS = @@INTLLIBS@@
d150 4
a153 4
--- src/plugins/ole2/Makefile.in.orig	2006-04-22 20:33:19 +0200
+++ src/plugins/ole2/Makefile.in	2006-05-07 08:34:20 +0200
@@@@ -147,12 +147,12 @@@@
 INTLLIBS = @@INTLLIBS@@
a166 9
@@@@ -247,7 +247,7 @@@@
   $(GLIB_CFLAGS) 
 
 libextractor_ole2_la_LIBADD = \
-  $(LIBADD) $(GLIB_LIBS) -lgobject-2.0 \
+  $(LIBADD) $(GLIB_LIBS) -lgobject2 \
   $(top_builddir)/src/main/libextractor.la
 
 libextractor_ole2_la_LDFLAGS = \
d168 4
a171 4
--- src/plugins/oo/Makefile.in.orig	2006-04-22 20:33:19 +0200
+++ src/plugins/oo/Makefile.in	2006-05-07 08:34:20 +0200
@@@@ -152,12 +152,12 @@@@
 INTLLIBS = @@INTLLIBS@@
d186 4
a189 4
--- src/plugins/pdf/Makefile.in.orig	2006-04-22 20:33:20 +0200
+++ src/plugins/pdf/Makefile.in	2006-05-07 08:34:20 +0200
@@@@ -173,12 +173,12 @@@@
 INTLLIBS = @@INTLLIBS@@
d204 4
a207 4
--- src/plugins/printable/Makefile.in.orig	2006-04-22 20:33:21 +0200
+++ src/plugins/printable/Makefile.in	2006-05-07 08:34:20 +0200
@@@@ -478,12 +478,12 @@@@
 INTLLIBS = @@INTLLIBS@@
d222 4
a225 4
--- src/plugins/rpm/Makefile.in.orig	2006-04-22 20:33:21 +0200
+++ src/plugins/rpm/Makefile.in	2006-05-07 08:34:20 +0200
@@@@ -151,12 +151,12 @@@@
 INTLLIBS = @@INTLLIBS@@
d240 4
a243 4
--- src/plugins/thumbnail/Makefile.in.orig	2006-04-22 20:33:22 +0200
+++ src/plugins/thumbnail/Makefile.in	2006-05-07 08:34:20 +0200
@@@@ -147,12 +147,12 @@@@
 INTLLIBS = @@INTLLIBS@@
d257 1
a257 1
@@@@ -247,7 +247,7 @@@@
@


1.9
log
@upgrading package: libextractor 0.5.7 -> 0.5.11
@
text
@d2 2
a3 2
--- src/main/Makefile.in.orig	2006-03-11 03:01:59 +0100
+++ src/main/Makefile.in	2006-05-04 10:07:10 +0200
d12 1
a12 1
@@@@ -270,7 +271,7 @@@@
d22 3
a24 3
--- src/plugins/Makefile.in.orig	2006-03-11 08:22:45 +0100
+++ src/plugins/Makefile.in	2006-05-04 10:07:10 +0200
@@@@ -319,12 +319,12 @@@@
d40 3
a42 3
--- src/plugins/exiv2/Makefile.in.orig	2006-03-11 03:02:00 +0100
+++ src/plugins/exiv2/Makefile.in	2006-05-04 10:07:10 +0200
@@@@ -175,12 +175,12 @@@@
d58 3
a60 3
--- src/plugins/hash/Makefile.in.orig	2006-03-11 03:02:00 +0100
+++ src/plugins/hash/Makefile.in	2006-05-04 10:07:10 +0200
@@@@ -164,12 +164,12 @@@@
d76 3
a78 3
--- src/plugins/ole2/Makefile.in.orig	2006-03-11 03:02:01 +0100
+++ src/plugins/ole2/Makefile.in	2006-05-04 10:07:10 +0200
@@@@ -145,12 +145,12 @@@@
d93 1
a93 1
@@@@ -245,7 +245,7 @@@@
d103 3
a105 3
--- src/plugins/oo/Makefile.in.orig	2006-03-11 03:02:01 +0100
+++ src/plugins/oo/Makefile.in	2006-05-04 10:07:10 +0200
@@@@ -150,12 +150,12 @@@@
d121 3
a123 3
--- src/plugins/pdf/Makefile.in.orig	2006-03-11 03:02:01 +0100
+++ src/plugins/pdf/Makefile.in	2006-05-04 10:07:10 +0200
@@@@ -171,12 +171,12 @@@@
d139 3
a141 3
--- src/plugins/printable/Makefile.in.orig	2006-03-11 03:02:02 +0100
+++ src/plugins/printable/Makefile.in	2006-05-04 10:07:10 +0200
@@@@ -202,12 +202,12 @@@@
d157 3
a159 3
--- src/plugins/rpm/Makefile.in.orig	2006-03-11 03:02:02 +0100
+++ src/plugins/rpm/Makefile.in	2006-05-04 10:07:10 +0200
@@@@ -149,12 +149,12 @@@@
d175 3
a177 3
--- src/plugins/thumbnail/Makefile.in.orig	2006-03-11 03:02:02 +0100
+++ src/plugins/thumbnail/Makefile.in	2006-05-04 10:07:10 +0200
@@@@ -145,12 +145,12 @@@@
d192 1
a192 1
@@@@ -245,7 +245,7 @@@@
a200 54
Index: src/plugins/wordleaker/Makefile.in
--- src/plugins/wordleaker/Makefile.in.orig	2006-03-11 03:02:02 +0100
+++ src/plugins/wordleaker/Makefile.in	2006-05-04 10:20:49 +0200
@@@@ -14,6 +14,11 @@@@
 
 @@SET_MAKE@@
 
+GLIB_CFLAGS = @@GLIB_CFLAGS@@
+GLIB_GENMARSHAL = @@GLIB_GENMARSHAL@@
+GLIB_LIBS = @@GLIB_LIBS@@
+GLIB_MKENUMS = @@GLIB_MKENUMS@@
+
 SOURCES = $(libextractor_word_la_SOURCES)
 
 srcdir = @@srcdir@@
@@@@ -66,15 +71,15 @@@@
 am__depfiles_maybe = depfiles
 @@AMDEP_TRUE@@DEP_FILES = ./$(DEPDIR)/pole.Plo \
 @@AMDEP_TRUE@@	./$(DEPDIR)/wordextractor.Plo
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = $(CXX) $(GLIB_CFLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(GLIB_CFLAGS) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+COMPILE = $(CC) $(GLIB_CFLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
Index: src/plugins/wordleaker/wordextractor.cc
--- src/plugins/wordleaker/wordextractor.cc.orig	2006-03-11 01:10:50 +0100
+++ src/plugins/wordleaker/wordextractor.cc	2006-05-04 10:15:28 +0200
@@@@ -30,6 +30,7 @@@@
 
 #include "wordleaker.h"
 #include "pole.h"
+#include "glib/gstrfuncs.h"
 
 
 extern "C" {
@@@@ -84,7 +85,7 @@@@
 		      &t))
       return NULL;
       
-    return strndup(f, 128);
+    return g_strndup(f, 128);
   }
   
   static const char * idToProduct( unsigned int id ) {
@


1.8
log
@upgrading package: libextractor 0.5.4 -> 0.5.5
@
text
@d2 2
a3 2
--- src/main/Makefile.in.orig	2005-09-08 06:46:36 +0200
+++ src/main/Makefile.in	2005-09-09 10:10:51 +0200
d12 1
a12 1
@@@@ -273,7 +274,7 @@@@
d21 54
d76 18
a93 3
--- src/plugins/ole2/Makefile.in.orig	2005-09-08 06:46:38 +0200
+++ src/plugins/ole2/Makefile.in	2005-09-09 10:04:37 +0200
@@@@ -240,7 +240,7 @@@@
d102 72
d175 19
a193 4
--- src/plugins/thumbnail/Makefile.in.orig	2005-09-08 06:46:39 +0200
+++ src/plugins/thumbnail/Makefile.in	2005-09-09 10:04:37 +0200
@@@@ -241,7 +241,7 @@@@
   $(GLIB_CFLAGS)
d201 54
@


1.7
log
@upgrading package: libextractor 0.5.2 -> 0.5.3
@
text
@d2 2
a3 2
--- src/main/Makefile.in.orig	2005-08-14 03:41:20 +0200
+++ src/main/Makefile.in	2005-08-14 09:10:39 +0200
d12 1
a12 1
@@@@ -264,7 +265,7 @@@@
d16 2
a17 2
-  $(LIBLTDL) $(dlflag)
+  $(LIBLTDL)
d22 4
a25 4
--- src/plugins/ole2/Makefile.in.orig	2005-08-14 03:50:09 +0200
+++ src/plugins/ole2/Makefile.in	2005-08-14 09:11:23 +0200
@@@@ -243,7 +243,7 @@@@
   $(GLIB_CFLAGS)
d34 3
a36 3
--- src/plugins/thumbnail/Makefile.in.orig	2005-08-14 03:50:23 +0200
+++ src/plugins/thumbnail/Makefile.in	2005-08-14 09:11:43 +0200
@@@@ -238,7 +238,7 @@@@
@


1.6
log
@upgrading package: libextractor 0.4.0 -> 0.5.2
@
text
@d2 4
a5 4
--- src/main/Makefile.in.orig	2004-12-25 20:35:49 +0100
+++ src/main/Makefile.in	2004-12-26 09:10:05 +0100
@@@@ -75,6 +75,7 @@@@
    getopt1.$(OBJEXT)
d9 12
a20 3
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
d22 9
a30 3
--- src/plugins/ole2/Makefile.in.orig	2004-12-25 19:34:49 +0100
+++ src/plugins/ole2/Makefile.in	2004-12-26 09:11:02 +0100
@@@@ -241,7 +241,7 @@@@
a31 1
 # Ok, linking this one is complicated, see Mantis #787.
a32 5
-  -Wl,-Bstatic -Wl,-lgobject-2.0 -Wl,-lglib-2.0 -Wl,-Bdynamic \
+  -Wl,-Bstatic -Wl,-lgobject2 -Wl,-lglib2 -Wl,-Bdynamic \
   -Wl,-Bsymbolic -avoid-version -module
 
 # Note that we're NOT using PLUGINFLAGS here to avoid -export-dynamic!
d34 4
a37 9
--- src/plugins/thumbnail/Makefile.in.orig	2005-08-02 19:09:08 +0200
+++ src/plugins/thumbnail/Makefile.in	2005-08-02 19:17:46 +0200
@@@@ -244,7 +244,7 @@@@
 # Ok, linking this one is complicated, see Mantis #787.
 libextractor_thumbnail_la_LDFLAGS = \
   $(top_builddir)/src/main/libextractor.la \
-  -Wl,-Bstatic -Wl,-lgobject-2.0 -Wl,-lglib-2.0 -Wl,-Bdynamic \
+  -Wl,-Bstatic -Wl,-lgobject2 -Wl,-lglib2 -Wl,-Bdynamic \
   -Wl,-Bsymbolic -avoid-version -module
d40 5
@


1.5
log
@upgrading package: libextractor 0.3.11 -> 0.4.0
@
text
@d5 1
a5 1
 	getopt1.$(OBJEXT)
d24 10
a33 9
Index: src/plugins/printable/Makefile.in
--- src/plugins/printable/Makefile.in.orig	2004-12-25 19:34:54 +0100
+++ src/plugins/printable/Makefile.in	2004-12-26 09:10:05 +0100
@@@@ -444,7 +444,7 @@@@
 	done
 dictionary-builder$(EXEEXT): $(dictionary_builder_OBJECTS) $(dictionary_builder_DEPENDENCIES) 
 	@@rm -f dictionary-builder$(EXEEXT)
-	$(LINK) $(dictionary_builder_LDFLAGS) $(dictionary_builder_OBJECTS) $(dictionary_builder_LDADD) $(LIBS)
+	$(LINK) $(dictionary_builder_LDFLAGS) $(dictionary_builder_OBJECTS) $(dictionary_builder_LDADD) $(LIBINTL) $(LIBS)
d35 1
a35 2
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@


1.4
log
@upgrading package: libextractor 0.3.10 -> 0.3.11
@
text
@d2 3
a4 3
--- src/main/Makefile.in.orig	2004-11-13 19:25:52 +0100
+++ src/main/Makefile.in	2004-11-16 10:51:42 +0100
@@@@ -68,6 +68,7 @@@@
d13 3
a15 11
--- src/plugins/ole2/Makefile.in.orig	2004-11-13 19:25:54 +0100
+++ src/plugins/ole2/Makefile.in	2004-11-16 10:52:57 +0100
@@@@ -225,14 +225,14 @@@@
   libextractor_ole2.la
 
 AM_CFLAGS = $(GLIB_CFLAGS)
-@@MINGW_TRUE@@WINFLAGS = -lgobject-2.0 $(GLIB_LIBS)
+@@MINGW_TRUE@@WINFLAGS = -lgobject2 $(GLIB_LIBS)
 libextractor_ole2_la_LIBADD = \
   $(LIBADD) $(WINFLAGS) \
   $(top_builddir)/src/main/libextractor.la
d25 2
a26 2
--- src/plugins/printable/Makefile.in.orig	2004-11-13 19:25:55 +0100
+++ src/plugins/printable/Makefile.in	2004-11-16 10:51:42 +0100
@


1.3
log
@upgrading package: libextractor 0.3.8 -> 0.3.9
@
text
@d2 2
a3 2
--- src/main/Makefile.in.orig	2004-10-18 01:22:14 +0200
+++ src/main/Makefile.in	2004-10-18 09:34:31 +0200
d12 20
d33 2
a34 2
--- src/plugins/printable/Makefile.in.orig	2004-10-18 01:22:16 +0200
+++ src/plugins/printable/Makefile.in	2004-10-18 09:34:31 +0200
a43 12
Index: src/plugins/ole2/Makefile.in
--- src/plugins/ole2/Makefile.in.orig	2004-10-18 01:22:15 +0200
+++ src/plugins/ole2/Makefile.in	2004-10-18 09:42:24 +0200
@@@@ -226,7 +226,7 @@@@
 
 AM_CFLAGS = $(GLIB_CFLAGS)
 libextractor_ole2_la_LIBADD = \
-  $(GLIB_LIBS) @@EXT_LIB_PATH@@ $(LIBADD) @@EXT_LIBS@@ -lgobject-2.0 \
+  $(GLIB_LIBS) @@EXT_LIB_PATH@@ $(LIBADD) @@EXT_LIBS@@ -lgobject2 \
   $(top_builddir)/src/main/libextractor.la
 
 libextractor_ole2_la_LDFLAGS = \
@


1.2
log
@upgrading package: libextractor 0.3.3 -> 0.3.4
@
text
@a0 11
Index: src/plugins/wavextractor.c
--- src/plugins/wavextractor.c.orig	2004-06-23 10:04:01 +0200
+++ src/plugins/wavextractor.c	2004-08-14 09:07:49 +0200
@@@@ -32,6 +32,7 @@@@
 #include <stdlib.h>
 #include <ctype.h>
 #ifndef MINGW
+#include <sys/types.h>
 #include <sys/mman.h>
 #include <netinet/in.h>
 #endif
d2 3
a4 3
--- src/main/Makefile.in.orig	2004-08-25 15:41:51 +0200
+++ src/main/Makefile.in	2004-08-26 10:31:50 +0200
@@@@ -74,6 +74,7 @@@@
d13 3
a15 3
--- src/plugins/printable/Makefile.in.orig	2004-08-25 16:16:00 +0200
+++ src/plugins/printable/Makefile.in	2004-08-26 11:00:11 +0200
@@@@ -434,7 +434,7 @@@@
d24 12
@


1.1
log
@new package: libextractor 0.3.3 (File Extraction and Classification Library)
@
text
@d13 3
a15 3
--- src/main/Makefile.in.orig	2004-06-23 10:09:13 +0200
+++ src/main/Makefile.in	2004-08-14 09:19:29 +0200
@@@@ -155,7 +155,7 @@@@
a18 1
-extract_LDFLAGS =
d20 12
d33 2
a34 2
 DEFS = @@DEFS@@
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/src/include
@