CVS: caudium/debian changelog,1.73.2.83,1.73.2.84 postinst,1.29.2.9,1.29.2.10 postrm,1.3.2.2,1.3.2.3 rules,1.30.2.18,1.30.2.19

["Marek Habersack" <grendel AT cvs.caudiumforge.net>]

Update of /cvs/caudium/caudium/debian
In directory cvs.caudiumforge.net:/tmp/cvs-serv84992

Modified Files:
      Tag: stable_1_2
        changelog postinst postrm rules 
Log Message:
Fixing a Debian RC bug

Index: changelog
===================================================================
RCS file: /cvs/caudium/caudium/debian/changelog,v
retrieving revision 1.73.2.83
retrieving revision 1.73.2.84
diff -u -r1.73.2.83 -r1.73.2.84
--- changelog   3 Jan 2005 01:51:46 -0000       1.73.2.83
+++ changelog   3 Apr 2005 22:45:17 -0000       1.73.2.84
@@ -1,3 +1,11 @@
+caudium (2:1.2.35-2) unstable; urgency=high
+
+  * Closes: #298963: contains non-free fonts
+  * Do not include the non-free Microsoft fonts. Instead, recommend the
+    Bistream Vera package and use the fonts if they exist
+
+ -- Marek Habersack 
<grendel AT debian.org>
  Mon,  4 Apr 2005 00:43:07 +0200
+
 caudium (2:1.2.35-1) unstable; urgency=low
 
   * The latest upstream release. Changes:

Index: postinst
===================================================================
RCS file: /cvs/caudium/caudium/debian/postinst,v
retrieving revision 1.29.2.9
retrieving revision 1.29.2.10
diff -u -r1.29.2.9 -r1.29.2.10
--- postinst    20 Nov 2003 17:49:39 -0000      1.29.2.9
+++ postinst    3 Apr 2005 22:45:18 -0000       1.29.2.10
@@ -1,7 +1,7 @@
 #! /bin/sh
 # postinst script for caudium
 # 
-# $Id: postinst,v 1.29.2.9 2003/11/20 17:49:39 grendel Exp $
+# $Id: postinst,v 1.29.2.10 2005/04/03 22:45:18 grendel Exp $
 #
 # see: dh_installdeb(1)
 EXTVER=
@@ -169,6 +169,13 @@
     if [ ! -d /usr/local/share/caudium/modules/ ]; then
        install -d -m 755 -o root -g root /usr/local/share/caudium/modules/
     fi
+    
+    # Link in the bitstream fonts
+    if [ -d /usr/share/fonts/truetype/ttf-bitstream-vera ]; then
+      for f /usr/share/fonts/truetype/ttf-bitstream-vera/*.ttf; do
+        ln -sf $f /usr/lib/caudium/fonts/ttf/${f##*/}
+      done
+    fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Index: postrm
===================================================================
RCS file: /cvs/caudium/caudium/debian/postrm,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- postrm      20 Nov 2003 17:49:39 -0000      1.3.2.2
+++ postrm      3 Apr 2005 22:45:18 -0000       1.3.2.3
@@ -1,7 +1,7 @@
 #! /bin/sh
 # postrm script for caudium
 #
-# $Id: postrm,v 1.3.2.2 2003/11/20 17:49:39 grendel Exp $
+# $Id: postrm,v 1.3.2.3 2005/04/03 22:45:18 grendel Exp $
 #
 # see: dh_installdeb(1)
 
@@ -43,6 +43,12 @@
        rm -f /etc/default/caudium
        rm -rf /etc/caudium
        
+       # Remove the links to the vera fonts
+       for f in /usr/lib/caudium/fonts/ttf/*.ttf; do
+         if [ -L $f ]; then
+           rm -f $f
+         fi
+       done
        #
        # Clean the cache files
        #

Index: rules
===================================================================
RCS file: /cvs/caudium/caudium/debian/rules,v
retrieving revision 1.30.2.18
retrieving revision 1.30.2.19
diff -u -r1.30.2.18 -r1.30.2.19
--- rules       16 Jun 2003 18:36:16 -0000      1.30.2.18
+++ rules       3 Apr 2005 22:45:18 -0000       1.30.2.19
@@ -7,7 +7,7 @@
 # package.
 #
 # This is the Caudium Webserver rules file
-# $Id: rules,v 1.30.2.18 2003/06/16 18:36:16 grendel Exp $
+# $Id: rules,v 1.30.2.19 2005/04/03 22:45:18 grendel Exp $
 #
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
@@ -36,6 +36,8 @@
 
 PACKAGES=caudium caudium-modules caudium-pixsl caudium-ultralog
 
+REMOVEFONTS=lucida_unicode.ttf lucida_unicode.txt verdana.ttf verdana.txt
+
 configure: configure-stamp
 configure-stamp:
        dh_testdir
@@ -148,6 +150,13 @@
 
        install -d -m 755 -o root -g root 
$(CURDIR)/debian/caudium/usr/share/pike_packages/apps/modules/
 
+       # Remove non-dfsg fonts
+       for f in $(REMOVEFONTS); do \
+        if -f debian/caudium/usr/lib/caudium$(EXTVER)/fonts/ttf/$f; then \
+          rm -f debian/caudium/usr/lib/caudium$(EXTVER)/fonts/ttf/$f; \
+        fi \
+       done
+
        #
        # the -p debhelper param seems to be not working... 
        # so let's do it by hand