tags 590978 + pending thanks Hi,
The attached file is the diff for my amavis-stats 0.1.22+dfsg-1 QA
upload. The associated changelog entry is:
amavis-stats (0.1.22+dfsg-1) unstable; urgency=medium
* QA upload.
* Remove non-free ChalkboardBold.ttf font (Closes: #590978)
- Repack orig tarball.
- Remove installation of ChalkboardBold.ttf from Makefile{,am,in}
- Use FreeSansBold.ttf from ttf-freefont
* Bump Standards-Version to 3.9.1.
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org
`-
diff -Nru amavis-stats-0.1.22/debian/changelog
amavis-stats-0.1.22+dfsg/debian/changelog
--- amavis-stats-0.1.22/debian/changelog 2010-03-30 13:54:11.000000000
-0400
+++ amavis-stats-0.1.22+dfsg/debian/changelog 2010-08-03 02:20:20.000000000
-0400
@@ -1,3 +1,14 @@
+amavis-stats (0.1.22+dfsg-1) unstable; urgency=medium
+
+ * QA upload.
+ * Remove non-free ChalkboardBold.ttf font (Closes: #590978)
+ - Repack orig tarball.
+ - Remove installation of ChalkboardBold.ttf from Makefile{,am,in}
+ - Use FreeSansBold.ttf from ttf-freefont
+ * Bump Standards-Version to 3.9.1.
+
+ -- Chris Lamb <la...@debian.org> Tue, 03 Aug 2010 01:56:40 -0400
+
amavis-stats (0.1.22-2) unstable; urgency=low
* QA upload.
diff -Nru amavis-stats-0.1.22/debian/control
amavis-stats-0.1.22+dfsg/debian/control
--- amavis-stats-0.1.22/debian/control 2010-03-30 01:36:29.000000000 -0400
+++ amavis-stats-0.1.22+dfsg/debian/control 2010-08-03 02:17:48.000000000
-0400
@@ -3,11 +3,11 @@
Priority: extra
Maintainer: Debian QA Group <packa...@qa.debian.org>
Build-Depends: debhelper (>> 5.0.0), autotools-dev, po-debconf, rrdtool
-Standards-Version: 3.8.1
+Standards-Version: 3.9.1
Package: amavis-stats
Architecture: all
-Depends: ${misc:Depends}, librrds-perl, rrdtool | php4-rrdtool,
wwwconfig-common, adduser
+Depends: ${misc:Depends}, librrds-perl, rrdtool | php4-rrdtool,
wwwconfig-common, adduser, ttf-freefont
Recommends: amavis
Description: Virus statistics RRDtool frontend for Amavis
Amavis-stats is a simple Amavis statistics generator based on RRDtool. It
diff -Nru amavis-stats-0.1.22/debian/patches/020_chalkboard_installation.diff
amavis-stats-0.1.22+dfsg/debian/patches/020_chalkboard_installation.diff
--- amavis-stats-0.1.22/debian/patches/020_chalkboard_installation.diff
1969-12-31 19:00:00.000000000 -0500
+++ amavis-stats-0.1.22+dfsg/debian/patches/020_chalkboard_installation.diff
2010-08-03 02:14:09.000000000 -0400
@@ -0,0 +1,26 @@
+Author: Chris Lamb <la...@debian.org>
+Description:
+ We repack amavis-stats to remove ChalkboardBold.ttf so we can't install it.
+
+--- amavis-stats-0.1.22.orig/share/Makefile.in
++++ amavis-stats-0.1.22/share/Makefile.in
+@@ -140,7 +140,7 @@ mylibdir = ${localstatedir}/lib
+
+ mycachedir = ${localstatedir}/cache
+
+-EXTRA_DATA = ChalkboardBold.ttf \
++EXTRA_DATA = \
+ tab_center_white.png \
+ tab_left_white.png \
+ tab_right_white.png \
+--- amavis-stats-0.1.22.orig/share/Makefile.am
++++ amavis-stats-0.1.22/share/Makefile.am
+@@ -19,7 +19,7 @@ mylibdir = ${localstatedir}/lib
+
+ mycachedir = ${localstatedir}/cache
+
+-EXTRA_DATA = ChalkboardBold.ttf \
++EXTRA_DATA = \
+ tab_center_white.png \
+ tab_left_white.png \
+ tab_right_white.png \
diff -Nru amavis-stats-0.1.22/debian/patches/030_freesansbold.diff
amavis-stats-0.1.22+dfsg/debian/patches/030_freesansbold.diff
--- amavis-stats-0.1.22/debian/patches/030_freesansbold.diff 1969-12-31
19:00:00.000000000 -0500
+++ amavis-stats-0.1.22+dfsg/debian/patches/030_freesansbold.diff
2010-08-03 02:20:22.000000000 -0400
@@ -0,0 +1,25 @@
+Author: Chris Lamb <la...@debian.org>
+Description: Use FreeSansBold.ttf from ttf-freefont instead of ChalkBoard.ttf
+
+--- amavis-stats-0.1.22+dfsg.orig/doc/amavis-stats.in
++++ amavis-stats-0.1.22+dfsg/doc/amavis-stats.in
+@@ -79,7 +79,7 @@ S<B<@PKGCACHEDIR@/@PKGNAME@/>>
+
+ =item F<PNG IMAGES AND FONTS FOR BUTTONS>
+
+-S<B<@PKGDATADIR@/ChalkboardBold.ttf>>
++S<B</usr/share/fonts/truetype/freefont/FreeSansBold.ttf>>
+ default truetype font.
+
+ S<B<@PKGDATADIR@/tab_center_blue.png>>
+--- amavis-stats-0.1.22+dfsg.orig/share/amavis-stats.php.in
++++ amavis-stats-0.1.22+dfsg/share/amavis-stats.php.in
+@@ -88,7 +88,7 @@ $template_path = $template ? $t_path .
+ $button_selected = $button_selected ? $button_selected : 'blue';
+ $button_unselected = $button_unselected ? $button_unselected :
'white';
+
+-if (!$ttfont) $ttfont = $ttfont ? $ttfont :
$as_root_path."/ChalkboardBold.ttf"; # default font type
++if (!$ttfont) $ttfont = $ttfont ? $ttfont :
"/usr/share/fonts/truetype/freefont/FreeSansBold.ttf"; # default font type
+
+ if(!isset($ttsize)) $ttsize = 9; # default font size
+
diff -Nru amavis-stats-0.1.22/debian/patches/series
amavis-stats-0.1.22+dfsg/debian/patches/series
--- amavis-stats-0.1.22/debian/patches/series 2010-03-11 17:27:17.000000000
-0500
+++ amavis-stats-0.1.22+dfsg/debian/patches/series 2010-08-03
02:18:29.000000000 -0400
@@ -1 +1,3 @@
010_gzcat.diff
+020_chalkboard_installation.diff
+030_freesansbold.diff
Binary files /tmp/ibP7VxIMTR/amavis-stats-0.1.22/share/ChalkboardBold.ttf and
/tmp/9_OAjDoMJc/amavis-stats-0.1.22+dfsg/share/ChalkboardBold.ttf differ
signature.asc
Description: PGP signature
