synchronized with master

debian/changelog

@@ -1,3 +1,64 @@
+zint (2.4.1) unstable; urgency=low
+
+  * Update and review of files required by Debian including changelog.
+
+ -- Robin Stuart <robin@zint.org.uk>  Sat, 02 Oct 2010 09:26:00 +0000 
+
+zint (2.4) unstable; urgency=low
+
+  * Built extensions to the API for integrating with glabels thanks
+    to Sam Lown and Jim Evins.
+  * Added code optimisation and input from stdin thanks to Ismael
+    Luceno.
+  * Reinstated escape character input.
+  * Simplification of Barcode Studio.
+
+ -- Robin Stuart <robin@zint.org.uk>  Sat, 02 Oct 2010 05:00:00 +0000 
+
+zint (2.3.2) unstable; urgency=low
+
+  * Corrected many bugs in GS1 DataBar Extended thanks to the careful
+    study of the code by Pablo Orduña at the PIRAmIDE project.
+  * Similarly corrected some bugs in Maxicode thanks to Monica Swanson
+    at Source Technologies.
+  * Also minor bugfixes for ISBN and Aztec Code, and added some small
+    features like a --square option in the CLI.
+
+ -- Robin Stuart <robin@zint.org.uk>  Sat, 02 Oct 2010 04:00:00 +0000 
+
+zint (2.3.1) unstable; urgency=low
+
+  * Removed Codablock-F.
+  * Redesigned scale function so that human readable text and Maxicode
+    symbols can be scaled consistently.
+  * Corrected encoding bugs with Code 128/Code 16k and Data Matrix ECC
+    050.
+  * Added --notext option to CLI.
+
+ -- Robin Stuart <robin@zint.org.uk>  Sat, 02 Oct 2010 03:00:00 +0000 
+
+zint (2.3) unstable; urgency=low
+
+  * Fixed problems with Micro QR Code and rebuilt QR Code support
+    removing dependence on libqrencode.
+  * Improved Kanji character support for QR Code and Micro QR Code
+    which now auto-detects and automatically converts to Shift-JIS.
+  * Added Grid Matrix symbology with Kanji character support and
+    automatic conversion to GB 2312.
+  * Removed no_qr compile option.
+  * Advanced Barcode Studio version number to match library version
+    number.
+
+ -- Robin Stuart <robin@zint.org.uk>  Sat, 02 Oct 2010 02:00:00 +0000 
+
+zint (2.2.2) unstable; urgency=low
+
+  * A beta release previewing the new API structure.
+  * Better NULL character support with "nullchar" value removed.
+  * Added loading from file and sequence dialogs in Barcode Studio.
+
+ -- Robin Stuart <robin@zint.org.uk>  Sat, 02 Oct 2010 01:00:00 +0000
+
 zint (2.2.1-1) unstable; urgency=low
 
   * fix .so version

debian/control

@@ -1,64 +1,43 @@
 Source: zint
 Section: libs
 Priority: extra
-Maintainer: BogDan Vatra <bogdan@licentia.eu>
-Build-Depends: cdbs, debhelper (>= 7), cmake, libpng12-dev, libqrencode-dev, libqt4-dev
-Standards-Version: 3.8.1
+Maintainer: Robin Stuart <robin@zint.org.uk>
+Build-Depends: cdbs, debhelper (>= 7), cmake, libpng12-dev, libqt4-dev
+Standards-Version: 3.9.1
 Homepage: http://www.zint.org.uk/
 
-Package: libzint
+Package: zint
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Zint is an Open Source barcode encoding and image generating library for Linux.
- It currently features:
- Over 50 symbologies including many not available in any other open source package.
- Unicode translation for symbologies which support Latin-1 and Shift-JIS character sets.
- Full GS1 support including data verification and automated insertion of FNC1 characters.
- Support for encoding binary data including NULL (ASCII 0) characters.
- Health Industry Barcode (HIBC) encoding capabilities.
+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
+ QR Code, Data Matrix, Aztec Code, Code 128, UPC/EAN, HIBC, GS1 DataBar and many others.
+   Also included are Unicode translation for symbologies which support Latin-1 and Kanji character sets,
+ full GS1 data support including verification and automated insertion of FNC1 characters and
+ support for encoding binary data including NULL (ASCII 0) characters.
 
-Package: libzint-dbg
-Section: libs
-Architecture: any
-Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Debugging symbols for Zint library.
- This package contains debugging files used to investigate problems with
- Zint binaries and libraries.
-
-Package: libzint-dev
+Package: zint-devel
 Section: libdevel
 Architecture: any
-Depends: libzint (= ${binary:Version})
-Description: Zint development files.
-   This package contains development files for zint.
+Depends: zint (= ${binary:Version})
+Description: Zint development files
+   This package contains development files for the Zint barcode encoding
+ library.
 
-Package: libqzint
+Package: zint-qt
 Section: libs
 Architecture: any
-Depends: libzint (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: Qt wrapper over Zint library
-    This package contains Qt wrapper over Zint library.
+Depends: zint (= ${binary:Version}), libqt4-dev
+Description: Zint Barcode Studio.
+   This package contains Zint Barcode Studio, a QT frontend for the Zint
+ barcode encoding library.
 
-Package: libqzint-dev
+Package: zint-qt-devel
 Section: libdevel
 Architecture: any
-Depends: libqzint (= ${binary:Version}), libzint-dev (= ${source:Version})
+Depends: zint (= ${binary:Version}), zint-qt (= ${source:Version}), libqt4-dev
 Description: QZint development files.
-   This package contains development files for the Qt wrapper over Zint library..
-
-Package: zintfrontend
-Section: libs
-Architecture: any
-Depends: libzint (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: Zint console frontend.
-    This package contains a console frontend.
-
-Package: qzintfrontend
-Section: libs
-Architecture: any
-Depends: libzint (= ${binary:Version}), libqzint (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: Zint QT frontend.
-    This package contains an easy to use QT frontend.
-
+   This package contains development files for the Qt wrapper over the Zint
+ library.

debian/copyright

@@ -1,6 +1,7 @@
 This package was debianized by:
 
     BogDan Vatra <bogdan@licentia.eu> on Sat, 11 Apr 2009 23:45:53 +0300
+    Modified by Robin Stuart <robin@zint.org.uk> on Sat, 02 Oct 2010 11:40:00 +0000
 
 It was downloaded from:
 
@@ -12,7 +13,7 @@ Upstream Author(s):
 
 Copyright:
 
-    <Copyright (C) 2006-2009 Robin Stuart>
+    <Copyright (C) 2006-2010 Robin Stuart>
 
 License:
 
@@ -34,6 +35,6 @@ Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
 
 The Debian packaging is:
 
-    Copyright (C) 2009 BogDan Vatra <bogdan@licentia.eu>
+    Copyright (C) 2010 Robin Stuart <robin@zint.org.uk>
 
 and is licensed under the GPL version 3, see above.

debian/libzint-dev.install

@@ -1,3 +0,0 @@
-usr/include/zint.h
-usr/lib/libzint.so
-usr/share/cmake-2.6/Modules/FindZint.cmake

debian/qzintfrontend.install

@@ -1 +0,0 @@
-usr/bin/zint-qt

debian/zint-devel.install

@@ -0,0 +1,2 @@
+usr/include/zint.h
+usr/lib/libzint.so

debian/zint-qt.install

@@ -1 +1,2 @@
 usr/lib/libQZint.so.*
+usr/bin/zint-qt

debian/zint.install

@@ -1 +1,2 @@
 usr/lib/libzint.so.*
+usr/bin/zint

debian/zintfrontend.install

@@ -1 +0,0 @@
-usr/bin/zint