From: Jim Evins <evins@snaught.com>
Date: Tue, 18 Sep 2012 00:37:39 +0000 (-0400)
Subject: Preparation for 3.0.1
X-Git-Tag: glabels-3_2_0~52
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3337c1bb1a0fbe677f9aacde21dd93eea08f0bd5;p=glabels

Preparation for 3.0.1
---

diff --git a/NEWS b/NEWS
index 41661f1a..17af75df 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,29 @@
+* gLabels 3.0.1 (stable) release.  Release date 2012-09-17
+
+- Fixed bug causing extra pages to be printed when doing a document merge
+- Fixed font scaling problems when doing a document merge
+- Added missing dependencies to libglabels and libglbarcode pkg-config files
+- Fixed invalid gsettings schema file
+- Fixed incorrect clip region for rectangular labels
+- Numerous new templates and fixes
+- Updated and new translations:
+  - Japanese (Takeshi AIHANA, Jiro Matsuzawa)
+  - German (Mario Blättermann)
+  - Spanish (Daniel Mustieles, Jorge González)
+  - Serbian (Мирослав Николић)
+  - Finnish (Jiri Grönroos)
+  - British English (Bruce Cowan)
+  - French (Claud Paroz, Bruno Brouard)
+  - Norwegian bokmål (Kjartan Maraas)
+  - Indonesian (Andika Triwidada)
+  - Greek (Efstathios Iosifidis, Konstantinos Chortis)
+  - Slovenian (Andrej Žnidaršič, Matej Urbančič, Martin Srebotnjak)
+  - Czech (Marek Černocký)
+  - Russian (Александр Прокудин, Yuri Myasoedov)
+  - Esperanto (Kristjan SCHMIDT)
+  - Arabic (Hatim Ali)
+
+
 * gLabels 3.0.0 (stable) release.  Release date 2011-05-16
 
 - Reorganization of alignment menus
diff --git a/configure.ac b/configure.ac
index f5d92c71..1f05a038 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl - GLABELS version
 dnl ---------------------------------------------------------------------------
 m4_define([glabels_major_version], [3])
 m4_define([glabels_minor_version], [0])
-m4_define([glabels_micro_version], [0])
+m4_define([glabels_micro_version], [1])
 
 m4_define([glabels_version],
           [glabels_major_version.glabels_minor_version.glabels_micro_version])
diff --git a/templates/Makefile.am b/templates/Makefile.am
index ab9a45d0..a0231715 100644
--- a/templates/Makefile.am
+++ b/templates/Makefile.am
@@ -19,6 +19,7 @@ templates_DATA = \
 	databecker-iso-templates.xml \
 	dataline-iso-templates.xml	\
 	decadry-iso-templates.xml \
+	desmat-templates.xml \
 	dymo-other-templates.xml \
 	endisch-templates.xml	\
 	geha-iso-templates.xml	\