2009-04-29 Jim Evins <evins@purple>

	* NEWS:
	* configure.in:
	* docs/libglabels/libglabels-decl-list.txt:
	* gtk-doc.make:
	* src/ui-commands.c: (gl_ui_cmd_help_about):
		Prepare for 2.2.5 release.

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

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index e75c905e2aba5ecf308ac0ec6863f05eff190b1d..eea2a733c58c5f3ac07146f829e569e317a11878 100644 (file)
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,12 @@
+2009-04-29  Jim Evins  <evins@purple>
+
+       * NEWS:
+       * configure.in:
+       * docs/libglabels/libglabels-decl-list.txt:
+       * gtk-doc.make:
+       * src/ui-commands.c: (gl_ui_cmd_help_about):
+               Prepare for 2.2.5 release.
+
 2009-04-29  Jim Evins  <evins@purple>
 
        * data/templates/avery-iso-templates.xml:

diff --git a/glabels2/NEWS b/glabels2/NEWS
index c6bff365cabcebc960361c5e6542596661f85029..9fd2b22407306c5b2cf7628c9354f740c69c7f27 100644 (file)
--- a/glabels2/NEWS
+++ b/glabels2/NEWS
@@ -1,3 +1,11 @@
+* gLabels 2.2.5 (stable) release.  Release date 2009-04-30
+
+- 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).
+- New templates.
+
+
 * gLabels 2.2.4 (stable) release.  Release date 2008-12-22
 
 - Corrected button order in "Open" and "Save as" dialogs.

diff --git a/glabels2/configure.in b/glabels2/configure.in
index ec7bde18cfe1a062ebeac27a3c39665c393603bd..06bd811c1e02f4a443cea15f124ee3875c90459d 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.2.4, http://sourceforge.net/tracker/?func=add&group_id=46122&atid=445116)
+AC_INIT(glabels, 2.2.5, 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)
 

diff --git a/glabels2/docs/libglabels/libglabels-decl-list.txt b/glabels2/docs/libglabels/libglabels-decl-list.txt
index d1dcf984d6def23c45f03dd4ae27ed690ac074db..d3e6343c1b158c1b8e031df63f6ed35de95a8a43 100644 (file)
--- a/glabels2/docs/libglabels/libglabels-decl-list.txt
+++ b/glabels2/docs/libglabels/libglabels-decl-list.txt
@@ -1,3 +1,26 @@
+<SECTION>
+<FILE>xml-paper</FILE>
+lgl_xml_paper_read_papers_from_file
+lgl_xml_paper_parse_papers_doc
+lgl_xml_paper_parse_paper_node
+</SECTION>
+
+<SECTION>
+<FILE>enums</FILE>
+lglUnitsType
+</SECTION>
+
+<SECTION>
+<FILE>xml-category</FILE>
+lgl_xml_category_read_categories_from_file
+lgl_xml_category_parse_categories_doc
+lgl_xml_category_parse_category_node
+</SECTION>
+
+<SECTION>
+<FILE>libglabels</FILE>
+</SECTION>
+
 <SECTION>
 <FILE>db</FILE>
 lglDbRegStatus
@@ -36,46 +59,6 @@ lgl_db_print_known_templates
 lgl_db_print_aliases
 </SECTION>
 
-<SECTION>
-<FILE>xml</FILE>
-LGL_XML_NAME_SPACE
-lgl_xml_get_prop_string
-lgl_xml_get_prop_i18n_string
-lgl_xml_get_prop_double
-lgl_xml_get_prop_boolean
-lgl_xml_get_prop_int
-lgl_xml_get_prop_uint
-lgl_xml_get_prop_length
-lgl_xml_set_prop_string
-lgl_xml_set_prop_double
-lgl_xml_set_prop_boolean
-lgl_xml_set_prop_int
-lgl_xml_set_prop_uint_hex
-lgl_xml_set_prop_length
-lgl_xml_is_node
-lgl_xml_get_node_content
-lgl_xml_set_default_units
-</SECTION>
-
-<SECTION>
-<FILE>xml-template</FILE>
-lgl_xml_template_read_templates_from_file
-lgl_xml_template_parse_templates_doc
-lgl_xml_template_parse_template_node
-lgl_xml_template_write_templates_to_file
-lgl_xml_template_write_template_to_file
-lgl_xml_template_create_template_node
-</SECTION>
-
-<SECTION>
-<FILE>libglabels</FILE>
-</SECTION>
-
-<SECTION>
-<FILE>enums</FILE>
-lglUnitsType
-</SECTION>
-
 <SECTION>
 <FILE>str</FILE>
 lgl_str_utf8_casecmp
@@ -135,25 +118,42 @@ lgl_template_markup_free
 </SECTION>
 
 <SECTION>
-<FILE>xml-paper</FILE>
-lgl_xml_paper_read_papers_from_file
-lgl_xml_paper_parse_papers_doc
-lgl_xml_paper_parse_paper_node
+<FILE>category</FILE>
+lglCategory
+lgl_category_new
+lgl_category_dup
+lgl_category_free
 </SECTION>
 
 <SECTION>
-<FILE>xml-category</FILE>
-lgl_xml_category_read_categories_from_file
-lgl_xml_category_parse_categories_doc
-lgl_xml_category_parse_category_node
+<FILE>xml</FILE>
+LGL_XML_NAME_SPACE
+lgl_xml_get_prop_string
+lgl_xml_get_prop_i18n_string
+lgl_xml_get_prop_double
+lgl_xml_get_prop_boolean
+lgl_xml_get_prop_int
+lgl_xml_get_prop_uint
+lgl_xml_get_prop_length
+lgl_xml_set_prop_string
+lgl_xml_set_prop_double
+lgl_xml_set_prop_boolean
+lgl_xml_set_prop_int
+lgl_xml_set_prop_uint_hex
+lgl_xml_set_prop_length
+lgl_xml_is_node
+lgl_xml_get_node_content
+lgl_xml_set_default_units
 </SECTION>
 
 <SECTION>
-<FILE>category</FILE>
-lglCategory
-lgl_category_new
-lgl_category_dup
-lgl_category_free
+<FILE>xml-template</FILE>
+lgl_xml_template_read_templates_from_file
+lgl_xml_template_parse_templates_doc
+lgl_xml_template_parse_template_node
+lgl_xml_template_write_templates_to_file
+lgl_xml_template_write_template_to_file
+lgl_xml_template_create_template_node
 </SECTION>
 
 <SECTION>

diff --git a/glabels2/gtk-doc.make b/glabels2/gtk-doc.make
index 6a30ea1d393c41e6ef2c27cc3811d1d25bac4f72..354ffb7c66c4e6151ed126f63320d03f7b21d6b3 100644 (file)
--- a/glabels2/gtk-doc.make
+++ b/glabels2/gtk-doc.make
@@ -5,11 +5,11 @@
 ####################################
 
 if GTK_DOC_USE_LIBTOOL
-GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
 else
-GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
 endif
 
 # We set GPATH here; this gives us semantics for GNU make
@@ -128,7 +128,7 @@ maintainer-clean-local: clean
        cd $(srcdir) && rm -rf xml html
 
 install-data-local:
-       installfiles=`echo $(srcdir)/html/*`; \
+       -installfiles=`echo $(srcdir)/html/*`; \
        if test "$$installfiles" = '$(srcdir)/html/*'; \
        then echo '-- Nothing to install' ; \
        else \
@@ -139,8 +139,8 @@ install-data-local:
          done; \
          echo '-- Installing $(srcdir)/html/index.sgml' ; \
          $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
-         (which gtkdoc-rebase >& /dev/null && \
-            gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR)) || : ; \
+         which gtkdoc-rebase >/dev/null && \
+           gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
        fi
        
 
@@ -165,8 +165,8 @@ dist-hook: dist-check-gtkdoc dist-hook-local
        -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
        -cp $(srcdir)/xml/*.xml $(distdir)/xml
        cp $(srcdir)/html/* $(distdir)/html
-       cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
-       cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+       -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+       -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
        cd $(distdir) && rm -f $(DISTCLEANFILES)
        -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
 

diff --git a/glabels2/src/ui-commands.c b/glabels2/src/ui-commands.c
index eb3b342c370b363533ae825921a3822bb51c48c5..9a06936fee44df3d97b7255e5d169c88951c47f8 100644 (file)
--- a/glabels2/src/ui-commands.c
+++ b/glabels2/src/ui-commands.c
@@ -1098,7 +1098,7 @@ gl_ui_cmd_help_about (GtkAction *action,
                 NULL
         };
         
-        const gchar *copy_text = "Copyright \xc2\xa9 2001-2007 Jim Evins";
+        const gchar *copy_text = "Copyright \xc2\xa9 2001-2009 Jim Evins";
 
         const gchar *about_text = _("A label and business card creation program.\n");