[Pkg-cups-devel] r511 - cupsys/trunk/debian

[Martin Pitt]

Author: mpitt
Date: Thu Aug  2 12:54:25 2007
New Revision: 511

Log:
* debian/cupsys.{pre,post}inst: Remove obsolete transition bits.

Modified:
   cupsys/trunk/debian/changelog
   cupsys/trunk/debian/cupsys.postinst
   cupsys/trunk/debian/cupsys.preinst

Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog	(original)
+++ cupsys/trunk/debian/changelog	Thu Aug  2 12:54:25 2007
@@ -43,9 +43,9 @@
    * debian/control, debian/rules: Remove references to libcupsys2-gnutls10,
      since it's a transitional package in Etch and not relevant any more in
      Lenny.
-  * debian/cupsys.{pre,post}inst: Remove obsolete transition bits of certs.
+  * debian/cupsys.{pre,post}inst: Remove obsolete transition bits.
 
- -- Martin Pitt <martin.pitt at ubuntu.com>  Thu, 02 Aug 2007 14:50:29 +0200
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Thu, 02 Aug 2007 14:54:12 +0200
 
 cupsys (1.2.12-1) unstable; urgency=low
 

Modified: cupsys/trunk/debian/cupsys.postinst
==============================================================================
--- cupsys/trunk/debian/cupsys.postinst	(original)
+++ cupsys/trunk/debian/cupsys.postinst	Thu Aug  2 12:54:25 2007
@@ -108,81 +108,6 @@
 	done
 	IFS=$save_IFS
 
-	# Create password file for Digest authentication
-        # (removed: Debian CUPS uses PAM and basic authentication)
-	#db_get cupsys/adminpassword
-        #VAL=$(echo -n "root:CUPS:$RET" | md5sum | cut -d' ' -f1)
-	#if [ -f /etc/cups/passwd.md5 ]; then
-        #  if [ "$(grep "^root:" /etc/cups/passwd.md5)" ]; then
-	#    sed -e "s/^root:lpadmin:.*/root:lpadmin:$VAL/" /etc/cups/passwd.md5 > /etc/cups/passwd.md5.$$
-	#    mv /etc/cups/passwd.md5.$$ /etc/cups/passwd.md5
-        #  else
-	#    echo "root:lpadmin:$VAL" >> /etc/cups/passwd.md5
-        #  fi
-	#else
-	#  echo "root:lpadmin:$VAL" > /etc/cups/passwd.md5
-	#  chown root:nogroup /etc/cups/passwd.md5
-	#  chmod 600 /etc/cups/passwd.md5
-	#fi
-
-	# Revert to single file
-	if [ $(dpkg --compare-versions "$2" gt 1.1.23-12 && dpkg --compare-versions "$2" lt 1.2.1-3 && echo "yes") ]; then
-	  if [ -f /etc/cups/cups.d/ports.conf -o -f /etc/cups/cups.d/browse.conf ]; then
-	    perl -e 'sub readfile { local($_) = @_; open(F, $_); while (<F>) { print; } }; while (<STDIN>) { s#^Include\s+(/etc/cups/cups.d/(?:ports.conf|browse.conf))#&readfile($1)#ei; print;}' < /etc/cups/cupsd.conf > /etc/cups/cupsd.conf.$$
-	    mv /etc/cups/cupsd.conf.$$ /etc/cups/cupsd.conf
-	    rm -f /etc/cups/cups.d/ports.conf /etc/cups/cups.d/browse.conf
-	    rmdir /etc/cups/cups.d 2>/dev/null || /bin/true
-	  fi
-	fi
-	#
-	# Create /etc/cups/cups.d/ports.conf and /etc/cups/cups.d/browse.conf
-	#db_get cupsys/ports
-	#VAL=$(echo "$RET" | perl -e '$ret = ""; while (<STDIN>) { chomp;
-	#    @values = split(/\s+/);
-	#    foreach(@values) {
-	#      if (/^\d+$/ && $_ >= 0 && $_ < 65536) {
-	#        # PORT
-	#        $ret .= "Port $_\\n";
-	#      } elsif (/^\d+\.\d+\.\d+\.\d+$/ || /^\d+\.\d+\.\d+\.\d+:\d+$/) {
-	#        # IP
-	#        $ret .= "Listen $_\\n";
-	#      } elsif (/^[a-zA-Z0-9-_.*]+$/ || /^[a-zA-Z0-9-_.*]+:\d+$/) {
-	#        my($tmp) = $_;
-	#        if (/^[a-zA-Z0-9-_.*]+:(\d+)$/) {
-	#          if ($1 < 0 || $1 > 65535) {
-	#            # ERROR
-	#            $ret = "";
-	#            last;
-	#          }
-	#        }
-	#        # HOSTNAME
-	#        $ret .= "Listen $_\\n";
-	#      } elsif (/^\//) {
-	#        # domain socket
-	#        $ret .= "Listen $_\\n";
-	#      } else {
-	#        # ERROR
-	#        $ret = "";
-	#        last;
-	#      }
-	#    }
-	#    print $ret;
-	#  }')
-
-	#if [ -z "$VAL" ]; then
-	#  echo "Error: debconf has an invalid value. Run 'dpkg-reconfigure cupsys' again."
-	#  return 1
-	#else
-	#  /bin/echo -e -n "$VAL" > /etc/cups/cups.d/ports.conf
-	#fi
-
-	#db_get cupsys/browse
-	#if [ "$RET" = "true" ]; then
-	#  /bin/echo "Browsing on" > /etc/cups/cups.d/browse.conf
-	#else
-	#  /bin/echo "Browsing off" > /etc/cups/cups.d/browse.conf
-	#fi
-
 	if [ -f /etc/cups/classes.conf ]; then
 	  chown root:lp /etc/cups/classes.conf ; chmod 600 /etc/cups/classes.conf
 	fi

Modified: cupsys/trunk/debian/cupsys.preinst
==============================================================================
--- cupsys/trunk/debian/cupsys.preinst	(original)
+++ cupsys/trunk/debian/cupsys.preinst	Thu Aug  2 12:54:25 2007
@@ -16,20 +16,6 @@
     ;;
 
     upgrade)
-	if dpkg --compare-versions "$2" le 1.1.23-6; then
-	  [ -f /etc/cups/printers.conf ] && mv /etc/cups/printers.conf /etc/cups/printers.conf.save
-	  [ -f /etc/cups/classes.conf ] && mv /etc/cups/classes.conf /etc/cups/classes.conf.save
-	fi
-	if [ -e /var/lib/cups/conf -a ! -L /var/lib/cups/conf -a ! -e /etc/cups ]; then
-	    echo -n "Moving configuration files..."
-	    mkdir -p /etc/cups || true
-	    if [ `ls /var/lib/cups/conf | wc -l` -ne "     0" ]; then
-		cp -a /var/lib/cups/conf/* /etc/cups
-	    fi
-	    rm -rf /var/lib/cups/conf
-	    echo "done."
-	fi
-
 	if [ -e /var/lib/cups/ppd -a ! -L /var/lib/cups/ppd -a ! -e /etc/cups/ppd ]; then
 	    echo -n "Moving printer definition files..."
 	    mkdir -p /etc/cups/ppd || true