[glabels/glabels_2_2] Preparation for 2.2.7

[Jim Evins <jimevins src gnome org>]

commit c142345372faa68185cd5bbeba4e6192d72599ce
Author: Jim Evins <evins snaught com>
Date:   Tue Mar 2 20:16:32 2010 -0500

    Preparation for 2.2.7
    
    Updated NEWS.  Updated version information in configure.in.  Added pearl
    templates to makefile.

 NEWS                       |   26 +-
 configure.in               |    4 +-
 data/templates/Makefile.am |    9 +-
 help/glabels-help.pot      | 1513 --------------------------------------------
 4 files changed, 28 insertions(+), 1524 deletions(-)
---
diff --git a/NEWS b/NEWS
index ca7aced..560a4b3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,19 @@
+* gLabels 2.2.7 (stable) release.  Release date 2010-03-01
+
+- Fixed limitation on encoded image sizes (fix only valid if libxml 2.7+ is installed)
+- Fixed focus behavior of canvas so that focus does not get stolen when
+  highlighting text in the object editor
+- New Slovenian translation (Andrej ŽnidarÅ¡iÄ?)
+- New Danish translation (Joe Hansen)
+- Updated Czech translation (Marek Cernocky)
+- Updated German translation (Mario Blättermann)
+- Updated German help manual translation (Mario Blättermann)
+- New French translation of help manual (Alain Lojewski and Claude Paroz)
+- New Czech translation of help manual (Marek Cernocky)
+- New Spanish translation of help manual (Jorge González)
+- New templates
+
+
 * gLabels 2.2.6 (stable) release.  Release date 2009-11-11
 
 - Fixed drawing artifact with round labels.
@@ -5,14 +21,14 @@
 - Fixed several UI inconsistencies when changing merge source.
 - Fixed potiential crash when doing a document merge.
 - Now makes a better guess at locale defaults (page size and units).
-- Updated user documentation (Mario Blättermann).
+- Updated user documentation (Mario Blättermann).
 - Updated swedish translation (Daniel Nylander).
-- Updated german translation (Mario Blättermann).
+- Updated german translation (Mario Blättermann).
 - Updated russian translation (Alexandre Prokoudine)
 - Updated french translation (Claude Paroz)
 - New chinese translation (Careon)
 - New catalan translation (David Planella)
-- Updated german translation of user documentation (Mario Blättermann).
+- Updated german translation of user documentation (Mario Blättermann).
 - New templates.
 
 
@@ -20,7 +36,7 @@
 
 - Fixed spinbutton/adjustment bugs that made glabels unusable with Gtk 2.16.
 - Fixed default preview colors in color combos.
-- Updated german translation (Mario Blättermann).
+- Updated german translation (Mario Blättermann).
 - New templates.
 
 
@@ -139,7 +155,7 @@
 - Replaced libbonoboui with GtkUIManager (now requires Gnome 2.10 and GTK+ 2.6)
 - Updated Russian translation (Vitaly Lipatov)
 - Updated Spanish translation (Sergio Rivadero)
-- Updated Czech translation (David Makovský and Zbynek Mrkvick)
+- Updated Czech translation (David Makovský and Zbynek Mrkvick)
 - Updated Italian translation (Daniele Medri)
 - Added documentation for libglabels
 - Minor bug fixes and cleanup
diff --git a/configure.in b/configure.in
index 1d11adc..f9d9478 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.52)
 
-AC_INIT(glabels, 2.2.6, http://sourceforge.net/tracker/?func=add&group_id=46122&atid=445116)
+AC_INIT(glabels, 2.2.7, http://sourceforge.net/tracker/?func=add&group_id=46122&atid=445116)
 AC_CONFIG_SRCDIR(src/glabels.c)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 GNOME_DOC_INIT
@@ -42,7 +42,7 @@ dnl 5. If any interfaces have been added since the last public release, then inc
 dnl 6. If any interfaces have been removed since the last public release, then set age
 dnl    to 0.
 LIBGLABELS_C=6
-LIBGLABELS_R=1
+LIBGLABELS_R=2
 LIBGLABELS_A=1
 
 LIBGLABELS_VERSION_INFO=${LIBGLABELS_C}:${LIBGLABELS_R}:${LIBGLABELS_A}
diff --git a/data/templates/Makefile.am b/data/templates/Makefile.am
index 236c93f..4d38e06 100644
--- a/data/templates/Makefile.am
+++ b/data/templates/Makefile.am
@@ -5,15 +5,16 @@ templatesdir = $(datadir)/glabels/templates
 templates_DATA = \
 	paper-sizes.xml \
 	categories.xml \
-	avery-us-templates.xml \
 	avery-iso-templates.xml \
 	avery-other-templates.xml \
-	zweckform-iso-templates.xml \
+	avery-us-templates.xml \
 	brother-other-templates.xml \
 	dymo-other-templates.xml \
-	misc-us-templates.xml \
 	misc-iso-templates.xml \
-	misc-other-templates.xml
+	misc-other-templates.xml \
+	misc-us-templates.xml \
+	pearl-templates.xml \
+	zweckform-iso-templates.xml
 
 EXTRA_DIST = $(templates_DATA)