From c37dbc205f6a08254456ca5e6eabf5ddda0c2e85 Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Fri, 17 Aug 2007 03:22:55 +0000 Subject: [PATCH] 2007-08-16 Jim Evins * Makefile.am: Include subdir iec16022-0.2.1. * NEWS: * configure.in: * glabels.spec.in: Preparation for 2.1.4. git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@666 f5e0f49d-192f-0410-a22d-a8d8700d0965 --- glabels2/ChangeLog | 10 ++ glabels2/Makefile.am | 11 +- glabels2/NEWS | 24 +++- glabels2/configure.in | 2 +- .../docs/libglabels/libglabels-decl-list.txt | 125 +++++++++++------- .../libglabels/libglabels-undocumented.txt | 15 ++- glabels2/docs/libglabels/tmpl/enums.sgml | 3 + .../libglabels/tmpl/libglabels-unused.sgml | 16 +++ glabels2/docs/libglabels/tmpl/libglabels.sgml | 3 + glabels2/docs/libglabels/tmpl/paper.sgml | 3 + glabels2/docs/libglabels/tmpl/template.sgml | 22 +-- glabels2/docs/libglabels/tmpl/xml-paper.sgml | 3 + .../docs/libglabels/tmpl/xml-template.sgml | 3 + glabels2/docs/libglabels/tmpl/xml.sgml | 3 + glabels2/glabels.spec.in | 5 +- 15 files changed, 168 insertions(+), 80 deletions(-) diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog index 1e9a9a40..55c3922c 100644 --- a/glabels2/ChangeLog +++ b/glabels2/ChangeLog @@ -1,3 +1,13 @@ +2007-08-16 Jim Evins + + * Makefile.am: + Include subdir iec16022-0.2.1. + * NEWS: + * configure.in: + * glabels.spec.in: + Preparation for 2.1.4. + + 2007-08-11 Jim Evins * po/POTFILES.in: diff --git a/glabels2/Makefile.am b/glabels2/Makefile.am index 63fdd828..db73aa1d 100644 --- a/glabels2/Makefile.am +++ b/glabels2/Makefile.am @@ -1,8 +1,17 @@ ## Process this file with automake to produce Makefile.in LIB_BARCODE_DIR = barcode-0.98 +LIB_IEC16022_DIR = iec16022-0.2.1 -SUBDIRS = po $(LIB_BARCODE_DIR) libglabels src data help docs +SUBDIRS = \ + po \ + $(LIB_BARCODE_DIR) \ + $(LIB_IEC16022_DIR) \ + libglabels \ + src \ + data \ + help \ + docs EXTRA_DIST = \ README \ diff --git a/glabels2/NEWS b/glabels2/NEWS index aa022f30..fa181471 100644 --- a/glabels2/NEWS +++ b/glabels2/NEWS @@ -1,4 +1,21 @@ -* gLabels 2.1.3 (unstable) release. Release date 2005-05-27. +* gLabels 2.1.4 (unstable) release. Release date 2007-08-17. + +- Added categorization of templates and an updated New Label dialog. +- Added initial support for datamatrix 2D barcodes. +- 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 splash screen. +- Added support for Brazilian CEPNet barcodes. +- Updated French translation (Claude Paroz) +- New Experanto translation (Antonio C. Codazzi) +- Minor bug fixes (and probably some new bugs). +- New templates. + + +* gLabels 2.1.3 (unstable) release. Release date 2006-05-27. - Don't print "Invalid barcode data" if data field is empty. (Bug #1479839) (Darren Warner) - Fixed hangup when grid or markup have been toggled during a previous session. (Bug #1434324) @@ -6,6 +23,7 @@ - Fixed color groups in color combo widgets. - Fixed several potential crashes. + * gLabels 2.1.2 (unstable) release. Release date 2005-12-21. - Updated Italian translation (Daniele Medri) @@ -17,6 +35,7 @@ - New minimal merge backend for VCards using evolution data server API (Austin Henry) - New templates and fixes + * gLabels 2.1.1 (unstable) release. Release date 2005-06-21. - Added document merge tutorial to help documentation @@ -30,11 +49,13 @@ - Minor bug fixes and cleanup - New templates + * gLabels 2.1.0 (unstable) release. Release date 2005-01-22. - Added ability to select color from merge source (Frederic Ruaudel) - See 2.0.2 + * gLabels 2.0.2 release. Release date 2005-01-22. - Desktop file reconciled with desktop-entry-spec @@ -53,6 +74,7 @@ - Updated japanese translations (Takeshi AIHANA) - Fixed crash from improperly freeing translation strings. + * gLabels 2.0.0 release. Release date 2004-08-09. - Fixed crash when encountering old template files diff --git a/glabels2/configure.in b/glabels2/configure.in index 2755d497..587548aa 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.1.pre4cvs, http://sourceforge.net/tracker/?func=add&group_id=46122&atid=445116) +AC_INIT(glabels, 2.1.4, 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 d2f04aad..81caed8b 100644 --- a/glabels2/docs/libglabels/libglabels-decl-list.txt +++ b/glabels2/docs/libglabels/libglabels-decl-list.txt @@ -1,33 +1,22 @@
-paper -glPaper -gl_paper_init -gl_paper_new -gl_paper_dup -gl_paper_free -gl_paper_get_id_list -gl_paper_free_id_list -gl_paper_get_name_list -gl_paper_free_name_list -gl_paper_is_id_known -gl_paper_is_id_other -gl_paper_from_id -gl_paper_from_name -gl_paper_lookup_id_from_name -gl_paper_lookup_name_from_id -gl_paper_print_known_papers -
- -
-xml-paper -gl_xml_paper_read_papers_from_file -gl_xml_paper_parse_papers_doc -gl_xml_paper_parse_paper_node -
- -
-enums -glUnitsType +xml +GL_XML_NAME_SPACE +gl_xml_get_prop_string +gl_xml_get_prop_i18n_string +gl_xml_get_prop_double +gl_xml_get_prop_boolean +gl_xml_get_prop_int +gl_xml_get_prop_uint +gl_xml_get_prop_length +gl_xml_set_prop_string +gl_xml_set_prop_double +gl_xml_set_prop_boolean +gl_xml_set_prop_int +gl_xml_set_prop_uint_hex +gl_xml_set_prop_length +gl_xml_is_node +gl_xml_get_node_content +gl_xml_set_default_units
@@ -41,6 +30,15 @@ gl_xml_template_create_templates_doc gl_xml_template_create_template_node
+
+libglabels +
+ +
+enums +glUnitsType +
+
template glTemplate @@ -52,15 +50,18 @@ glTemplateLabelShape glTemplateMarkupType gl_template_init gl_template_register -gl_template_get_name_list +gl_template_get_name_list_unique +gl_template_get_name_list_all gl_template_free_name_list gl_template_from_name -gl_template_get_name_with_desc gl_template_get_first_label_type +gl_template_does_page_size_match +gl_template_does_category_match gl_template_get_label_size gl_template_get_n_labels gl_template_get_origins gl_template_new +gl_template_add_category gl_template_add_label_type gl_template_add_alias gl_template_rect_label_type_new @@ -85,27 +86,51 @@ gl_template_print_aliases
-libglabels +xml-paper +gl_xml_paper_read_papers_from_file +gl_xml_paper_parse_papers_doc +gl_xml_paper_parse_paper_node
-xml -GL_XML_NAME_SPACE -gl_xml_get_prop_string -gl_xml_get_prop_i18n_string -gl_xml_get_prop_double -gl_xml_get_prop_boolean -gl_xml_get_prop_int -gl_xml_get_prop_uint -gl_xml_get_prop_length -gl_xml_set_prop_string -gl_xml_set_prop_double -gl_xml_set_prop_boolean -gl_xml_set_prop_int -gl_xml_set_prop_uint_hex -gl_xml_set_prop_length -gl_xml_is_node -gl_xml_get_node_content -gl_xml_set_default_units +xml-category +gl_xml_category_read_categories_from_file +gl_xml_category_parse_categories_doc +gl_xml_category_parse_category_node +
+ +
+category +glCategory +gl_category_init +gl_category_new +gl_category_dup +gl_category_free +gl_category_get_name_list +gl_category_free_name_list +gl_category_from_name +gl_category_from_id +gl_category_lookup_id_from_name +gl_category_lookup_name_from_id +
+ +
+paper +glPaper +gl_paper_init +gl_paper_new +gl_paper_dup +gl_paper_free +gl_paper_get_id_list +gl_paper_free_id_list +gl_paper_get_name_list +gl_paper_free_name_list +gl_paper_is_id_known +gl_paper_is_id_other +gl_paper_from_id +gl_paper_from_name +gl_paper_lookup_id_from_name +gl_paper_lookup_name_from_id +gl_paper_print_known_papers
diff --git a/glabels2/docs/libglabels/libglabels-undocumented.txt b/glabels2/docs/libglabels/libglabels-undocumented.txt index 7ebb69e5..544dfd37 100644 --- a/glabels2/docs/libglabels/libglabels-undocumented.txt +++ b/glabels2/docs/libglabels/libglabels-undocumented.txt @@ -1,6 +1,7 @@ -47% symbol docs coverage. -36 symbols documented. -41 not documented. +52% symbol docs coverage. +46 symbols documented. +1 symbols incomplete. +43 not documented. glPaper @@ -11,6 +12,7 @@ glTemplateLayout glTemplateMarkup glTemplateMarkupType glTemplateOrigin +glUnitsType (GL_UNITS_POINT, GL_UNITS_INCH, GL_UNITS_MM, GL_UNITS_CM, GL_UNITS_PICA, GL_UNITS_FIRST, GL_UNITS_LAST) gl_template_add_alias gl_template_add_label_type gl_template_add_layout @@ -23,8 +25,6 @@ gl_template_from_name gl_template_get_first_label_type gl_template_get_label_size gl_template_get_n_labels -gl_template_get_name_list -gl_template_get_name_with_desc gl_template_get_origins gl_template_init gl_template_label_type_dup @@ -45,3 +45,8 @@ gl_template_register gl_template_round_label_type_new gl_xml_template_create_templates_doc + +libglabels:Long_Description +libglabels:Short_Description +template:Long_Description +template:Short_Description diff --git a/glabels2/docs/libglabels/tmpl/enums.sgml b/glabels2/docs/libglabels/tmpl/enums.sgml index 132a74e9..41985e9d 100644 --- a/glabels2/docs/libglabels/tmpl/enums.sgml +++ b/glabels2/docs/libglabels/tmpl/enums.sgml @@ -14,6 +14,9 @@ This section defines enumerations used to interact with libglabels. + + + Enumerations for the units of length supported by libglabels. Internally diff --git a/glabels2/docs/libglabels/tmpl/libglabels-unused.sgml b/glabels2/docs/libglabels/tmpl/libglabels-unused.sgml index 9a551bc9..5c82261f 100644 --- a/glabels2/docs/libglabels/tmpl/libglabels-unused.sgml +++ b/glabels2/docs/libglabels/tmpl/libglabels-unused.sgml @@ -4,3 +4,19 @@ + + + + + +@page_size: +@Returns: + + + + + + +@template: +@Returns: + diff --git a/glabels2/docs/libglabels/tmpl/libglabels.sgml b/glabels2/docs/libglabels/tmpl/libglabels.sgml index efbf6865..0552a20b 100644 --- a/glabels2/docs/libglabels/tmpl/libglabels.sgml +++ b/glabels2/docs/libglabels/tmpl/libglabels.sgml @@ -14,3 +14,6 @@ libglabels + + + diff --git a/glabels2/docs/libglabels/tmpl/paper.sgml b/glabels2/docs/libglabels/tmpl/paper.sgml index 95a9ab22..4b64ad7c 100644 --- a/glabels2/docs/libglabels/tmpl/paper.sgml +++ b/glabels2/docs/libglabels/tmpl/paper.sgml @@ -15,6 +15,9 @@ and related functions. + + + diff --git a/glabels2/docs/libglabels/tmpl/template.sgml b/glabels2/docs/libglabels/tmpl/template.sgml index ab8ea4bd..52dbd008 100644 --- a/glabels2/docs/libglabels/tmpl/template.sgml +++ b/glabels2/docs/libglabels/tmpl/template.sgml @@ -14,6 +14,9 @@ template + + + @@ -24,6 +27,7 @@ template @page_size: @page_width: @page_height: +@categories: @label_types: @aliases: @@ -97,15 +101,6 @@ template @template: - - - - - -@page_size: -@Returns: - - @@ -123,15 +118,6 @@ template @Returns: - - - - - -@template: -@Returns: - - diff --git a/glabels2/docs/libglabels/tmpl/xml-paper.sgml b/glabels2/docs/libglabels/tmpl/xml-paper.sgml index 5c7b2316..b125962c 100644 --- a/glabels2/docs/libglabels/tmpl/xml-paper.sgml +++ b/glabels2/docs/libglabels/tmpl/xml-paper.sgml @@ -15,6 +15,9 @@ XML paper definition files. + + + diff --git a/glabels2/docs/libglabels/tmpl/xml-template.sgml b/glabels2/docs/libglabels/tmpl/xml-template.sgml index e652c7cd..0a30e009 100644 --- a/glabels2/docs/libglabels/tmpl/xml-template.sgml +++ b/glabels2/docs/libglabels/tmpl/xml-template.sgml @@ -16,6 +16,9 @@ template files and document files. + + + diff --git a/glabels2/docs/libglabels/tmpl/xml.sgml b/glabels2/docs/libglabels/tmpl/xml.sgml index ee1cc88c..a1022b72 100644 --- a/glabels2/docs/libglabels/tmpl/xml.sgml +++ b/glabels2/docs/libglabels/tmpl/xml.sgml @@ -18,6 +18,9 @@ These functions are basically wrappers to functions from libxml2. + + + diff --git a/glabels2/glabels.spec.in b/glabels2/glabels.spec.in index d452c91e..0c737637 100644 --- a/glabels2/glabels.spec.in +++ b/glabels2/glabels.spec.in @@ -13,15 +13,11 @@ Prefix: %{_prefix} BuildRequires: gtk2-devel >= @GTK_REQUIRED@ BuildRequires: libxml2-devel >= @LIBXML_REQUIRED@ BuildRequires: libgnomeui-devel >= @LIBGNOMEUI_REQUIRED@ -BuildRequires: libgnomecanvas-devel >= @LIBGNOMECANVAS_REQUIRED@ -BuildRequires: libgnomeprintui22-devel >= @LIBGNOMEPRINT_REQUIRED@ BuildRequires: libglade2-devel >= @LIBGLADE_REQUIRED@ Requires: gtk2 >= @GTK_REQUIRED@ Requires: libxml2 >= @LIBXML_REQUIRED@ Requires: libgnomeui >= @LIBGNOMEUI_REQUIRED@ -Requires: libgnomecanvas >= @LIBGNOMECANVAS_REQUIRED@ -Requires: libgnomeprintui22 >= @LIBGNOMEPRINT_REQUIRED@ Requires: libglade2 >= @LIBGLADE_REQUIRED@ %description @@ -52,6 +48,7 @@ desktop-file-install --vendor gnome --delete-original \ %{__rm} -f %{buildroot}%{_datadir}/mime/XMLnamespaces %{__rm} -f %{buildroot}%{_datadir}/mime/globs %{__rm} -f %{buildroot}%{_datadir}/mime/magic +%{__rm} -f %{buildroot}%{_datadir}/mime/mime.cache %{__rm} -rf %{buildroot}%{_datadir}/mime/application %{__rm} -rf %{buildroot}%{_datadir}/mime/aliases %{__rm} -rf %{buildroot}%{_datadir}/mime/subclasses -- 2.39.2