2005-06-20 Jim Evins <evins@snaught.com>

	* configure.in:
		Final preps for 2.1.1 release.
	* docs/libglabels/libglabels.types:
		Somehow never got checked in before.
	* po/POTFILES.in:
		Bring up-to-date with recent reorg of ui code.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@542 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index 4ff96ea1c1a3187d82ee09ee7fefbc088fa24a94..e78d2666015fc1bfa46f160210652b784400a24e 100644 (file)
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,13 @@
+2005-06-20  Jim Evins  <evins@snaught.com>
+
+       * configure.in:
+               Final preps for 2.1.1 release.
+       * docs/libglabels/libglabels.types:
+               Somehow never got checked in before.
+       * po/POTFILES.in:
+               Bring up-to-date with recent reorg of ui code.
+               
+
 2005-06-19  Jim Evins  <evins@snaught.com>
 
        * src/template-designer.c: (construct_layout_page):

diff --git a/glabels2/configure.in b/glabels2/configure.in
index 35375406a5f76691e4441d2b003c9a27c52b89af..7bde960dc1105522d11fd16d9698036da4c3d1da 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.1.1cvs, http://sourceforge.net/tracker/?func=add&group_id=46122&atid=445116)
+AC_INIT(glabels, 2.1.1, 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)
 
@@ -39,8 +39,8 @@ dnl    increment current, and set revision to 0.
 dnl 5. If any interfaces have been added since the last public release, then increment age.
 dnl 6. If any interfaces have been removed since the last public release, then set age
 dnl    to 0.
-LIBGLABELS_C=1
-LIBGLABELS_R=1
+LIBGLABELS_C=2
+LIBGLABELS_R=0
 LIBGLABELS_A=0
 
 LIBGLABELS_VERSION_INFO=${LIBGLABELS_C}:${LIBGLABELS_R}:${LIBGLABELS_A}

diff --git a/glabels2/docs/libglabels/libglabels.types b/glabels2/docs/libglabels/libglabels.types
new file mode 100644 (file)
index 0000000..c0780a3
--- /dev/null
+++ b/glabels2/docs/libglabels/libglabels.types
@@ -0,0 +1 @@
+#include <libglabels/libglabels.h>

diff --git a/glabels2/po/POTFILES.in b/glabels2/po/POTFILES.in
index 5fcf755ff57317b86e132c210f6c9ae42801786a..fc19d1a0f4cd29e642ebf0ac3b18922f7690c9e1 100644 (file)
--- a/glabels2/po/POTFILES.in
+++ b/glabels2/po/POTFILES.in
@@ -16,14 +16,12 @@ src/ui-sidebar.h
 src/ui-sidebar.c
 src/ui-util.h
 src/ui-util.c
-src/commands.h
-src/commands.c
+src/ui-commands.h
+src/ui-commands.c
 src/file.h
 src/file.c
 src/recent.h
 src/recent.c
-src/tools.h
-src/tools.c
 src/prefs.c
 src/prefs.h
 src/prefs-model.c
@@ -111,8 +109,6 @@ src/merge-text.c
 src/merge-text.h
 src/text-node.c
 src/text-node.h
-src/wdgt-image-select.c
-src/wdgt-image-select.h
 src/wdgt-print-copies.c
 src/wdgt-print-copies.h
 src/wdgt-print-merge.c
@@ -156,8 +152,6 @@ libglabels/xml-paper.h
 libglabels/xml.c
 libglabels/xml.h
 
-data/ui/glabels-ui.xml
-
 data/glade/prefs-dialog.glade
 data/glade/object-editor.glade
 data/glade/template-designer.glade