* release updates (version, NEWS, packaging)

  * adjust [py]gtk distributed files

ChangeLog

@@ -1,4 +1,6 @@
 version 0.7:
+  * release updates (version, NEWS, packaging)
+  * adjust [py]gtk distributed files
   * draw new logo (rough, no Xrender yet)
   * fix Makefile.am syntax error
   * fixup some perl distribution details

Makefile.am

@@ -1,5 +1,5 @@
 AM_CPPFLAGS = -I$(srcdir)/include
-AM_CFLAGS = -Wall -Werror
+AM_CFLAGS = -Wall
 AM_CXXFLAGS = $(AM_CFLAGS)
 ACLOCAL_AMFLAGS = -I config
 bin_PROGRAMS =
@@ -44,8 +44,12 @@ endif
 include $(srcdir)/test/Makefile.am.inc
 include $(srcdir)/doc/Makefile.am.inc
 
+EXTRA_DIST += zbar.spec.in zbar.spec
+
 EXTRA_DIST += examples/upcrpc.pl examples/upcrpc.py examples/paginate.pl \
-    zbar.spec.in zbar.spec
+    examples/barcode.png examples/processor.pl examples/processor.py \
+    examples/scan_image.c examples/scan_image.cpp examples/scan_image.pl \
+    examples/scan_image.py
 
 EXTRA_DIST += perl/MANIFEST perl/README perl/Changes perl/COPYING.LIB \
     perl/Makefile.PL perl/typemap perl/ZBar.xs perl/ppport.h \

NEWS

@@ -1,5 +1,12 @@
 ZBar Barcode Reader
 
+version 0.7 (2009-04-21):
+  Welcome to ZBar!  In addition to finalizing the project name change,
+  this release adds new bindings for Python and fixes a few bugs with
+  the Perl interface.  The decoder also has several new features and
+  addresses missing checks that will improve reliability with
+  excessively noisy images.
+
 version 0.6 (2009-02-28):
   This release fixes many bugs and adds several improvements suggested
   by users:  support for decoding UPC-E is finished.  zebraimg is

configure.ac

@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.61])
-AC_INIT([zbar], [0.6], [[email protected]])
+AC_INIT([zbar], [0.7], [[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])
@@ -21,7 +21,7 @@ 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], [0:0:0])
-AC_SUBST([RELDATE], [2009-02-28])
+AC_SUBST([RELDATE], [2009-04-21])
 
 dnl widget libraries use their own versioning.
 dnl NB pygtk wrapper is *unversioned*

gtk/Makefile.am.inc

@@ -4,9 +4,10 @@ gtk_libzbargtk_la_LDFLAGS = -version-info $(ZGTK_LIB_VERSION) \
     -export-symbols-regex "^zbar_gtk_.*" $(AM_LDFLAGS)
 gtk_libzbargtk_la_LIBADD = $(GTK_LIBS) zbar/libzbar.la $(AM_LIBADD)
 
-gtk_libzbargtk_la_SOURCES = gtk/zbargtk.c gtk/zbargtkprivate.h \
-    gtk/zbarmarshal.c gtk/zbarmarshal.h
+dist_gtk_libzbargtk_la_SOURCES = gtk/zbargtk.c gtk/zbargtkprivate.h
+nodist_gtk_libzbargtk_la_SOURCES = gtk/zbarmarshal.c gtk/zbarmarshal.h
 BUILT_SOURCES += gtk/zbarmarshal.c gtk/zbarmarshal.h
+CLEANFILES += gtk/zbarmarshal.c gtk/zbarmarshal.h
 EXTRA_DIST += gtk/zbarmarshal.list
 
 %.h: %.list

pygtk/Makefile.am.inc

@@ -6,9 +6,11 @@ pygtk_zbarpygtk_la_LDFLAGS = -shared -module -avoid-version -export-dynamic \
 pygtk_zbarpygtk_la_LIBADD = \
     $(PYTHON_LIBS) $(PYGTK_LIBS) gtk/libzbargtk.la $(AM_LIBADD)
 
-pygtk_zbarpygtk_la_SOURCES = pygtk/zbarpygtkmodule.c pygtk/zbarpygtk.c
+dist_pygtk_zbarpygtk_la_SOURCES = pygtk/zbarpygtkmodule.c
+nodist_pygtk_zbarpygtk_la_SOURCES = pygtk/zbarpygtk.c
 BUILT_SOURCES += pygtk/zbarpygtk.c pygtk/zbarpygtk.defs
-EXTRA_DIST += pygtk/zbarpygtk.override pygtk/zbarpygtk.c pygtk/zbarpygtk.defs
+CLEANFILES += pygtk/zbarpygtk.c pygtk/zbarpygtk.defs
+EXTRA_DIST += pygtk/zbarpygtk.override
 
 # FIXME ugly hack to fixup new name... now non-standard?
 pygtk/zbarpygtk.defs: include/zbar/zbargtk.h

zbar.spec.in

@@ -13,7 +13,7 @@ Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
-The ZBar Barcode Reader is a library for scanning and decoding bar
+The ZBar Bar Code Reader 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
@@ -25,7 +25,7 @@ Summary: bar code library extra development files
 Requires: %{name} = %{version}
 
 %description devel
-The ZBar Barcode Reader is a library for scanning and decoding bar
+The ZBar Bar Code Reader 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
@@ -40,7 +40,7 @@ Summary: bar code reader GTK widget
 Requires: %{name} = %{version}, gtk2
 
 %description gtk
-The ZBar Barcode Reader is a library for scanning and decoding bar
+The ZBar Bar Code Reader 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
@@ -55,7 +55,7 @@ Summary: bar code reader GTK widget extra development files
 Requires: %{name}-gtk = %{version}, %{name}-devel = %{version}, gtk2-devel
 
 %description gtk-devel
-The ZBar Barcode Reader is a library for scanning and decoding bar
+The ZBar Bar Code Reader 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
@@ -71,7 +71,7 @@ Summary: bar code reader PyGTK widget
 Requires: %{name} = %{version}, pygtk2
 
 %description pygtk
-The ZBar Barcode Reader is a library for scanning and decoding bar
+The ZBar Bar Code Reader 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
@@ -86,7 +86,7 @@ Summary: bar code reader Qt widget
 Requires: %{name} = %{version}, qt >= 4
 
 %description qt
-The ZBar Barcode Reader is a library for scanning and decoding bar
+The ZBar Bar Code Reader 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
@@ -101,7 +101,7 @@ Summary: bar code reader Qt widget extra development files
 Requires: %{name}-qt = %{version}, %{name}-devel = %{version}, qt-devel >= 4
 
 %description qt-devel
-The ZBar Barcode Reader is a library for scanning and decoding bar
+The ZBar Bar Code Reader 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
@@ -194,8 +194,8 @@ ldconfig
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
-* Thu Apr 16 2009 spadix <[email protected]>
-- project name change
+* Thu Apr 21 2009 spadix <[email protected]>
+- version 0.7 project name change
 
 * Thu Jul 24 2008 spadix <[email protected]>
 - version 0.5 updates (new widget packages)