From b26cfcc7d50b6980fae589120ccca4f2348642d0 Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Thu, 30 Apr 2009 03:09:17 +0000 Subject: [PATCH] 2009-04-29 Jim Evins * 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 --- glabels2/ChangeLog | 9 ++ glabels2/NEWS | 8 ++ glabels2/configure.in | 2 +- .../docs/libglabels/libglabels-decl-list.txt | 106 +++++++++--------- glabels2/gtk-doc.make | 18 +-- glabels2/src/ui-commands.c | 2 +- 6 files changed, 81 insertions(+), 64 deletions(-) diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog index e75c905e..eea2a733 100644 --- a/glabels2/ChangeLog +++ b/glabels2/ChangeLog @@ -1,3 +1,12 @@ +2009-04-29 Jim Evins + + * 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 * data/templates/avery-iso-templates.xml: diff --git a/glabels2/NEWS b/glabels2/NEWS index c6bff365..9fd2b224 100644 --- 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 ec7bde18..06bd811c 100644 --- 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 d1dcf984..d3e6343c 100644 --- a/glabels2/docs/libglabels/libglabels-decl-list.txt +++ b/glabels2/docs/libglabels/libglabels-decl-list.txt @@ -1,3 +1,26 @@ +
+xml-paper +lgl_xml_paper_read_papers_from_file +lgl_xml_paper_parse_papers_doc +lgl_xml_paper_parse_paper_node +
+ +
+enums +lglUnitsType +
+ +
+xml-category +lgl_xml_category_read_categories_from_file +lgl_xml_category_parse_categories_doc +lgl_xml_category_parse_category_node +
+ +
+libglabels +
+
db lglDbRegStatus @@ -36,46 +59,6 @@ lgl_db_print_known_templates lgl_db_print_aliases
-
-xml -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 -
- -
-xml-template -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 -
- -
-libglabels -
- -
-enums -lglUnitsType -
-
str lgl_str_utf8_casecmp @@ -135,25 +118,42 @@ lgl_template_markup_free
-xml-paper -lgl_xml_paper_read_papers_from_file -lgl_xml_paper_parse_papers_doc -lgl_xml_paper_parse_paper_node +category +lglCategory +lgl_category_new +lgl_category_dup +lgl_category_free
-xml-category -lgl_xml_category_read_categories_from_file -lgl_xml_category_parse_categories_doc -lgl_xml_category_parse_category_node +xml +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
-category -lglCategory -lgl_category_new -lgl_category_dup -lgl_category_free +xml-template +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
diff --git a/glabels2/gtk-doc.make b/glabels2/gtk-doc.make index 6a30ea1d..354ffb7c 100644 --- 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 eb3b342c..9a06936f 100644 --- 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"); -- 2.39.5