head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.30
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.28
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.26
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.24
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.22
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.20
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.18
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.16
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.14
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.12
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.10
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.8
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.6
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.4
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.2
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.1.0.12
	pkgsrc-2006Q3-base:1.1
	pkgsrc-2006Q2:1.1.0.10
	pkgsrc-2006Q2-base:1.1
	pkgsrc-2006Q1:1.1.0.8
	pkgsrc-2006Q1-base:1.1
	pkgsrc-2005Q4:1.1.0.6
	pkgsrc-2005Q4-base:1.1
	pkgsrc-2005Q3:1.1.0.4
	pkgsrc-2005Q3-base:1.1
	pkgsrc-2005Q2:1.1.0.2
	pkgsrc-2005Q2-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2006.11.14.16.54.29;	author drochner;	state dead;
branches;
next	1.1;

1.1
date	2005.04.29.12.39.25;	author agc;	state Exp;
branches;
next	;


desc
@@


1.2
log
@update to 2.0.4
changes:
-Use filechooser for GnomeFileEntrys in merge properties dialog and
 object editor image page.
-New configure option to disable update-mime-database and
 update-desktop-database
-Minor cleanup.
-New templates and fixes
@
text
@$NetBSD: patch-aa,v 1.1 2005/04/29 12:39:25 agc Exp $

--- data/mime/Makefile.in	2005/04/29 12:25:17	1.1
+++ data/mime/Makefile.in	2005/04/29 12:26:29
@@@@ -469,7 +469,7 @@@@
 
 install-data-hook:
 @@HAVE_NEW_MIME_TRUE@@	$(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
-@@HAVE_NEWER_MIME_TRUE@@	$(UPDATE_DESKTOP_DATABASE) 
+@@HAVE_NEWER_MIME_TRUE@@	-$(UPDATE_DESKTOP_DATABASE) 
 
 uninstall-hook:
 @@HAVE_NEW_MIME_TRUE@@	$(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
@


1.1
log
@Under NetBSD, the update-desktop-database command may fail at install
time, so ignore the return code.
@
text
@d1 1
a1 1
$NetBSD$
@