2007-12-25 Jim Evins <evins@snaught.com>

	* MESSAGE-OF-DOOM:
		Removed for 2.2 stable branch.
	* Makefile.am:
	* NEWS:
	* configure.in:
		Prepare for 2.2.0 release.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@714 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index 1177cf67db9ae549b8220a76bd739039b0094442..a87f3f3e149de28524948bfb8fe0f3a8f9401c46 100644 (file)
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,12 @@
+2007-12-25  Jim Evins  <evins@snaught.com>
+
+       * MESSAGE-OF-DOOM:
+               Removed for 2.2 stable branch.
+       * Makefile.am:
+       * NEWS:
+       * configure.in:
+               Prepare for 2.2.0 release.
+
 2007-12-21  Jim Evins  <evins@snaught.com>
 
        * COPYING.LIBGLABELS:

diff --git a/glabels2/MESSAGE-OF-DOOM b/glabels2/MESSAGE-OF-DOOM
deleted file mode 100644 (file)
index 9ddbfaa..0000000
--- a/glabels2/MESSAGE-OF-DOOM
+++ /dev/null
@@ -1,15 +0,0 @@
- *** IMPORTANT *** 
-
-This is an unstable (development) version of glabels. 
-It is for testing purposes only.
-
-Please, DO NOT use it in a production environment.
-It will probably crash and you will lose your data.
-
-If you are looking for a stable release of glabels, it can be downloaded from:
-
-  http://glabels.sourceforge.net/download
-
- *** END OF WARNING ***
-
-

diff --git a/glabels2/Makefile.am b/glabels2/Makefile.am
index db73aa1d5e78acc0583b0e7a2073afe656bac22a..d7b22a0169b4d221098d88cfdf2b67e4adfabc69 100644 (file)
--- a/glabels2/Makefile.am
+++ b/glabels2/Makefile.am
@@ -15,9 +15,10 @@ SUBDIRS = \
 
 EXTRA_DIST = \
        README \
+       COPYING.README_FIRST \
        COPYING \
        COPYING-DOCS \
-       COPYING.LIBGLABELS \
+       COPYING-LIBGLABELS \
        AUTHORS \
        ChangeLog \
        INSTALL \
@@ -27,6 +28,4 @@ EXTRA_DIST = \
        intltool-merge.in \
        intltool-update.in \
        glabels.spec.in \
-       glabels.spec \
-       MESSAGE-OF-DOOM
-
+       glabels.spec

diff --git a/glabels2/NEWS b/glabels2/NEWS
index a29d75d3b1783e3a6777c6de5b74bbdcb2a83a97..95254c5859bdab636b31440de2fa4507487a643d 100644 (file)
--- a/glabels2/NEWS
+++ b/glabels2/NEWS
@@ -1,9 +1,30 @@
+* gLabels 2.2.0 (stable) release.  Release date 2007-12-26
+
+- Migrated from EggRecent to GtkRecentManager
+- Migrated from libgnomeprint to GtkPrintOperation and Cairo.
+- Migrated from libgnomeprint to Pango for text layout.
+- Migrated GnomeDruid to GtkAssistant for template designer.
+- Migrated from GnomeCanvas to Cairo.
+- Removed all deprecated widgets as of Gnome-2.16/Gtk-2.10.
+- Added categorization of templates and an updated New Label dialog.
+- New label dialog now allows selection of recently used templates
+- Removed splash screen.
+- Added initial support for datamatrix 2D barcodes.
+- Added support for Brazilian CEPNet barcodes.
+- Added shadow attribute to label objects.
+- New merge backend for evolution data server (Austin Henry)
+- Various bug fixes.
+- New templates.
+
+
 * gLabels 2.1.5 (unstable) release.  Release date 2007-12-09.
+
 - New label dialog now allows selection of recently used templates
 - Store brand and part number as separate fields in templates
 - Major cleanup of libglabels API and documentation
 - Minor bug fixes (and probably some new bugs).
 
+
 * gLabels 2.1.4 (unstable) release.  Release date 2007-08-17.
 
 - Added categorization of templates and an updated New Label dialog.
@@ -16,7 +37,7 @@
 - Removed splash screen.
 - Added support for Brazilian CEPNet barcodes.
 - Updated French translation (Claude Paroz)
-- New Experanto translation (Antonio C. Codazzi)
+- New Esperanto translation (Antonio C. Codazzi)
 - Minor bug fixes (and probably some new bugs).
 - New templates.
 

diff --git a/glabels2/configure.in b/glabels2/configure.in
index cd042c30fd1c98aca430177b6feaaf198249a3e7..592aecf9c4e99ae2ba0a3b75ed946e1a45eb3865 100644 (file)
--- a/glabels2/configure.in
+++ b/glabels2/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.pre2svn, http://sourceforge.net/tracker/?func=add&group_id=46122&atid=445116)
+AC_INIT(glabels, 2.2.0, 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)
 
@@ -40,7 +40,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=5
-LIBGLABELS_R=0
+LIBGLABELS_R=1
 LIBGLABELS_A=0
 
 LIBGLABELS_VERSION_INFO=${LIBGLABELS_C}:${LIBGLABELS_R}:${LIBGLABELS_A}
@@ -211,5 +211,5 @@ Configuration:
 
 "
 
-cat ${srcdir}/MESSAGE-OF-DOOM
+dnl cat ${srcdir}/MESSAGE-OF-DOOM