From 2853b473f63b4bc87c4c61c247d52121312c30b8 Mon Sep 17 00:00:00 2001
From: Robin Stuart <robin@zint.org.uk>
Date: Thu, 7 Oct 2010 17:03:41 +0100
Subject: [PATCH] Reduce Warnings in Debian

A number of adjustments to reduce the warnings when building .deb packages in Debian
---
 CMakeLists.txt             |  2 +-
 backend/qr.c               |  2 +-
 cmake/modules/FindQr.cmake | 29 -----------------------------
 debian/changelog           |  2 +-
 debian/control             | 12 ++++++------
 debian/libzint-dev.install |  1 -
 6 files changed, 9 insertions(+), 39 deletions(-)
 delete mode 100644 cmake/modules/FindQr.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f2419e1..caef3819 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set (ZINT_VERSION_MAJOR 2)
 set (ZINT_VERSION_MINOR 4)
-set (ZINT_VERSION_RELEASE 0)
+set (ZINT_VERSION_RELEASE 1)
 set (ZINT_VERSION "${ZINT_VERSION_MAJOR}.${ZINT_VERSION_MINOR}.${ZINT_VERSION_RELEASE}" )
 
 add_definitions (-DZINT_VERSION=\"${ZINT_VERSION}\" -Wall)
diff --git a/backend/qr.c b/backend/qr.c
index 3384c588..3bf04f7b 100644
--- a/backend/qr.c
+++ b/backend/qr.c
@@ -168,7 +168,7 @@ void qr_binary(int datastream[], int version, int target_binlen, char mode[], in
 {
 	/* Convert input data to a binary stream and add padding */
 	int position = 0, debug = 0;
-	int short_data_block_length, i, scheme;
+	int short_data_block_length, i, scheme = 1;
 	char data_block, padbits;
 	int current_binlen, current_bytes;
 	int toggle, percent;
diff --git a/cmake/modules/FindQr.cmake b/cmake/modules/FindQr.cmake
deleted file mode 100644
index 9bae7aa4..00000000
--- a/cmake/modules/FindQr.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-# - Find QRencode
-# Find the native QRencode includes and library
-#
-#  QR_INCLUDE_DIR - where to find qrencode.h, etc.
-#  QR_LIBRARIES   - List of libraries when using QRencode.
-#  QR_FOUND       - True if QRencode found.
-
-
-IF (QR_INCLUDE_DIR)
-  # Already in cache, be silent
-  SET(QR_FIND_QUIETLY TRUE)
-ENDIF (QR_INCLUDE_DIR)
-
-FIND_PATH(QR_INCLUDE_DIR qrencode.h)
-
-FIND_LIBRARY(QR_LIBRARY NAMES qrencode )
-
-# handle the QUIETLY and REQUIRED arguments and set QR_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(QR DEFAULT_MSG QR_LIBRARY QR_INCLUDE_DIR)
-
-IF(QR_FOUND)
-  SET( QR_LIBRARIES ${QR_LIBRARY} )
-ELSE(QR_FOUND)
-  SET( QR_LIBRARIES )
-ENDIF(QR_FOUND)
-
-MARK_AS_ADVANCED( QR_LIBRARY QR_INCLUDE_DIR )
diff --git a/debian/changelog b/debian/changelog
index 78035ad4..ea29d15b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-zint (2.4-1) unstable; urgency=low
+zint (2.4.1) unstable; urgency=low
 
   * Update and review of files required by Debian including changelog.
 
diff --git a/debian/control b/debian/control
index 47cb1636..7143647a 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Homepage: http://www.zint.org.uk/
 Package: libzint
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: libpng12-dev
 Description: A library for encoding data in barcode symbols.
    Zint is an Open Source barcode encoding and image generating library.
    It currently features support for over 50 symbologies including
@@ -22,7 +22,7 @@ Package: libzint-dbg
 Section: libs
 Architecture: any
 Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: libzint (= ${binary:Version})
 Description: Debugging symbols for Zint library.
    This package contains debugging files used to investigate problems with
  Zint binaries and libraries.
@@ -38,14 +38,14 @@ Description: Zint development files
 Package: libqzint
 Section: libs
 Architecture: any
-Depends: libzint (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libzint (= ${binary:Version}), libqt4-dev
 Description: Qt wrapper for Zint
    This package contains a Qt wrapper for the Zint barcode encoding library.
 
 Package: libqzint-dev
 Section: libdevel
 Architecture: any
-Depends: libqzint (= ${binary:Version}), libzint-dev (= ${source:Version})
+Depends: libqzint (= ${binary:Version}), libzint-dev (= ${source:Version}), libqt4-dev
 Description: QZint development files.
    This package contains development files for the Qt wrapper over the Zint
  library.
@@ -53,14 +53,14 @@ Description: QZint development files.
 Package: zint-cli
 Section: libs
 Architecture: any
-Depends: libzint (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libzint (= ${binary:Version})
 Description: Zint console frontend.
    This package contains a console frontend for the Zint barcode encoder.
 
 Package: zint-qt
 Section: libs
 Architecture: any
-Depends: libzint (= ${binary:Version}), libqzint (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libzint (= ${binary:Version}), libqzint (= ${binary:Version}), libqt4-dev
 Description: Zint Barcode Studio.
    This package contains Zint Barcode Studio, a QT frontend for the Zint
  barcode encoding library.
diff --git a/debian/libzint-dev.install b/debian/libzint-dev.install
index b9ec78ba..4c8a20a2 100644
--- a/debian/libzint-dev.install
+++ b/debian/libzint-dev.install
@@ -1,3 +1,2 @@
 usr/include/zint.h
 usr/lib/libzint.so
-usr/share/cmake-2.6/Modules/FindZint.cmake