2007-08-16 Jim Evins <evins@snaught.com>

	* 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

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index 1e9a9a404ee4ced054e4521a7a2a77e7b4e09fb2..55c3922c0db0a1c3b99642b666aed0d1e0ee864a 100644 (file)
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,13 @@
+2007-08-16  Jim Evins  <evins@snaught.com>
+
+       * Makefile.am:
+               Include subdir iec16022-0.2.1.
+       * NEWS:
+       * configure.in:
+       * glabels.spec.in:
+               Preparation for 2.1.4.
+       
+
 2007-08-11  Jim Evins  <evins@snaught.com>
 
        * po/POTFILES.in:

diff --git a/glabels2/Makefile.am b/glabels2/Makefile.am
index 63fdd82894fb665f647415689b2fbdd8d5c8093d..db73aa1d5e78acc0583b0e7a2073afe656bac22a 100644 (file)
--- 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 aa022f308a8bc4fd63cc5c8a27eaa0ba8be363bd..fa181471e34fb4633b337d56db3146027e7ecbbd 100644 (file)
--- 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 2755d497a6bdbbf628287b6f219c6a52bdafa99c..587548aaf1e598aa6528f5dd410bc66f87239f36 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.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 d2f04aad429a43046345800e9a1136480c784883..81caed8bca7b6ebe5b77254bbf470911c6d891cc 100644 (file)
--- a/glabels2/docs/libglabels/libglabels-decl-list.txt
+++ b/glabels2/docs/libglabels/libglabels-decl-list.txt
@@ -1,33 +1,22 @@
 <SECTION>
-<FILE>paper</FILE>
-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
-</SECTION>
-
-<SECTION>
-<FILE>xml-paper</FILE>
-gl_xml_paper_read_papers_from_file
-gl_xml_paper_parse_papers_doc
-gl_xml_paper_parse_paper_node
-</SECTION>
-
-<SECTION>
-<FILE>enums</FILE>
-glUnitsType
+<FILE>xml</FILE>
+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
 </SECTION>
 
 <SECTION>
@@ -41,6 +30,15 @@ gl_xml_template_create_templates_doc
 gl_xml_template_create_template_node
 </SECTION>
 
+<SECTION>
+<FILE>libglabels</FILE>
+</SECTION>
+
+<SECTION>
+<FILE>enums</FILE>
+glUnitsType
+</SECTION>
+
 <SECTION>
 <FILE>template</FILE>
 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
 </SECTION>
 
 <SECTION>
-<FILE>libglabels</FILE>
+<FILE>xml-paper</FILE>
+gl_xml_paper_read_papers_from_file
+gl_xml_paper_parse_papers_doc
+gl_xml_paper_parse_paper_node
 </SECTION>
 
 <SECTION>
-<FILE>xml</FILE>
-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
+<FILE>xml-category</FILE>
+gl_xml_category_read_categories_from_file
+gl_xml_category_parse_categories_doc
+gl_xml_category_parse_category_node
+</SECTION>
+
+<SECTION>
+<FILE>category</FILE>
+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
+</SECTION>
+
+<SECTION>
+<FILE>paper</FILE>
+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
 </SECTION>
 

diff --git a/glabels2/docs/libglabels/libglabels-undocumented.txt b/glabels2/docs/libglabels/libglabels-undocumented.txt
index 7ebb69e5ecfe41a676a9dbbc04fe2d1144ad04f2..544dfd37abed4d726624fd35b24d6560dbaabedb 100644 (file)
--- 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 132a74e9c2f9a6f02f667d78b2440852fde73662..41985e9d916e74d2703507f02d37f326a4d2a7a2 100644 (file)
--- 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.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### ENUM glUnitsType ##### -->
 <para>
 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 9a551bc96a4241d996a764c14e445776faac40b1..5c82261f9536e67d5686cb04eb53ddc8aa4d9abf 100644 (file)
--- a/glabels2/docs/libglabels/tmpl/libglabels-unused.sgml
+++ b/glabels2/docs/libglabels/tmpl/libglabels-unused.sgml
@@ -4,3 +4,19 @@
 </para>
 
 
+<!-- ##### FUNCTION gl_template_get_name_list ##### -->
+<para>
+
+</para>
+
+@page_size: 
+@Returns: 
+
+<!-- ##### FUNCTION gl_template_get_name_with_desc ##### -->
+<para>
+
+</para>
+
+@template: 
+@Returns: 
+

diff --git a/glabels2/docs/libglabels/tmpl/libglabels.sgml b/glabels2/docs/libglabels/tmpl/libglabels.sgml
index efbf6865f5528b52d26f142784242a1a7c8cb819..0552a20b6e9179e950850e9ff90d0a8c4fc645a8 100644 (file)
--- a/glabels2/docs/libglabels/tmpl/libglabels.sgml
+++ b/glabels2/docs/libglabels/tmpl/libglabels.sgml
@@ -14,3 +14,6 @@ libglabels
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+

diff --git a/glabels2/docs/libglabels/tmpl/paper.sgml b/glabels2/docs/libglabels/tmpl/paper.sgml
index 95a9ab2291bc49fd9552a472eefd6004ad40c561..4b64ad7ceb0461147dbe5dcb498fe33114e8e3ff 100644 (file)
--- a/glabels2/docs/libglabels/tmpl/paper.sgml
+++ b/glabels2/docs/libglabels/tmpl/paper.sgml
@@ -15,6 +15,9 @@ and related functions.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT glPaper ##### -->
 <para>
 

diff --git a/glabels2/docs/libglabels/tmpl/template.sgml b/glabels2/docs/libglabels/tmpl/template.sgml
index ab8ea4bdcd91bf05bcdb745a5120b910067f9f6d..52dbd008780323bc2ea1d754eac356d708d214f8 100644 (file)
--- a/glabels2/docs/libglabels/tmpl/template.sgml
+++ b/glabels2/docs/libglabels/tmpl/template.sgml
@@ -14,6 +14,9 @@ template
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT glTemplate ##### -->
 <para>
 
@@ -24,6 +27,7 @@ template
 @page_size: 
 @page_width: 
 @page_height: 
+@categories: 
 @label_types: 
 @aliases: 
 
@@ -97,15 +101,6 @@ template
 @template: 
 
 
-<!-- ##### FUNCTION gl_template_get_name_list ##### -->
-<para>
-
-</para>
-
-@page_size: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gl_template_free_name_list ##### -->
 <para>
 
@@ -123,15 +118,6 @@ template
 @Returns: 
 
 
-<!-- ##### FUNCTION gl_template_get_name_with_desc ##### -->
-<para>
-
-</para>
-
-@template: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gl_template_get_first_label_type ##### -->
 <para>
 

diff --git a/glabels2/docs/libglabels/tmpl/xml-paper.sgml b/glabels2/docs/libglabels/tmpl/xml-paper.sgml
index 5c7b23167841d1d56d80b72cb93b302fda4dca91..b125962ccb15847fee54cf6caf7d6ed0fdf231f1 100644 (file)
--- a/glabels2/docs/libglabels/tmpl/xml-paper.sgml
+++ b/glabels2/docs/libglabels/tmpl/xml-paper.sgml
@@ -15,6 +15,9 @@ XML paper definition files.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION gl_xml_paper_read_papers_from_file ##### -->
 <para>
 

diff --git a/glabels2/docs/libglabels/tmpl/xml-template.sgml b/glabels2/docs/libglabels/tmpl/xml-template.sgml
index e652c7cd402b6c219372a5e88eeb7863bcb314a7..0a30e00970e0033ebd5f5aee1a143a638952c231 100644 (file)
--- 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.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION gl_xml_template_read_templates_from_file ##### -->
 <para>
 

diff --git a/glabels2/docs/libglabels/tmpl/xml.sgml b/glabels2/docs/libglabels/tmpl/xml.sgml
index ee1cc88ca7ccbb0766d8766d053a43ca12c185ff..a1022b72bde152914aed4ff036e263323b9267fb 100644 (file)
--- 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.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION gl_xml_get_prop_double ##### -->
 <para>
 

diff --git a/glabels2/glabels.spec.in b/glabels2/glabels.spec.in
index d452c91e0ba8b9956c3c17188cc6950ea8cc2db4..0c737637f58fffbb00915a78b7eef5573b151d53 100644 (file)
--- 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