head	1.3;
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.3
date	2008.08.28.10.11.29;	author rse;	state Exp;
branches;
next	1.2;
commitid	isWgpATy1WK1yxgt;

1.2
date	2007.08.10.09.23.43;	author rse;	state Exp;
branches;
next	1.1;
commitid	hYev09YNGeTTCbts;

1.1
date	2005.04.05.19.05.43;	author rse;	state Exp;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2005.04.05.19.05.43;	author rse;	state dead;
branches;
next	1.1.2.2;
commitid	iZxwRSmmWscPXUQr;

1.1.2.2
date	2006.10.16.14.56.19;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.3
log
@upgrading package: shared-mime-info 0.40 -> 0.51
@
text
@Index: Makefile.in
--- Makefile.in.orig	2008-07-23 12:44:50 +0200
+++ Makefile.in	2008-07-23 19:44:57 +0200
@@@@ -280,7 +280,7 @@@@
 
 CLEANFILES = freedesktop.org.xml po/stamp-it
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update
-pkgconfigdir = $(datadir)/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = shared-mime-info.pc
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@@@ -367,13 +367,13 @@@@
 	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
 test-subclassing$(EXEEXT): $(test_subclassing_OBJECTS) $(test_subclassing_DEPENDENCIES) 
 	@@rm -f test-subclassing$(EXEEXT)
-	$(test_subclassing_LINK) $(test_subclassing_OBJECTS) $(test_subclassing_LDADD) $(LIBS)
+	$(test_subclassing_LINK) $(test_subclassing_OBJECTS) $(test_subclassing_LDADD) $(LIBS) $(ALL_LIBS)
 test-tree-magic$(EXEEXT): $(test_tree_magic_OBJECTS) $(test_tree_magic_DEPENDENCIES) 
 	@@rm -f test-tree-magic$(EXEEXT)
-	$(test_tree_magic_LINK) $(test_tree_magic_OBJECTS) $(test_tree_magic_LDADD) $(LIBS)
+	$(test_tree_magic_LINK) $(test_tree_magic_OBJECTS) $(test_tree_magic_LDADD) $(LIBS) $(ALL_LIBS)
 update-mime-database$(EXEEXT): $(update_mime_database_OBJECTS) $(update_mime_database_DEPENDENCIES) 
 	@@rm -f update-mime-database$(EXEEXT)
-	$(update_mime_database_LINK) $(update_mime_database_OBJECTS) $(update_mime_database_LDADD) $(LIBS)
+	$(update_mime_database_LINK) $(update_mime_database_OBJECTS) $(update_mime_database_LDADD) $(LIBS) $(ALL_LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@


1.2
log
@upgrading package: shared-mime-info 0.15 -> 0.22
@
text
@d2 3
a4 3
--- Makefile.in.orig	2007-07-30 12:39:03 +0200
+++ Makefile.in	2007-08-10 11:10:33 +0200
@@@@ -275,7 +275,7 @@@@
d13 1
a13 1
@@@@ -362,10 +362,10 @@@@
d19 4
@


1.1
log
@new package: shared-mime-info 0.15 (Shared MIME Type Information XML Database)
@
text
@d2 17
a18 4
--- Makefile.in.orig	2004-08-30 20:17:02 +0200
+++ Makefile.in	2005-04-05 20:46:53 +0200
@@@@ -308,7 +308,7 @@@@
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
d21 2
a22 2
-	$(LINK) $(update_mime_database_LDFLAGS) $(update_mime_database_OBJECTS) $(update_mime_database_LDADD) $(LIBS)
+	$(LINK) $(update_mime_database_LDFLAGS) $(update_mime_database_OBJECTS) $(update_mime_database_LDADD) $(LIBS) $(ALL_LIBS)
@


1.1.2.1
log
@file shared-mime-info.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:56:19 +0000
@
text
@d1 12
@


1.1.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 12
Index: Makefile.in
--- Makefile.in.orig	2004-08-30 20:17:02 +0200
+++ Makefile.in	2005-04-05 20:46:53 +0200
@@@@ -308,7 +308,7 @@@@
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 update-mime-database$(EXEEXT): $(update_mime_database_OBJECTS) $(update_mime_database_DEPENDENCIES) 
 	@@rm -f update-mime-database$(EXEEXT)
-	$(LINK) $(update_mime_database_LDFLAGS) $(update_mime_database_OBJECTS) $(update_mime_database_LDADD) $(LIBS)
+	$(LINK) $(update_mime_database_LDFLAGS) $(update_mime_database_OBJECTS) $(update_mime_database_LDADD) $(LIBS) $(ALL_LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@