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

4 files changed, 16 insertions, 22 deletions

diff --git a/print/glabels/Makefile b/print/glabels/Makefile
index c791edfc131..0346378b8e2 100644
--- a/print/glabels/Makefile
+++ b/print/glabels/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2006/09/16 12:20:39 jmmv Exp $
+# $NetBSD: Makefile,v 1.21 2006/11/14 16:54:29 drochner Exp $
 #
 
-DISTNAME=		glabels-2.0.2
-PKGREVISION=		7
+DISTNAME=		glabels-2.0.4
 CATEGORIES=		print
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=glabels/}
 
@@ -25,4 +24,5 @@ USE_TOOLS+=		gmake intltool msgfmt pkg-config
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/glabels/PLIST b/print/glabels/PLIST
index b490583715f..dad606396ed 100644
--- a/print/glabels/PLIST
+++ b/print/glabels/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2006/04/17 07:07:32 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/11/14 16:54:29 drochner Exp $
 bin/glabels
 bin/glabels-batch
 include/libglabels/libglabels.h
@@ -28,6 +28,14 @@ share/gnome/help/glabels/C/figures/glabels-template-cd.png
 share/gnome/help/glabels/C/figures/glabels-template-label.png
 share/gnome/help/glabels/C/figures/glabels-template-layout.png
 share/gnome/help/glabels/C/figures/main-window-empty.png
+share/gnome/help/glabels/C/figures/merge-ex1-1.png
+share/gnome/help/glabels/C/figures/merge-ex1-2.png
+share/gnome/help/glabels/C/figures/merge-ex1-3.png
+share/gnome/help/glabels/C/figures/merge-ex1-4.png
+share/gnome/help/glabels/C/figures/merge-ex2-1.png
+share/gnome/help/glabels/C/figures/merge-ex2-2.png
+share/gnome/help/glabels/C/figures/merge-ex2-3.png
+share/gnome/help/glabels/C/figures/merge-ex2-4.png
 share/gnome/help/glabels/C/figures/object-editor-sidebar.png
 share/gnome/help/glabels/C/figures/print-copies.png
 share/gnome/help/glabels/C/figures/print-merge.png
diff --git a/print/glabels/distinfo b/print/glabels/distinfo
index 560b247b8a2..f916ce219d4 100644
--- a/print/glabels/distinfo
+++ b/print/glabels/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2005/04/29 12:39:25 agc Exp $
+$NetBSD: distinfo,v 1.5 2006/11/14 16:54:29 drochner Exp $
 
-SHA1 (glabels-2.0.2.tar.gz) = d579d2bf8187316ec3f846d4eea2b8ab448dca60
-RMD160 (glabels-2.0.2.tar.gz) = 0950e410e1f590869cfdd5b336b51b443b5d6742
-Size (glabels-2.0.2.tar.gz) = 1614927 bytes
-SHA1 (patch-aa) = e1363080ce671e56611da755b6dcc73ee88f93a1
+SHA1 (glabels-2.0.4.tar.gz) = 3794028a978e6976ea230b191a28746d3a9bb4a7
+RMD160 (glabels-2.0.4.tar.gz) = 9ed141bc23c085d0f5131192463421e07f13945a
+Size (glabels-2.0.4.tar.gz) = 1920095 bytes
diff --git a/print/glabels/patches/patch-aa b/print/glabels/patches/patch-aa
deleted file mode 100644
index f61b60037cb..00000000000
--- a/print/glabels/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$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"