update to 2.2.6

changes:
-bugfixes
-translation updates
-Now makes a better guess at locale defaults (page size and units)
-New templates

3 files changed, 33 insertions, 9 deletions

diff --git a/print/glabels/Makefile b/print/glabels/Makefile
index 09b6e37188d..675cf3b05fe 100644
--- a/print/glabels/Makefile
+++ b/print/glabels/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2009/10/29 23:32:22 drochner Exp $
+# $NetBSD: Makefile,v 1.36 2009/11/15 20:13:42 drochner Exp $
 #
 
-DISTNAME=		glabels-2.2.5
-PKGREVISION=		2
+DISTNAME=		glabels-2.2.6
 CATEGORIES=		print
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=glabels/}
 
@@ -32,4 +31,5 @@ PKG_SUGGESTED_OPTIONS=  evolution
 .include "../../mk/omf-scrollkeeper.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/glabels/PLIST b/print/glabels/PLIST
index 5d845d8f0a2..a41aa76ab07 100644
--- a/print/glabels/PLIST
+++ b/print/glabels/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 18:11:55 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2009/11/15 20:13:42 drochner Exp $
 bin/glabels
 bin/glabels-batch
 include/libglabels/category.h
@@ -50,11 +50,31 @@ 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/merge-ex3-1.png
+share/gnome/help/glabels/C/figures/merge-ex3-2.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
 share/gnome/help/glabels/C/glabels.xml
 share/gnome/help/glabels/C/legal.xml
+share/gnome/help/glabels/de/figures/glabels-template-cd.png
+share/gnome/help/glabels/de/figures/glabels-template-label.png
+share/gnome/help/glabels/de/figures/glabels-template-layout.png
+share/gnome/help/glabels/de/figures/main-window-empty.png
+share/gnome/help/glabels/de/figures/merge-ex1-1.png
+share/gnome/help/glabels/de/figures/merge-ex1-2.png
+share/gnome/help/glabels/de/figures/merge-ex1-3.png
+share/gnome/help/glabels/de/figures/merge-ex1-4.png
+share/gnome/help/glabels/de/figures/merge-ex2-1.png
+share/gnome/help/glabels/de/figures/merge-ex2-2.png
+share/gnome/help/glabels/de/figures/merge-ex2-3.png
+share/gnome/help/glabels/de/figures/merge-ex2-4.png
+share/gnome/help/glabels/de/figures/merge-ex3-1.png
+share/gnome/help/glabels/de/figures/merge-ex3-2.png
+share/gnome/help/glabels/de/figures/object-editor-sidebar.png
+share/gnome/help/glabels/de/figures/print-copies.png
+share/gnome/help/glabels/de/figures/print-merge.png
+share/gnome/help/glabels/de/glabels.xml
 share/gtk-doc/html/libglabels/ch01.html
 share/gtk-doc/html/libglabels/ch02.html
 share/gtk-doc/html/libglabels/ch03.html
@@ -77,6 +97,7 @@ share/gtk-doc/html/libglabels/libglabels.devhelp2
 share/gtk-doc/html/libglabels/right.png
 share/gtk-doc/html/libglabels/style.css
 share/gtk-doc/html/libglabels/up.png
+share/locale/ca/LC_MESSAGES/glabels.mo
 share/locale/cs/LC_MESSAGES/glabels.mo
 share/locale/de/LC_MESSAGES/glabels.mo
 share/locale/eo/LC_MESSAGES/glabels.mo
@@ -88,11 +109,14 @@ share/locale/ko/LC_MESSAGES/glabels.mo
 share/locale/pl/LC_MESSAGES/glabels.mo
 share/locale/pt_BR/LC_MESSAGES/glabels.mo
 share/locale/ru/LC_MESSAGES/glabels.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/glabels.mo
+share/locale/sv/LC_MESSAGES/glabels.mo
+share/locale/zh_CN/LC_MESSAGES/glabels.mo
+share/locale/zh_TW/LC_MESSAGES/glabels.mo
 share/mime-info/glabels.keys
 share/mime-info/glabels.mime
 share/mime/packages/glabels.xml
 share/omf/glabels/glabels-C.omf
+share/omf/glabels/glabels-de.omf
 share/pixmaps/glabels-application-x-glabels.png
 share/pixmaps/glabels.png
 share/pixmaps/glabels/ex-1layout.png
diff --git a/print/glabels/distinfo b/print/glabels/distinfo
index b739f0ccaec..c1aebb17685 100644
--- a/print/glabels/distinfo
+++ b/print/glabels/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2009/05/26 18:50:49 drochner Exp $
+$NetBSD: distinfo,v 1.10 2009/11/15 20:13:42 drochner Exp $
 
-SHA1 (glabels-2.2.5.tar.gz) = 115b4eebe35e2efc3f4203f318cf6064c4a26d10
-RMD160 (glabels-2.2.5.tar.gz) = bab36234a1191705a5f4ffbd9ce6809d52c05d34
-Size (glabels-2.2.5.tar.gz) = 2043669 bytes
+SHA1 (glabels-2.2.6.tar.gz) = f51ee679072cd5e0e5bfe1e0a7d62265a78003d6
+RMD160 (glabels-2.2.6.tar.gz) = 33f66b3f27914e43d524ce56818ed96bd90e073b
+Size (glabels-2.2.6.tar.gz) = 2829526 bytes