CVS: caudium/debian changelog,1.129.2.4,1.129.2.5 postinst,1.38,1.38.2.1 postrm,1.4,1.4.2.1 rules,1.56,1.56.2.1

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

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

Modified Files:
      Tag: stable_1_4
        changelog postinst postrm rules 
Log Message:
debian stuff

Index: changelog
===================================================================
RCS file: /cvs/caudium/caudium/debian/changelog,v
retrieving revision 1.129.2.4
retrieving revision 1.129.2.5
diff -u -r1.129.2.4 -r1.129.2.5
--- changelog   16 Dec 2004 00:58:31 -0000      1.129.2.4
+++ changelog   21 Apr 2005 23:32:37 -0000      1.129.2.5
@@ -1,3 +1,9 @@
+caudium (2:1.4.5-2) experimental; urgency=low
+
+  * Getting rid of the non-dfsg fonts
+
+ -- Marek Habersack 
<grendel AT debian.org>
  Fri, 22 Apr 2005 01:31:35 +0200
+
 caudium (2:1.4.5-1) experimental; urgency=low
 
   * The latest upstream version

Index: postinst
===================================================================
RCS file: /cvs/caudium/caudium/debian/postinst,v
retrieving revision 1.38
retrieving revision 1.38.2.1
diff -u -r1.38 -r1.38.2.1
--- postinst    2 Dec 2003 02:52:14 -0000       1.38
+++ postinst    21 Apr 2005 23:32:37 -0000      1.38.2.1
@@ -1,7 +1,7 @@
 #! /bin/sh
 # postinst script for caudium
 # 
-# $Id: postinst,v 1.38 2003/12/02 02:52:14 grendel Exp $
+# $Id: postinst,v 1.38.2.1 2005/04/21 23:32:37 grendel Exp $
 #
 # see: dh_installdeb(1)
 EXTVER=
@@ -35,11 +35,6 @@
 case "$1" in
     configure)
 
-    update-alternatives --install /usr/bin/htpasswd  htpasswd \
-                                 /usr/bin/htpasswd-caudium 10 \
-                       --slave /usr/share/man/man1/htpasswd.1.gz \
-                               htpasswd.1.gz 
/usr/share/man/man1/htpasswd-caudium.1.gz
-
     db_get caudium${EXTVER}/config_port
     CFGPORTNO="$RET"
     if [ -n "$RET" -a "$RET" != "22202" ]; then
@@ -57,8 +52,9 @@
      CONFIGADMIN="$RET"
 
      db_get caudium${EXTVER}/config_password
-     CONFIGPASS="`echo $RET | $PIKE -e 'string p; p=Stdio.stdin->gets(); 
write(crypt(p));'`"
      
+     CONFIGPASS="`echo $RET | $PIKE -e 'string p; p=Stdio.stdin->gets(); 
write(crypt(p));'`"
+
      cat <<EOF | sed -f - /etc/caudium${EXTVER}/Global_Variables.sample > \
          /etc/caudium${EXTVER}/servers/Global_Variables.new && mv 
/etc/caudium${EXTVER}/servers/Global_Variables.new \
          /etc/caudium${EXTVER}/servers/Global_Variables
@@ -79,12 +75,10 @@
     
     db_get caudium${EXTVER}/start_options
     START_OPTIONS=
-    NOTHREADS=y
-    
+
     for o in `echo $RET | sed -e 's/,//g'`; do
        case $o in
-           threads) START_OPTIONS="$START_OPTIONS --with-threads" 
-                    NOTHREADS=n ;;
+           threads) START_OPTIONS="$START_OPTIONS --with-threads" ;;
            debug) START_OPTIONS="$START_OPTIONS --with-debug" ;;
            once) START_OPTIONS="$START_OPTIONS --once" ;;
            profile) START_OPTIONS="$START_OPTIONS --with-profile" ;;
@@ -92,10 +86,6 @@
            keep-alive) START_OPTIONS="$START_OPTIONS --with-keep-alive" ;;
        esac
     done
-    if [ "x$NOTHREADS" = "xy" ]; then
-       START_OPTIONS="$START_OPTIONS --without-threads"
-    fi
-    
     db_get caudium${EXTVER}/performance
     if [ "$RET" = "true" ]; then
         START_OPTIONS="$START_OPTIONS -DMAX_PERFORMANCE"
@@ -148,9 +138,9 @@
 
     
 # -----------------------
-if [ ! -f /var/www/index.html ]; then
-    ln -sf ../../usr/share/doc/caudium/www/index.html /var/www/index.html
-fi
+    if [ ! -f /var/www/index.html ]; then
+       ln -sf ../../usr/share/doc/caudium/www/index.html /var/www/index.html
+    fi
     db_stop
 
     # Now let's take care of permissions
@@ -165,19 +155,27 @@
     rm -f /var/state/caudium${EXTVER}/virgin.install
     #fi
 
-    DIRS="/var/run/caudium${EXTVER} /var/state/caudium${EXTVER} 
/var/cache/caudium${EXTVER} /var/cache/caudium${EXTVER}/args 
/var/cache/caudium${EXTVER}/cache /etc/caudium${EXTVER}/servers 
/var/log/caudium${EXTVER}"
+    DIRS="/var/run/caudium${EXTVER} /var/state/caudium${EXTVER} 
/var/cache/caudium${EXTVER} /var/cache/caudium${EXTVER}/args 
/etc/caudium${EXTVER}/servers /var/log/caudium${EXTVER}"
     for d in $DIRS; do
        dpkg-statoverride --remove $d > /dev/null 2>&1 || true
        dpkg-statoverride --update --add www-data www-data 0751 $d
     done
-
+    
     if [ -d /usr/lib/caudium/caudium-images -a ! -L 
/usr/lib/caudium/caudium-images ]; then
        rm -r /usr/lib/caudium/caudium-images
     fi
     ln -sf ../../share/caudium/caudium-images /usr/lib/caudium/caudium-images
+    
     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 in /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.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- postrm      1 Dec 2003 03:30:16 -0000       1.4
+++ postrm      21 Apr 2005 23:32:37 -0000      1.4.2.1
@@ -1,6 +1,8 @@
 #! /bin/sh
 # postrm script for caudium
 #
+# $Id: postrm,v 1.4.2.1 2005/04/21 23:32:37 grendel Exp $
+#
 # see: dh_installdeb(1)
 
 set -e
@@ -24,23 +26,29 @@
        #
        # Should we ask the user (using Debconf) whether to back the config
        # up?
-       if test -d /etc/caudium; then
+       if [ -d /etc/caudium ]; then
            if test -f $BFILE; then
                rm -f $BFILE
            fi
            (cd /; tar czvf $BFILE etc/caudium || true)
-       fi       
-
+       fi
+       
        if [ -L /var/www/index.html ]; then
          IFILE="`readlink /var/www/index.html`"
          if [ "$IFILE" = "../../usr/share/doc/caudium/www/index.html" ]; then
            rm -f /var/www/index.html
          fi
        fi
-
+       
        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.56
retrieving revision 1.56.2.1
diff -u -r1.56 -r1.56.2.1
--- rules       17 May 2004 19:23:42 -0000      1.56
+++ rules       21 Apr 2005 23:32:37 -0000      1.56.2.1
@@ -7,7 +7,7 @@
 # package.
 #
 # This is the Caudium Webserver rules file
-# $Id: rules,v 1.56 2004/05/17 19:23:42 grendel Exp $
+# $Id: rules,v 1.56.2.1 2005/04/21 23:32:37 grendel Exp $
 #
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
@@ -36,6 +36,7 @@
        bin/indexer.pike bin/searcher.pike
 
 PACKAGES=caudium caudium-modules caudium-pixsl caudium-ultralog
+REMOVEFONTS=lucida_unicode.ttf lucida_unicode.txt verdana.ttf verdana.txt
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 CFLAGS=-O0
@@ -162,6 +163,12 @@
        mv debian/caudium/usr/lib/caudium$(EXTVER)/caudium-images 
debian/caudium/usr/share/caudium$(EXTVER)/
 
        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
 
        #
        # copy perl