* fix debian packaging dependencies (bug #2070164)

  * *remove* debian directory from distribution (bug #2070164)
  * fix inappropriately installed headers and man pages (bug #2055133)
  * fix pygtk multiple definition link errors on darwin (bug #2052681)
  * fixes to configure for detecting python settings (bug #2052663)
  * remove zebrapygtk module link against libpython (bug #2052663)

ChangeLog

@@ -1,4 +1,10 @@
 current:
+  * fix debian packaging dependencies (bug #2070164)
+  * *remove* debian directory from distribution (bug #2070164)
+  * fix inappropriately installed headers and man pages (bug #2055133)
+  * fix pygtk multiple definition link errors on darwin (bug #2052681)
+  * fixes to configure for detecting python settings (bug #2052663)
+  * remove zebrapygtk module link against libpython (bug #2052663)
   * add drag and drop support for *images* to Qt widget...unfortunately not
     very useful; every application i tried drops uri-refs rather than images
   * minor reference documentation updates

Makefile.am

@@ -41,9 +41,4 @@ include $(srcdir)/test/Makefile.am.inc
 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/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
+    zebra.spec.in zebra.spec

configure.ac

@@ -228,16 +228,14 @@ AC_ARG_VAR([PYGTK_DEFS], [directory where PyGTK definitions may be found])
 
 AS_IF([test "x$with_python" != "xno"],
   [AM_PATH_PYTHON(2.3.5)
-   AC_CHECK_PROGS([PYTHON_CONFIG], [python-config], [:])
-   AS_IF([test "x$PYTHON_CFLAGS" != "x" && test "x$PYTHON_LIBS" != "x"],
+   AS_IF([test "x$PYTHON_CFLAGS" != "x"],
      [],
-     [test "x$PYTHON_CONFIG" = "x:"],
-     [AC_MSG_FAILURE([found $PYTHON, but can't find python-config?])])
-
-   AS_IF([test "x$PYTHON_CFLAGS" = "x"],
-     [PYTHON_CFLAGS=`$PYTHON_CONFIG --includes`])
-   AS_IF([test "x$PYTHON_LIBS" = "x"],
-     [PYTHON_LIBS=`$PYTHON_CONFIG --libs`])
+     [test "x$PYTHON_CONFIG" != "x" && test -x "$PYTHON_CONFIG"]
+     [PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags`],
+     [test -x "$PYTHON-config"],
+     [PYTHON_CFLAGS=`$PYTHON-config --cflags`],
+     [PYTHON_CFLAGS=`$PYTHON -c 'import distutils.sysconfig as s; print " ".join(s.get_config_vars("CFLAGS")) + " -I"+s.get_python_inc() + " -I"+s.get_python_inc(plat_specific=True)'`])
+dnl FIXME now should check that #include <Python.h> compiles
 
    AS_IF([test "x$with_gtk" = "xyes"],
      [PKG_CHECK_MODULES([PYGTK], [pygtk-2.0])

debian/changelog

@@ -1,3 +1,11 @@
+zebra (0.5-2) unstable; urgency=low
+
+  * update libmagick version (bug #2070164)
+  * fix missing zebrapygtk dependency on libzebragtk (bug #2070164)
+  * also removed debian directory from releases (bug #2070164)
+
+ -- Jeff Brown <[email protected]>  Sun, 24 July 2008 16:00:00 -0500
+
 zebra (0.5-1) unstable; urgency=low
 
   * update to release 0.5

debian/control

@@ -66,7 +66,7 @@ Description: bar code reader GTK widget extra development files
 Package: python-zebrapygtk
 Section: libs
 Architecture: any
-Depends: libzebra3 (= ${binary:Version}), python (>= 2.3), python-gtk2
+Depends: libzebragtk0 (= ${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.
@@ -109,7 +109,7 @@ Description: bar code reader Qt widget extra development files
 Package: zebra-tools
 Section: graphics
 Architecture: any
-Depends: libzebra3 (= ${binary:Version}), ${shlibs:Depends}, libmagick9
+Depends: libzebra3 (= ${binary:Version}), ${shlibs:Depends}, libmagick10
 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.

doc/Makefile.am.inc

@@ -4,7 +4,13 @@ DOCSOURCES = doc/manual.xml doc/version.xml doc/reldate.xml \
 
 
 # man page targets to distribute and install
-dist_man_MANS = doc/man/zebraimg.1 doc/man/zebracam.1
+dist_man_MANS =
+if HAVE_MAGICK
+dist_man_MANS += doc/man/zebraimg.1
+endif
+if HAVE_VIDEO
+dist_man_MANS += doc/man/zebracam.1
+endif
 
 # witness to man page build (many-to-many workaround)
 man_stamp = doc/man/man.stamp

include/Makefile.am.inc

@@ -3,5 +3,11 @@ include_HEADERS = include/zebra.h
 zinclude_HEADERS = include/zebra/Scanner.h include/zebra/Decoder.h \
     include/zebra/Exception.h include/zebra/Symbol.h include/zebra/Image.h \
     include/zebra/ImageScanner.h include/zebra/Video.h include/zebra/Window.h \
-    include/zebra/Processor.h include/zebra/zebragtk.h \
-    include/zebra/QZebra.h include/zebra/QZebraImage.h
+    include/zebra/Processor.h
+
+if HAVE_GTK
+zinclude_HEADERS += include/zebra/zebragtk.h
+endif
+if HAVE_QT
+zinclude_HEADERS += include/zebra/QZebra.h include/zebra/QZebraImage.h
+endif

pygtk/zebrapygtkmodule.c

@@ -21,6 +21,11 @@
  *  http://sourceforge.net/projects/zebra
  *------------------------------------------------------------------------*/
 
+/* avoid "multiple definition" darwin link errors
+ * for symbols defined in pygobject.h (bug #2052681)
+ */
+#define NO_IMPORT_PYGOBJECT
+
 #include <pygobject.h>
 
 void zebrapygtk_register_classes(PyObject*);