* release updates (version, NEWS, packaging)

  * add pkg-config files
  * update to latest libtool and new autoconf macros
  * cleanup library symbol exports
    * remove test programs using internal hooks
  * improve portability of some format specifiers
  * fix missing stub for --without-x - thanks to Simon Schmeisser for a patch!
  * fix --disable-pthread compile errors and warnings
  * fix XImage size mismatch background artifacts

ChangeLog

@@ -1,7 +1,16 @@
-current:
+version 0.5:
+  * release updates (version, NEWS, packaging)
+  * add pkg-config files
+  * update to latest libtool and new autoconf macros
+  * cleanup library symbol exports
+    * remove test programs using internal hooks
+  * improve portability of some format specifiers
+  * fix missing stub for --without-x - thanks to Simon Schmeisser for a patch!
+  * fix --disable-pthread compile errors and warnings
+  * fix XImage size mismatch background artifacts
   * fix new generated file distribution errors
-  * switch Qt headers to old-style names (possible Qt3 support?)
-  * add independent API versioning for GTK and Qt widget libraries
+  * switch Qt headers to old-style names (investigate possible Qt3 support?)
+  * add independent ABI versioning for GTK and Qt widget libraries
   * reimplement widget internals to support image scanning and
     improve locking efficiency
   * add image scanning to widgets. including builtin conversions from

Makefile.am

@@ -1,13 +1,18 @@
 AM_CPPFLAGS = -I$(srcdir)/include
-AM_CFLAGS = -Wall -Werror
+AM_CFLAGS = -Wall
 AM_CXXFLAGS = $(AM_CFLAGS)
+ACLOCAL_AMFLAGS = -I config
 bin_PROGRAMS =
 check_PROGRAMS =
 lib_LTLIBRARIES =
 CLEANFILES =
+DISTCLEANFILES =
 BUILT_SOURCES =
 EXTRA_DIST =
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = zebra.pc
+
 dist_doc_DATA = COPYING.LIB HACKING INSTALL NEWS README TODO
 
 include $(srcdir)/include/Makefile.am.inc
@@ -20,12 +25,14 @@ include $(srcdir)/zebracam/Makefile.am.inc
 endif
 if HAVE_GTK
 include $(srcdir)/gtk/Makefile.am.inc
+pkgconfig_DATA += zebra-gtk.pc
 if HAVE_PYTHON
 include $(srcdir)/pygtk/Makefile.am.inc
 endif
 endif
 if HAVE_QT
 include $(srcdir)/qt/Makefile.am.inc
+pkgconfig_DATA += zebra-qt.pc
 endif
 if HAVE_NPAPI
 include $(srcdir)/plugin/Makefile.am.inc
@@ -36,5 +43,7 @@ include $(srcdir)/doc/Makefile.am.inc
 EXTRA_DIST += examples/upcrpc.pl examples/upcrpc.py \
     zebra.spec.in zebra.spec \
     debian/changelog debian/compat debian/control debian/copyright \
-    debian/docs debian/libzebra0.install debian/libzebra-dev.install \
-    debian/rules debian/shlibs.local debian/zebra-tools.install
+    debian/rules debian/libzebra3.install debian/libzebra-dev.install \
+    debian/libzebragtk0.install debian/libzebragtk-dev.install \
+    debian/libzebraqt0.install debian/libzebraqt-dev.install \
+    debian/python-zebrapygtk.install debian/zebra-tools.install

NEWS

@@ -1,5 +1,14 @@
 Zebra Barcode Reader
 
+version 0.5 (2008-07-25):
+  Introducing zebra widgets!  Prioritized by popular demand, this
+  release includes fully functional barcode scanning widgets for GTK,
+  PyGTK, and Qt.  Application developers may now seamlessly integrate
+  barcode reader support with their user interface.
+
+  This release also fixes many bugs; existing users are encouraged to
+  upgrade.  
+
 version 0.4 (2008-05-31):
   new support for EAN-8, Code 39 and Interleaved 2 of 5!
   this release also introduces the long awaited decoder configuration

README

@@ -1,12 +1,13 @@
 ZEBRA BARCODE READER
 ====================
 
-Zebra is a layered barcode scanning and decoding library.  It supports
-EAN, UPC, Code 128, Code 39 and Interleaved 2 of 5.  Included with the
-library are basic applications for decoding captured barcode images
-and using a video device (eg, webcam) as a barcode scanner.  The
-library eatures a fast streaming interface with minimal memory
-footprint.
+Zebra is a library for scanning and decoding bar codes from various
+sources such as video streams, image files or raw intensity sensors.
+It supports EAN, UPC, Code 128, Code 39 and Interleaved 2 of
+5. Included with the library are basic applications for decoding
+captured bar code images and using a video device (eg, webcam) as a
+bar code scanner.  The flexible, layered architecture features a fast,
+streaming interface with a minimal memory footprint.
 
 Check the zebra library home page for the latest release, mailing
 lists, etc.

TODO

@@ -8,7 +8,6 @@ general:
   * example using SANE to scan symbol(s)
 
 wrappers:
-  * zebragtk, QZebra library -version-info
   * build API docs for zebragtk, zebrapygtk
   * is zebragtk/QZebra BGR4 alpha swapped?
   * widget config APIs
@@ -29,6 +28,7 @@ decoder:
     * Code-39/i25 check digit (after implementation)
     * Code-39 full ASCII (after implementation)
     * require min/max length (for variable length symbologies)
+    * standard symbology identifiers (which standard?)
     * set consistency requirements
     * set scanner filter params
 
@@ -58,5 +58,4 @@ window:
 zebracam/zebraimg:
   * stats/fps at zebracam exit
   * xml output format
-  * option to use standard symbology identifiers (which standard?)
   * decode hook (program/script)? (also zebraimg?)

configure.ac

@@ -1,11 +1,13 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.61])
-AC_INIT([zebra], [0.4], [[email protected]])
+AC_INIT([zebra], [0.5], [[email protected]])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR(config)
 AM_INIT_AUTOMAKE([1.10 -Wall -Werror foreign subdir-objects std-options dist-bzip2])
 AC_CONFIG_HEADERS([include/config.h])
 AC_CONFIG_SRCDIR(zebra/scanner.c)
+LT_PREREQ([2.2])
+LT_INIT([dlopen])
 
 dnl update these just before each release (along w/pacakge version above)
 dnl   LIB_VERSION update instructions copied from libtool docs:
@@ -18,8 +20,8 @@ dnl   - If any interfaces have been added since the last public release,
 dnl     then increment age.
 dnl   - If any interfaces have been removed since the last public release,
 dnl     then set age to 0. 
-AC_SUBST([LIB_VERSION], [4:0:1])
-AC_SUBST([RELDATE], [2008-05-31])
+AC_SUBST([LIB_VERSION], [5:0:2])
+AC_SUBST([RELDATE], [2008-07-25])
 
 dnl widget libraries use their own versioning.
 dnl NB pygtk wrapper is *unversioned*
@@ -38,7 +40,6 @@ dnl programs
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_CXX
-AC_PROG_LIBTOOL
 
 PKG_PROG_PKG_CONFIG
 
@@ -312,7 +313,14 @@ AC_CONFIG_COMMANDS([doc/reldate.xml],
   [RELDATE="$RELDATE"]
 )
 
-AC_CONFIG_FILES([Makefile zebra.spec doc/doxygen.conf])
+AC_CONFIG_FILES([
+Makefile
+zebra.pc
+zebra-gtk.pc
+zebra-qt.pc
+zebra.spec
+doc/doxygen.conf
+])
 AC_OUTPUT
 
 dnl summary log

debian/changelog

@@ -1,19 +1,29 @@
-libzebra (0.4-1) unstable; urgency=low
+zebra (0.5-1) unstable; urgency=low
+
+  * update to release 0.5
+  * change source package name to zebra
+  * update binary name for new soname
+  * add binary packages for new widgets
+  * fixes for multi-package build
+  * remove autoreconf and documentation rebuild, along w/associated depends
+
+ -- Jeff Brown <[email protected]>  Fri, 25 July 2008 21:00:00 -0500
+
+zebra (0.4-1) unstable; urgency=low
 
   * update to release 0.4
 
- -- Jeff Brown <[email protected]>  Fri, 30 May 3008 09:00:00 +0500
+ -- Jeff Brown <[email protected]>  Fri, 30 May 2008 09:00:00 -0500
 
-libzebra (0.2-1) unstable; urgency=low
+zebra (0.2-1) unstable; urgency=low
 
   * Added libsdl dependency
   * automake1.10 is now required
 
  -- V�t Hrachov� <[email protected]>  Thu, 17 May 2007 9:20:45 +0200
 
-libzebra (0.1-1) unstable; urgency=low
+zebra (0.1-1) unstable; urgency=low
 
   * Initial release
 
  -- V�t Hrachov� <[email protected]>  Wed, 11 Apr 2007 21:15:45 +0200
-

debian/compat

@@ -1 +1 @@
-5
+7

debian/control

@@ -1,30 +1,121 @@
-Source: libzebra
+Source: zebra
+Section: libs
 Priority: optional
 Maintainer: V�t Hrachov� <[email protected]>
-Build-Depends: debhelper (>= 5), autotools-dev, libmagick++9-dev, autoconf (>= 2.61), automake (>= 1:1.10), libtool (>= 1.5.22), xmlto (>= 0.0.18)
-Standards-Version: 3.7.2
+Homepage: http://zebra.sourceforge.net
+Build-Depends: debhelper (>= 7), pkg-config, libx11-dev, python-dev (>= 2.3), libgtk2.0-dev, python-gtk2-dev, libqt4-dev, libmagick++9-dev
+Standards-Version: 3.8.0
+
+Package: libzebra3
 Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: bar code scanning and decoding library
+ Zebra is a library for scanning and decoding bar codes from various
+ sources such as video streams, image files or raw intensity sensors.
+ It supports EAN, UPC, Code 128, Code 39 and Interleaved 2 of 5. The
+ flexible, layered architecture features a fast, streaming interface
+ with a minimal memory footprint.
+ .
+ This package contains the shared library.
 
 Package: libzebra-dev
 Section: libdevel
 Architecture: any
-Depends: libzebra (= ${Source-Version})
-Description: Header files for Zebra bar code reading library.
- This packages installs files neccessary for development using Zebra barcodes
- decoding library.
+Depends: libzebra3 (= ${binary:Version})
+Conflicts: libzebra-dev
+Description: bar code library extra development files
+ Zebra is a library for scanning and decoding bar codes from various
+ sources such as video streams, image files or raw intensity sensors.
+ It supports EAN, UPC, Code 128, Code 39 and Interleaved 2 of 5. The
+ flexible, layered architecture features a fast, streaming interface
+ with a minimal memory footprint.
+ .
+ This package contains header files and additional libraries used for
+ developing applications that read bar codes with this library.
 
-Package: libzebra
+Package: libzebragtk0
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Bar codes reading library with small memory footprint
- Zebra is a layered barcode (EAN/UPC and Code 128) scanning and decoding
- library. Features a fast streaming interface with minimal memory footprint.
+Depends: libzebra3 (= ${binary:Version}), libgtk2.0-0
+Description: bar code reader GTK widget
+ Zebra is a library for scanning and decoding bar codes from various
+ sources such as video streams, image files or raw intensity sensors.
+ It supports EAN, UPC, Code 128, Code 39 and Interleaved 2 of 5. The
+ flexible, layered architecture features a fast, streaming interface
+ with a minimal memory footprint.
+ .
+ This package contains a bar code scanning widget for use with GUI
+ applications based on GTK+-2.0.
+
+Package: libzebragtk-dev
+Section: libdevel
+Architecture: any
+Depends: libzebragtk0 (= ${binary:Version}), libgtk2.0-dev
+Description: bar code reader GTK widget extra development files
+ Zebra is a library for scanning and decoding bar codes from various
+ sources such as video streams, image files or raw intensity sensors.
+ It supports EAN, UPC, Code 128, Code 39 and Interleaved 2 of 5. The
+ flexible, layered architecture features a fast, streaming interface
+ with a minimal memory footprint.
+ .
+ This package contains header files and additional libraries used for
+ developing GUI applications based on GTK+-2.0 that include a bar code
+ scanning widget.
+
+Package: python-zebrapygtk
+Section: libs
+Architecture: any
+Depends: libzebra3 (= ${binary:Version}), python (>= 2.3), python-gtk2
+Description: bar code reader PyGTK widget
+ Zebra is a library for scanning and decoding bar codes from various
+ sources such as video streams, image files or raw intensity sensors.
+ It supports EAN, UPC, Code 128, Code 39 and Interleaved 2 of 5. The
+ flexible, layered architecture features a fast, streaming interface
+ with a minimal memory footprint.
+ .
+ This package contains a bar code scanning widget for use in GUI
+ applications based on PyGTK.
+
+Package: libzebraqt0
+Section: libs
+Architecture: any
+Depends: libzebra3 (= ${binary:Version}), libqt4-0
+Description: bar code reader Qt widget
+ Zebra is a library for scanning and decoding bar codes from various
+ sources such as video streams, image files or raw intensity sensors.
+ It supports EAN, UPC, Code 128, Code 39 and Interleaved 2 of 5. The
+ flexible, layered architecture features a fast, streaming interface
+ with a minimal memory footprint.
+ .
+ This package contains a bar code scanning widget for use with GUI
+ applications based on Qt4.
+
+Package: libzebraqt-dev
+Section: libdevel
+Architecture: any
+Depends: libzebraqt0 (= ${binary:Version}), libqt4-dev
+Description: bar code reader Qt widget extra development files
+ Zebra is a library for scanning and decoding bar codes from various
+ sources such as video streams, image files or raw intensity sensors.
+ It supports EAN, UPC, Code 128, Code 39 and Interleaved 2 of 5. The
+ flexible, layered architecture features a fast, streaming interface
+ with a minimal memory footprint.
+ .
+ This package contains header files and additional libraries used for
+ developing GUI applications based on Qt4 that include a bar code
+ scanning widget.
 
 Package: zebra-tools
 Section: graphics
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmagick9
-Description: Reading barcodes using web camera or scanned images
- This package provides tools for reading barcodes using web camera or using
- scanned images.
+Depends: libzebra3 (= ${binary:Version}), ${shlibs:Depends}, libmagick9
+Description: utilities for reading bar codes from a webcam or image files
+ Zebra is a library for scanning and decoding bar codes from various
+ sources such as video streams, image files or raw intensity sensors.
+ It supports EAN, UPC, Code 128, Code 39 and Interleaved 2 of 5. The
+ flexible, layered architecture features a fast, streaming interface
+ with a minimal memory footprint.
+ .
+ This package provides basic applications for reading bar codes from a
+ video device or from captured images of bar codes.

debian/libzebra-dev.install

@@ -1,6 +1,14 @@
-usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
-usr/lib/*.la
-usr/share/pkgconfig/*
+usr/include/zebra.h
+usr/include/zebra/Exception.h
+usr/include/zebra/Symbol.h
+usr/include/zebra/Image.h
+usr/include/zebra/Decoder.h
+usr/include/zebra/Scanner.h
+usr/include/zebra/ImageScanner.h
+usr/include/zebra/Video.h
+usr/include/zebra/Window.h
+usr/include/zebra/Processor.h
+usr/lib/libzebra.la
+usr/lib/libzebra.a
+usr/lib/libzebra.so
+usr/lib/pkgconfig/zebra.pc

debian/libzebra3.install

@@ -0,0 +1 @@
+usr/lib/libzebra.so.*

debian/libzebragtk-dev.install

@@ -0,0 +1,5 @@
+usr/include/zebra/zebragtk.h
+usr/lib/libzebragtk.la
+usr/lib/libzebragtk.a
+usr/lib/libzebragtk.so
+usr/lib/pkgconfig/zebra-gtk.pc

debian/libzebragtk0.install

@@ -0,0 +1 @@
+usr/lib/libzebragtk.so.*

debian/libzebraqt-dev.install

@@ -0,0 +1,5 @@
+usr/include/zebra/QZebra*.h
+usr/lib/libzebraqt.la
+usr/lib/libzebraqt.a
+usr/lib/libzebraqt.so
+usr/lib/pkgconfig/zebra-qt.pc

debian/libzebraqt0.install

@@ -0,0 +1 @@
+usr/lib/libzebraqt.so.*

debian/python-zebrapygtk.install

@@ -0,0 +1 @@
+usr/lib/python*