From a686482a44735db78ca8732260a50bca126ad32e Mon Sep 17 00:00:00 2001
From: Robin Stuart <robin@zint.org.uk>
Date: Wed, 20 Oct 2010 21:39:07 +0100
Subject: [PATCH] Change debian packages

Consolidate Debian packages to create four packages with name
and function to match those used for Fedora.
---
 debian/control                                | 46 +++++--------------
 debian/qzintfrontend.install                  |  1 -
 ...libzint-dev.install => zint-devel.install} |  0
 ...zint-dev.install => zint-qt-devel.install} |  0
 debian/{libqzint.install => zint-qt.install}  |  1 +
 debian/{libzint.install => zint.install}      |  1 +
 debian/zintfrontend.install                   |  1 -
 7 files changed, 13 insertions(+), 37 deletions(-)
 delete mode 100644 debian/qzintfrontend.install
 rename debian/{libzint-dev.install => zint-devel.install} (100%)
 rename debian/{libqzint-dev.install => zint-qt-devel.install} (100%)
 rename debian/{libqzint.install => zint-qt.install} (57%)
 rename debian/{libzint.install => zint.install} (61%)
 delete mode 100644 debian/zintfrontend.install

diff --git a/debian/control b/debian/control
index 7143647a..5ae1367c 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ 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: libpng12-dev
@@ -17,51 +17,27 @@ Description: A library for encoding data in barcode symbols.
    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: libzint (= ${binary:Version})
-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})
+Depends: zint (= ${binary:Version})
 Description: Zint development files
    This package contains development files for the Zint barcode encoding
  library.
 
-Package: libqzint
-Section: libs
-Architecture: any
-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}), libqt4-dev
-Description: QZint development files.
-   This package contains development files for the Qt wrapper over the Zint
- library.
-
-Package: zint-cli
-Section: libs
-Architecture: any
-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}), libqt4-dev
+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: zint-qt-devel
+Section: libdevel
+Architecture: any
+Depends: zint (= ${binary:Version}), zint-qt (= ${source:Version}), libqt4-dev
+Description: QZint development files.
+   This package contains development files for the Qt wrapper over the Zint
+ library.
\ No newline at end of file
diff --git a/debian/qzintfrontend.install b/debian/qzintfrontend.install
deleted file mode 100644
index 66674579..00000000
--- a/debian/qzintfrontend.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/zint-qt
diff --git a/debian/libzint-dev.install b/debian/zint-devel.install
similarity index 100%
rename from debian/libzint-dev.install
rename to debian/zint-devel.install
diff --git a/debian/libqzint-dev.install b/debian/zint-qt-devel.install
similarity index 100%
rename from debian/libqzint-dev.install
rename to debian/zint-qt-devel.install
diff --git a/debian/libqzint.install b/debian/zint-qt.install
similarity index 57%
rename from debian/libqzint.install
rename to debian/zint-qt.install
index d07ebfb1..de70f44d 100644
--- a/debian/libqzint.install
+++ b/debian/zint-qt.install
@@ -1 +1,2 @@
 usr/lib/libQZint.so.*
+usr/bin/zint-qt
diff --git a/debian/libzint.install b/debian/zint.install
similarity index 61%
rename from debian/libzint.install
rename to debian/zint.install
index f363cca8..d0ca3895 100644
--- a/debian/libzint.install
+++ b/debian/zint.install
@@ -1 +1,2 @@
 usr/lib/libzint.so.*
+usr/bin/zint
diff --git a/debian/zintfrontend.install b/debian/zintfrontend.install
deleted file mode 100644
index 294ee99a..00000000
--- a/debian/zintfrontend.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/zint