From 9d1db9a86dc38a2828d571e80d2a65f6d28c8ba1 Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Tue, 19 Aug 2008 02:24:37 +0000 Subject: [PATCH] 2008-08-18 Jim Evins * NEWS: * configure.in: * docs/libglabels/tmpl/paper.sgml: Prepare for 2.2.3 release. git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@779 f5e0f49d-192f-0410-a22d-a8d8700d0965 --- glabels2/ChangeLog | 7 +++++ glabels2/NEWS | 13 ++++++++ glabels2/configure.in | 8 ++--- glabels2/docs/libglabels/tmpl/paper.sgml | 2 ++ glabels2/gtk-doc.make | 40 +++++++++++++++++------- 5 files changed, 55 insertions(+), 15 deletions(-) diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog index 5d6b1452..0c400181 100644 --- a/glabels2/ChangeLog +++ b/glabels2/ChangeLog @@ -1,3 +1,10 @@ +2008-08-18 Jim Evins + + * NEWS: + * configure.in: + * docs/libglabels/tmpl/paper.sgml: + Prepare for 2.2.3 release. + 2008-08-17 Jim Evins * data/dtd/glabels-2.2.dtd: diff --git a/glabels2/NEWS b/glabels2/NEWS index 15822d26..c15acfc7 100644 --- a/glabels2/NEWS +++ b/glabels2/NEWS @@ -1,3 +1,16 @@ +* gLabels 2.2.3 (stable) release. Release date 2008-08-17 + +- Explicitely set page size when printing -- don't let print back-end use + a default size (Bug #2049431). +- Sets more appropriate object size limits for any aspect ratio (Bug #1993550). +- Fixed crash of glabels-batch (Bug #1968653). +- Fixed bug with barcode and image merge radio buttons (Bug #1959135). +- Will now attempt to parse newer namespaces (Bug #1872584). +- Fixed drawing errors when drawing markup on rotated labels. +- New korean translation (xein@navir.com). +- New templates. + + * gLabels 2.2.2 (stable) release. Release date 2008-02-22 - Fixed crash when creating Code128C barcode (Bug #1766425). diff --git a/glabels2/configure.in b/glabels2/configure.in index a5cf3562..d617aafa 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.2, http://sourceforge.net/tracker/?func=add&group_id=46122&atid=445116) +AC_INIT(glabels, 2.2.3, 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,9 +39,9 @@ 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=5 -LIBGLABELS_R=1 -LIBGLABELS_A=0 +LIBGLABELS_C=6 +LIBGLABELS_R=0 +LIBGLABELS_A=1 LIBGLABELS_VERSION_INFO=${LIBGLABELS_C}:${LIBGLABELS_R}:${LIBGLABELS_A} AC_SUBST(LIBGLABELS_VERSION_INFO) diff --git a/glabels2/docs/libglabels/tmpl/paper.sgml b/glabels2/docs/libglabels/tmpl/paper.sgml index d08f8729..dc69d746 100644 --- a/glabels2/docs/libglabels/tmpl/paper.sgml +++ b/glabels2/docs/libglabels/tmpl/paper.sgml @@ -27,6 +27,7 @@ This structure defines a paper (page) size. @name: Localized paper size name. @width: Width of paper in points. @height: Height of paper in points. +@pwg_size: PWG 5101.1-2002 size name. @@ -37,6 +38,7 @@ This structure defines a paper (page) size. @name: @width: @height: +@pwg_size: @Returns: diff --git a/glabels2/gtk-doc.make b/glabels2/gtk-doc.make index eeb23b49..6a30ea1d 100644 --- a/glabels2/gtk-doc.make +++ b/glabels2/gtk-doc.make @@ -38,7 +38,12 @@ SCANOBJ_FILES = \ $(DOC_MODULE).prerequisites \ $(DOC_MODULE).signals -CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-unused.txt $(DOC_STAMPS) +REPORT_FILES = \ + $(DOC_MODULE)-undocumented.txt \ + $(DOC_MODULE)-undeclared.txt \ + $(DOC_MODULE)-unused.txt + +CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) if ENABLE_GTK_DOC all-local: html-build.stamp @@ -53,6 +58,8 @@ docs: html-build.stamp scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) @echo 'gtk-doc: Scanning header files' @-chmod -R u+w $(srcdir) + cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ else \ @@ -61,11 +68,9 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) test -f $$i || touch $$i ; \ done \ fi - cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) touch scan-build.stamp -$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp +$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true #### templates #### @@ -79,6 +84,10 @@ tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections tmpl.stamp: tmpl-build.stamp @true +tmpl/*.sgml: + @true + + #### xml #### sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) @@ -96,11 +105,11 @@ sgml.stamp: sgml-build.stamp html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) @echo 'gtk-doc: Building HTML' @-chmod -R u+w $(srcdir) - rm -rf $(srcdir)/html + rm -rf $(srcdir)/html mkdir $(srcdir)/html cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo 'gtk-doc: Fixing cross-references' + @echo 'gtk-doc: Fixing cross-references' cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) touch html-build.stamp @@ -110,8 +119,13 @@ clean-local: rm -f *~ *.bak rm -rf .libs +distclean-local: + cd $(srcdir) && \ + rm -rf xml $(REPORT_FILES) \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + maintainer-clean-local: clean - cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + cd $(srcdir) && rm -rf xml html install-data-local: installfiles=`echo $(srcdir)/html/*`; \ @@ -125,7 +139,10 @@ 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)) || : ; \ fi + uninstall-local: rm -f $(DESTDIR)$(TARGET_DIR)/* @@ -147,9 +164,10 @@ dist-hook: dist-check-gtkdoc dist-hook-local mkdir $(distdir)/html -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl -cp $(srcdir)/xml/*.xml $(distdir)/xml - -cp $(srcdir)/html/* $(distdir)/html - if test -f $(srcdir)/$(DOC_MODULE).types; then \ - cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \ - fi + cp $(srcdir)/html/* $(distdir)/html + 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 .PHONY : dist-hook-local docs -- 2.39.5