14 files changed, 113 insertions, 5 deletions
diff --git a/qt/control/qpf-cyberbit-120-50-t10.control b/qt/control/qpf-cyberbit-120-50-t10.control
index 47cb213..0841ba7 100644
--- a/qt/control/qpf-cyberbit-120-50-t10.control
+++ b/qt/control/qpf-cyberbit-120-50-t10.control
@@ -4,7 +4,7 @@ Priority: required
 Section: opie/system
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Arch: iPAQ
+Version: 2.3.0-6
-Version: 2.3.0-5
+Depends: qte-fonts-common
 Description: Unicode font
 A pre-rendered Unicode font.
diff --git a/qt/control/qpf-cyberbit-120-50-t10.postinst b/qt/control/qpf-cyberbit-120-50-t10.postinst
new file mode 100755
index 0000000..30336ce
--- a/dev/null
+++ b/qt/control/qpf-cyberbit-120-50-t10.postinst
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+if [ "$1" != "configure" ]; then
+    exit 0
+fi
+update-qtfontdir
diff --git a/qt/control/qpf-fixed.control b/qt/control/qpf-fixed.control
new file mode 100644
index 0000000..ac72e90
--- a/dev/null
+++ b/qt/control/qpf-fixed.control
@@ -0,0 +1,9 @@
+Package: qpf-fixed
+Files: $QTDIR/lib/fonts/fixed_*_50.* $QTDIR/lib/fonts/fixed_*_t*5* $QTDIR/lib/fonts/fixed_*t10*
+Priority: required
+Section: opie/system
+Maintainer: Chris Larson <kergoth@handhelds.org>
+Architecture: arm
+Depends: qte-fonts-common
+Version: 1:$QTE_VERSION-$QTE_REVISION
+Description: Fixed font - precompiled QPFs
diff --git a/qt/control/qpf-fixed.postinst b/qt/control/qpf-fixed.postinst
new file mode 100755
index 0000000..30336ce
--- a/dev/null
+++ b/qt/control/qpf-fixed.postinst
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+if [ "$1" != "configure" ]; then
+    exit 0
+fi
+update-qtfontdir
diff --git a/qt/control/qpf-helvetica.control b/qt/control/qpf-helvetica.control
new file mode 100644
index 0000000..8b20ad3
--- a/dev/null
+++ b/qt/control/qpf-helvetica.control
@@ -0,0 +1,9 @@
+Package: qpf-helvetica
+Files: $QTDIR/lib/fonts/helvetica_*_{50,50i,75,75i}.* $QTDIR/lib/fonts/helvetica_*_t*5* $QTDIR/lib/fonts/helvetica_*t10*
+Priority: required
+Section: opie/system
+Maintainer: Chris Larson <kergoth@handhelds.org>
+Depends: qte-fonts-common
+Architecture: arm
+Version: 1:$QTE_VERSION-$QTE_REVISION
+Description: Helvetica font - precompiled QPFs
diff --git a/qt/control/qpf-helvetica.postinst b/qt/control/qpf-helvetica.postinst
new file mode 100755
index 0000000..30336ce
--- a/dev/null
+++ b/qt/control/qpf-helvetica.postinst
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+if [ "$1" != "configure" ]; then
+    exit 0
+fi
+update-qtfontdir
diff --git a/qt/control/qpf-micro.control b/qt/control/qpf-micro.control
new file mode 100644
index 0000000..f993386
--- a/dev/null
+++ b/qt/control/qpf-micro.control
@@ -0,0 +1,9 @@
+Package: qpf-micro
+Files: $QTDIR/lib/fonts/micro_*{50,50_t15,50_t5}.* $QTDIR/lib/fonts/micro_*t10*
+Priority: required
+Section: opie/system
+Maintainer: Chris Larson <kergoth@handhelds.org>
+Architecture: arm
+Depends: qte-fonts-common
+Version: 1:$QTE_VERSION-$QTE_REVISION
+Description: Micro font - precompiled QPFs
diff --git a/qt/control/qpf-micro.postinst b/qt/control/qpf-micro.postinst
new file mode 100755
index 0000000..30336ce
--- a/dev/null
+++ b/qt/control/qpf-micro.postinst
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+if [ "$1" != "configure" ]; then
+    exit 0
+fi
+update-qtfontdir
diff --git a/qt/control/qpf-smallsmooth.control b/qt/control/qpf-smallsmooth.control
new file mode 100644
index 0000000..279f7bd
--- a/dev/null
+++ b/qt/control/qpf-smallsmooth.control
@@ -0,0 +1,9 @@
+Package: qpf-smallsmooth
+Files: $QTDIR/lib/fonts/smallsmooth_*{50,50_t15,50_t5}.* $QTDIR/lib/fonts/smallsmooth_*t10*
+Priority: required
+Section: opie/system
+Maintainer: Chris Larson <kergoth@handhelds.org>
+Architecture: arm
+Depends: qte-fonts-common
+Version: 1:$QTE_VERSION-$QTE_REVISION
+Description: Smallsmooth font - precompiled QPFs
diff --git a/qt/control/qpf-smallsmooth.postinst b/qt/control/qpf-smallsmooth.postinst
new file mode 100755
index 0000000..30336ce
--- a/dev/null
+++ b/qt/control/qpf-smallsmooth.postinst
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+if [ "$1" != "configure" ]; then
+    exit 0
+fi
+update-qtfontdir
diff --git a/qt/control/qpf-smoothtimes.control b/qt/control/qpf-smoothtimes.control
new file mode 100644
index 0000000..6576ea7
--- a/dev/null
+++ b/qt/control/qpf-smoothtimes.control
@@ -0,0 +1,9 @@
+Package: qpf-smoothtimes
+Files: $QTDIR/lib/fonts/smoothtimes_{170,100}_{50,50_t15,50_t5}.* $QTDIR/lib/fonts/smoothtimes_{170,100}_50*t10*
+Priority: required
+Section: opie/system
+Maintainer: Chris Larson <kergoth@handhelds.org>
+Architecture: arm
+Depends: qte-fonts-common
+Version: 1:$QTE_VERSION-$QTE_REVISION
+Description: Smoothtimes font - precompiled QPFs
diff --git a/qt/control/qpf-smoothtimes.postinst b/qt/control/qpf-smoothtimes.postinst
new file mode 100755
index 0000000..30336ce
--- a/dev/null
+++ b/qt/control/qpf-smoothtimes.postinst
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+if [ "$1" != "configure" ]; then
+    exit 0
+fi
+update-qtfontdir
diff --git a/qt/control/qte-fonts-common.control b/qt/control/qte-fonts-common.control
new file mode 100644
index 0000000..403aa88
--- a/dev/null
+++ b/qt/control/qte-fonts-common.control
@@ -0,0 +1,8 @@
+Package: qte-fonts-common
+Files: $QTDIR/bin/update-qtfontdir
+Priority: required
+Section: opie/system
+Maintainer: Opie Team <opie@handhelds.org>
+Architecture: arm
+Version: 1:$QTE_VERSION-$QTE_REVISION
+Description: Qt/Embedded font common files
diff --git a/qt/control/qte-fonts.control b/qt/control/qte-fonts.control
index 332dbfa..0827f9b 100644
--- a/qt/control/qte-fonts.control
+++ b/qt/control/qte-fonts.control
@@ -1,11 +1,12 @@
 Package: qte-fonts
-Files: $QTDIR/lib/fonts/helvetica_*_{50,50i,75,75i}.* $QTDIR/lib/fonts/helvetica_*_t*5* $QTDIR/lib/fonts/fixed_*_50.* $QTDIR/lib/fonts/fixed_*_t*5* $QTDIR/lib/fonts/micro_*{50,50_t15,50_t5}.* $QTDIR/lib/fonts/smallsmooth_*{50,50_t15,50_t5}.* $QTDIR/lib/fonts/smoothtimes_{170,100}_{50,50_t15,50_t5}.* $QTDIR/lib/fonts/fontdir $QTDIR/lib/fonts/helvetica_*t10* $QTDIR/lib/fonts/fixed_*t10* $QTDIR/lib/fonts/micro_*t10* $QTDIR/lib/fonts/smallsmooth_*t10* $QTDIR/lib/fonts/smoothtimes_{170,100}_50*t10* $QTDIR/bin/update-qtfontdir
+Files:
 Priority: required
 Section: opie/system
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
-Depends: libqte2
+Depends: qte-fonts-common, qpf-fixed, qpf-micro
 Provides: libqt2-emb-fonts
 Replaces: qt-embedded-rotation, libqt2-emb-fonts
 Version: 1:$QTE_VERSION-$QTE_REVISION
-Description: Qt/Embedded fonts - 0,90,180,270 rotation
+Description: Qt/Embedded fonts - virtual package
+  Depends on fixed and micro

diff --git a/qt/control/qpf-cyberbit-120-50-t10.control b/qt/control/qpf-cyberbit-120-50-t10.control index 47cb213..0841ba7 100644 --- a/qt/control/qpf-cyberbit-120-50-t10.control +++ b/qt/control/qpf-cyberbit-120-50-t10.control
@@ -4,7 +4,7 @@ Priority: required
4	Section: opie/system	4	Section: opie/system
5	Maintainer: Warwick Allison <warwick@trolltech.com>	5	Maintainer: Warwick Allison <warwick@trolltech.com>
6	Architecture: arm	6	Architecture: arm
7	Arch: iPAQ	7	Version: 2.3.0-6
8	Version: 2.3.0-5	8	Depends: qte-fonts-common
9	Description: Unicode font	9	Description: Unicode font
10	A pre-rendered Unicode font.	10	A pre-rendered Unicode font.


diff --git a/qt/control/qpf-cyberbit-120-50-t10.postinst b/qt/control/qpf-cyberbit-120-50-t10.postinst new file mode 100755 index 0000000..30336ce --- a/dev/null +++ b/qt/control/qpf-cyberbit-120-50-t10.postinst
@@ -0,0 +1,9 @@
		1	#!/bin/sh
		2
		3	set -e
		4
		5	if [ "$1" != "configure" ]; then
		6	exit 0
		7	fi
		8
		9	update-qtfontdir


diff --git a/qt/control/qpf-fixed.control b/qt/control/qpf-fixed.control new file mode 100644 index 0000000..ac72e90 --- a/dev/null +++ b/qt/control/qpf-fixed.control
@@ -0,0 +1,9 @@
		1	Package: qpf-fixed
		2	Files: $QTDIR/lib/fonts/fixed__50. $QTDIR/lib/fonts/fixed__t5* $QTDIR/lib/fonts/fixed_t10
		3	Priority: required
		4	Section: opie/system
		5	Maintainer: Chris Larson <kergoth@handhelds.org>
		6	Architecture: arm
		7	Depends: qte-fonts-common
		8	Version: 1:$QTE_VERSION-$QTE_REVISION
		9	Description: Fixed font - precompiled QPFs


diff --git a/qt/control/qpf-fixed.postinst b/qt/control/qpf-fixed.postinst new file mode 100755 index 0000000..30336ce --- a/dev/null +++ b/qt/control/qpf-fixed.postinst
@@ -0,0 +1,9 @@
		1	#!/bin/sh
		2
		3	set -e
		4
		5	if [ "$1" != "configure" ]; then
		6	exit 0
		7	fi
		8
		9	update-qtfontdir


diff --git a/qt/control/qpf-helvetica.control b/qt/control/qpf-helvetica.control new file mode 100644 index 0000000..8b20ad3 --- a/dev/null +++ b/qt/control/qpf-helvetica.control
@@ -0,0 +1,9 @@
		1	Package: qpf-helvetica
		2	Files: $QTDIR/lib/fonts/helvetica__{50,50i,75,75i}. $QTDIR/lib/fonts/helvetica__t5* $QTDIR/lib/fonts/helvetica_t10
		3	Priority: required
		4	Section: opie/system
		5	Maintainer: Chris Larson <kergoth@handhelds.org>
		6	Depends: qte-fonts-common
		7	Architecture: arm
		8	Version: 1:$QTE_VERSION-$QTE_REVISION
		9	Description: Helvetica font - precompiled QPFs


diff --git a/qt/control/qpf-helvetica.postinst b/qt/control/qpf-helvetica.postinst new file mode 100755 index 0000000..30336ce --- a/dev/null +++ b/qt/control/qpf-helvetica.postinst
@@ -0,0 +1,9 @@
		1	#!/bin/sh
		2
		3	set -e
		4
		5	if [ "$1" != "configure" ]; then
		6	exit 0
		7	fi
		8
		9	update-qtfontdir


diff --git a/qt/control/qpf-micro.control b/qt/control/qpf-micro.control new file mode 100644 index 0000000..f993386 --- a/dev/null +++ b/qt/control/qpf-micro.control
@@ -0,0 +1,9 @@
		1	Package: qpf-micro
		2	Files: $QTDIR/lib/fonts/micro_{50,50_t15,50_t5}. $QTDIR/lib/fonts/micro_t10
		3	Priority: required
		4	Section: opie/system
		5	Maintainer: Chris Larson <kergoth@handhelds.org>
		6	Architecture: arm
		7	Depends: qte-fonts-common
		8	Version: 1:$QTE_VERSION-$QTE_REVISION
		9	Description: Micro font - precompiled QPFs


diff --git a/qt/control/qpf-micro.postinst b/qt/control/qpf-micro.postinst new file mode 100755 index 0000000..30336ce --- a/dev/null +++ b/qt/control/qpf-micro.postinst
@@ -0,0 +1,9 @@
		1	#!/bin/sh
		2
		3	set -e
		4
		5	if [ "$1" != "configure" ]; then
		6	exit 0
		7	fi
		8
		9	update-qtfontdir


diff --git a/qt/control/qpf-smallsmooth.control b/qt/control/qpf-smallsmooth.control new file mode 100644 index 0000000..279f7bd --- a/dev/null +++ b/qt/control/qpf-smallsmooth.control
@@ -0,0 +1,9 @@
		1	Package: qpf-smallsmooth
		2	Files: $QTDIR/lib/fonts/smallsmooth_{50,50_t15,50_t5}. $QTDIR/lib/fonts/smallsmooth_t10
		3	Priority: required
		4	Section: opie/system
		5	Maintainer: Chris Larson <kergoth@handhelds.org>
		6	Architecture: arm
		7	Depends: qte-fonts-common
		8	Version: 1:$QTE_VERSION-$QTE_REVISION
		9	Description: Smallsmooth font - precompiled QPFs


diff --git a/qt/control/qpf-smallsmooth.postinst b/qt/control/qpf-smallsmooth.postinst new file mode 100755 index 0000000..30336ce --- a/dev/null +++ b/qt/control/qpf-smallsmooth.postinst
@@ -0,0 +1,9 @@
		1	#!/bin/sh
		2
		3	set -e
		4
		5	if [ "$1" != "configure" ]; then
		6	exit 0
		7	fi
		8
		9	update-qtfontdir


diff --git a/qt/control/qpf-smoothtimes.control b/qt/control/qpf-smoothtimes.control new file mode 100644 index 0000000..6576ea7 --- a/dev/null +++ b/qt/control/qpf-smoothtimes.control
@@ -0,0 +1,9 @@
		1	Package: qpf-smoothtimes
		2	Files: $QTDIR/lib/fonts/smoothtimes_{170,100}_{50,50_t15,50_t5}.* $QTDIR/lib/fonts/smoothtimes_{170,100}_50t10
		3	Priority: required
		4	Section: opie/system
		5	Maintainer: Chris Larson <kergoth@handhelds.org>
		6	Architecture: arm
		7	Depends: qte-fonts-common
		8	Version: 1:$QTE_VERSION-$QTE_REVISION
		9	Description: Smoothtimes font - precompiled QPFs


diff --git a/qt/control/qpf-smoothtimes.postinst b/qt/control/qpf-smoothtimes.postinst new file mode 100755 index 0000000..30336ce --- a/dev/null +++ b/qt/control/qpf-smoothtimes.postinst
@@ -0,0 +1,9 @@
		1	#!/bin/sh
		2
		3	set -e
		4
		5	if [ "$1" != "configure" ]; then
		6	exit 0
		7	fi
		8
		9	update-qtfontdir


diff --git a/qt/control/qte-fonts-common.control b/qt/control/qte-fonts-common.control new file mode 100644 index 0000000..403aa88 --- a/dev/null +++ b/qt/control/qte-fonts-common.control
@@ -0,0 +1,8 @@
		1	Package: qte-fonts-common
		2	Files: $QTDIR/bin/update-qtfontdir
		3	Priority: required
		4	Section: opie/system
		5	Maintainer: Opie Team <opie@handhelds.org>
		6	Architecture: arm
		7	Version: 1:$QTE_VERSION-$QTE_REVISION
		8	Description: Qt/Embedded font common files


diff --git a/qt/control/qte-fonts.control b/qt/control/qte-fonts.control index 332dbfa..0827f9b 100644 --- a/qt/control/qte-fonts.control +++ b/qt/control/qte-fonts.control
@@ -1,11 +1,12 @@
1	Package: qte-fonts	1	Package: qte-fonts
2	Files: $QTDIR/lib/fonts/helvetica__{50,50i,75,75i}. $QTDIR/lib/fonts/helvetica__t5* $QTDIR/lib/fonts/fixed__50. $QTDIR/lib/fonts/fixed__t5* $QTDIR/lib/fonts/micro_{50,50_t15,50_t5}. $QTDIR/lib/fonts/smallsmooth_{50,50_t15,50_t5}. $QTDIR/lib/fonts/smoothtimes_{170,100}_{50,50_t15,50_t5}.* $QTDIR/lib/fonts/fontdir $QTDIR/lib/fonts/helvetica_t10 $QTDIR/lib/fonts/fixed_t10 $QTDIR/lib/fonts/micro_t10 $QTDIR/lib/fonts/smallsmooth_t10 $QTDIR/lib/fonts/smoothtimes_{170,100}_50t10 $QTDIR/bin/update-qtfontdir	2	Files:
3	Priority: required	3	Priority: required
4	Section: opie/system	4	Section: opie/system
5	Maintainer: Opie Team <opie@handhelds.org>	5	Maintainer: Opie Team <opie@handhelds.org>
6	Architecture: arm	6	Architecture: arm
7	Depends: libqte2	7	Depends: qte-fonts-common, qpf-fixed, qpf-micro
8	Provides: libqt2-emb-fonts	8	Provides: libqt2-emb-fonts
9	Replaces: qt-embedded-rotation, libqt2-emb-fonts	9	Replaces: qt-embedded-rotation, libqt2-emb-fonts
10	Version: 1:$QTE_VERSION-$QTE_REVISION	10	Version: 1:$QTE_VERSION-$QTE_REVISION
11	Description: Qt/Embedded fonts - 0,90,180,270 rotation	11	Description: Qt/Embedded fonts - virtual package
		12	Depends on fixed and micro