CVS: caudium/debian Global_Variables,1.5.2.3,1.5.2.4 changelog,1.73.2.85,1.73.2.86 control,1.24.2.20,1.24.2.21 postinst,1.29.2.10,1.29.2.11 rules,1.30.2.19,1.30.2.20

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

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

Modified Files:
      Tag: stable_1_2
        Global_Variables changelog control postinst rules 
Log Message:
some more changes

Index: Global_Variables
===================================================================
RCS file: /cvs/caudium/caudium/debian/Global_Variables,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -u -r1.5.2.3 -r1.5.2.4
--- Global_Variables    27 Feb 2003 18:40:38 -0000      1.5.2.3
+++ Global_Variables    3 Apr 2005 23:45:17 -0000       1.5.2.4
@@ -4,7 +4,7 @@
  <var name='Supports'>           <str>#include %3cetc/supports%3e
 </str> </var>
  <var name='hash_num_dirs'>      <int>500</int> </var>
- <var name='default_font'>       <str>lucida</str> </var>
+ <var name='default_font'>       <str>Bitstream Vera Sans</str> </var>
  <var name='font_dirs'>          
   <a>
     <str>/usr/share/caudium/local_fonts/</str>

Index: changelog
===================================================================
RCS file: /cvs/caudium/caudium/debian/changelog,v
retrieving revision 1.73.2.85
retrieving revision 1.73.2.86
diff -u -r1.73.2.85 -r1.73.2.86
--- changelog   3 Apr 2005 22:51:35 -0000       1.73.2.85
+++ changelog   3 Apr 2005 23:45:17 -0000       1.73.2.86
@@ -1,8 +1,8 @@
 caudium (2:1.2.35.1-1) 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
+  * Do not include the non-free Microsoft fonts. Instead, depend on the
+    bitstream font package.
   * Using a 'fake' upstream release number to be able to overwrite the
     .orig tarball in the debian archive.
 

Index: control
===================================================================
RCS file: /cvs/caudium/caudium/debian/control,v
retrieving revision 1.24.2.20
retrieving revision 1.24.2.21
diff -u -r1.24.2.20 -r1.24.2.21
--- control     25 Jul 2004 01:21:28 -0000      1.24.2.20
+++ control     3 Apr 2005 23:45:17 -0000       1.24.2.21
@@ -8,9 +8,9 @@
 Package: caudium
 Architecture: any
 Pre-Depends: debconf (>= 0.2.26)
-Depends: ${shlibs:Depends}, ${pike:name} (>= ${pike:ver}-1), ${pike:name} 
(<= ${pike:ver}-99), caudium-modules (= ${Source-Version}), 
${pike:name}-image (>= ${pike:ver}-1), ${pike:name}-image (<= ${pike:ver}-99) 
, ${pike:name}-gz (>= ${pike:ver}-1), ${pike:name}-gz (<= ${pike:ver}-99), 
${pike:name}-crypto (>= ${pike:ver}-1), ${pike:name}-crypto (<= 
${pike:ver}-99)
+Depends: ${shlibs:Depends}, ${pike:name} (>= ${pike:ver}-1), ${pike:name} 
(<= ${pike:ver}-99), caudium-modules (= ${Source-Version}), 
${pike:name}-image (>= ${pike:ver}-1), ${pike:name}-image (<= ${pike:ver}-99) 
, ${pike:name}-gz (>= ${pike:ver}-1), ${pike:name}-gz (<= ${pike:ver}-99), 
${pike:name}-crypto (>= ${pike:ver}-1), ${pike:name}-crypto (<= 
${pike:ver}-99), ttf-bitstream-vera
 Suggests: roxen-doc (>= 1.3.122-1)
-Recommends: caudium-pixsl, caudium-ultralog, logrotate
+Recommends: caudium-pixsl, caudium-ultralog, logrotate 
 Provides: httpd, httpd-cgi
 Description: An extensible WWW server written in Pike
  Caudium is a modern, fast and extensible WWW server derived from Roxen. 

Index: postinst
===================================================================
RCS file: /cvs/caudium/caudium/debian/postinst,v
retrieving revision 1.29.2.10
retrieving revision 1.29.2.11
diff -u -r1.29.2.10 -r1.29.2.11
--- postinst    3 Apr 2005 22:45:18 -0000       1.29.2.10
+++ postinst    3 Apr 2005 23:45:17 -0000       1.29.2.11
@@ -1,7 +1,7 @@
 #! /bin/sh
 # postinst script for caudium
 # 
-# $Id: postinst,v 1.29.2.10 2005/04/03 22:45:18 grendel Exp $
+# $Id: postinst,v 1.29.2.11 2005/04/03 23:45:17 grendel Exp $
 #
 # see: dh_installdeb(1)
 EXTVER=
@@ -172,7 +172,7 @@
     
     # 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
+      for f in /usr/share/fonts/truetype/ttf-bitstream-vera/*.ttf; do
         ln -sf $f /usr/lib/caudium/fonts/ttf/${f##*/}
       done
     fi

Index: rules
===================================================================
RCS file: /cvs/caudium/caudium/debian/rules,v
retrieving revision 1.30.2.19
retrieving revision 1.30.2.20
diff -u -r1.30.2.19 -r1.30.2.20
--- rules       3 Apr 2005 22:45:18 -0000       1.30.2.19
+++ rules       3 Apr 2005 23:45:17 -0000       1.30.2.20
@@ -7,7 +7,7 @@
 # package.
 #
 # This is the Caudium Webserver rules file
-# $Id: rules,v 1.30.2.19 2005/04/03 22:45:18 grendel Exp $
+# $Id: rules,v 1.30.2.20 2005/04/03 23:45:17 grendel Exp $
 #
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
@@ -152,7 +152,7 @@
 
        # Remove non-dfsg fonts
        for f in $(REMOVEFONTS); do \
-        if -f debian/caudium/usr/lib/caudium$(EXTVER)/fonts/ttf/$f; then \
+        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