commit lpdfilter

2 Jun 2006

Hello community,

here is the log from the commit of package lpdfilter
checked in at Sat Jun 3 00:57:47 CEST 2006.

--------

--- lpdfilter/lpdfilter.changes	2006-05-24 17:27:45.000000000 +0200
+++ lpdfilter/lpdfilter.changes	2006-06-02 16:34:29.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Jun  2 16:33:59 CEST 2006 - werner@suse.de
+
+- New version 0.46 with Makefile changes to support new GNU make
+
+-------------------------------------------------------------------
@@ -91 +96 @@
-- New versoin 0.44 with security update of runlpr
+- New version 0.44 with security update of runlpr

Old:
----
  lpdfilter-0.45-hplip.dif
  lpdfilter-0.45.dif
  lpdfilter-0.45.tar.bz2

New:
----
  lpdfilter-0.46.dif
  lpdfilter-0.46.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ lpdfilter.spec ++++++
--- /var/tmp/diff_new_pack.b0yjVT/_old	2006-06-03 00:57:23.000000000 +0200
+++ /var/tmp/diff_new_pack.b0yjVT/_new	2006-06-03 00:57:23.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package lpdfilter (Version 0.45)
+# spec file for package lpdfilter (Version 0.46)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -11,8 +11,8 @@
 
 Name:           lpdfilter
 BuildRequires:  ghostscript-mini termcap xorg-x11 xorg-x11-devel
-Version:        0.45
-Release:        267
+Version:        0.46
+Release:        1
 Summary:        A Standard Printer Filter for Lpd
 License:        GPL
 Group:          Hardware/Printing
@@ -20,12 +20,11 @@
 Conflicts:      cups
 Autoreqprov:    on
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        lpdfilter-0.45.tar.bz2
+Source0:        lpdfilter-0.46.tar.bz2
 Source1:        pspreloads.tar.bz2
 Source2:        hplip.list.gz
 Source3:        hplip-ppd.sh
-Patch:          lpdfilter-0.45.dif
-Patch1:         lpdfilter-0.45-hplip.dif
+Patch:          lpdfilter-0.46.dif
 
 %description
 Lpdfilter is a collection of scripts used for printing various data
@@ -42,7 +41,6 @@
 %prep
 %setup 
 %patch
-%patch1 -p 0 -b .hplip
 
 %build
   xmkmf -a
@@ -69,6 +67,8 @@
 %doc /usr/share/man/man8/lpdfilter.8.gz
 
 %changelog -n lpdfilter
+* Fri Jun 02 2006 - werner@suse.de
+- New version 0.46 with Makefile changes to support new GNU make
 * Wed May 24 2006 - schwab@suse.de
 - Don't strip binaries.
 * Wed Jan 25 2006 - mls@suse.de
@@ -109,7 +109,7 @@
 * Wed Oct 23 2002 - ro@suse.de
 - removed bogus self-provides again
 * Wed Oct 23 2002 - werner@suse.de
-- New versoin 0.44 with security update of runlpr
+- New version 0.44 with security update of runlpr
 * Tue Sep 10 2002 - werner@suse.de
 - Be noisy on deletion of foreign entries (bug #19310)
 * Mon Jul 22 2002 - schwab@suse.de



++++++ lpdfilter-0.45-hplip.dif -> lpdfilter-0.46.dif ++++++
--- lpdfilter/lpdfilter-0.45-hplip.dif	2005-03-09 15:31:47.000000000 +0100
+++ lpdfilter/lpdfilter-0.46.dif	2006-06-02 16:38:06.000000000 +0200
@@ -1,108 +1,11 @@
---- global/setup.lib
-+++ global/setup.lib	2005-03-02 17:50:31.491180967 +0000
-@@ -544,9 +544,14 @@
- }
+--- Imakefile
++++ Imakefile	2006-06-02 15:58:26.000000000 +0200
+@@ -21,7 +21,7 @@
+ MAN		=	/usr/share/man
  
- # Ask for UPP entries
-+use_upp=no
- function upp ()
- {
-+    use_upp=yes
-     ghostscript
-+    use_upp=no
-+
-+    test -n "$driver" || return
- 
-     # Reset driver value (we already have gsdevice)
-     driver=upp
-@@ -571,8 +576,8 @@
- Please typein the name of the device driver given to ghostscript.
- This driver should work with your printer. A list is found in the
- file /usr/share/doc/packages/ghostscript/catalog.devices.
--For some types of main drivers (e.g. hpdj, uniprint, omni) you
--have to add a prefix like hpdj which leads e.g. to hpdj_500.
-+For some types of main drivers (e.g. hpijs, hpdj, uniprint, omni)
-+you have to add a prefix like hpdj which leads e.g. to hpdj_500.
- Some printers need a post processor filter to convert ghostscript
- output to the appropiate printer language.
- 
-@@ -588,6 +593,7 @@
- 	driver=$result
- 	init="$driver"
- 	case "$driver" in
-+	    hpijs|ijs)	model=ask	;;
- 	    hpdj)	model=ask	;;
- 	    stp)	model=ask	;;
- 	    omni)	model=ask	;;
-@@ -622,6 +628,16 @@
- 		    MD-5000		'Alps MD 5000' \
- 		    MD-5500		'Alps MD 5500' \
- 		    DP-5000		'Oki DP 5000' || continue
-+	    elif test "$driver" = "hpijs" -o "$driver" = "ijs" ; then
-+		if test "$use_upp" = "yes" ; then
-+		    run_dialog --inputbox "\\nWhich model of driver ${result} do you choose?\\n" \
-+		    10 $((COLS-10)) || continue
-+		else
-+		    driver=""
-+		    model=""
-+		    run_dialog --msgbox "\\nDevice ${result} requires upp file, please go use UPP.\\n" \
-+		    7 $((COLS-10)) || return
-+		fi
- 	    else
- 		run_dialog --inputbox "\\nWhich model of driver ${result} do you choose?\\n" \
- 		10 $((COLS-10)) || continue
-@@ -650,6 +666,43 @@
-     done
- 
-     case "$driver" in
-+	hpijs|ijs)
-+	    driver=ijs
-+	    if test "$use_upp" = "yes" ; then
-+		p=/usr/share/cups/model/manufacturer-PPDs/hplip/
-+		if test -d ${p} ; then
-+		    tmp=$(zgrep -liE "\*ModelName:[ $TAB]+\"($model|HP $model)\"" ${p}/*.ppd.gz 2> /dev/null)
-+		    if test -e "$tmp" ; then
-+			model="$(zcat $tmp | \
-+			sed -n "/^\*FoomaticRIPOptionSetting Model=[^:]\+:[ ${TAB}]*\"/,/^\*End/ {
-+				s/^\*[^\"]\+\"//
-+				:join
-+				/\(&&\|^\*End\)\$/{N
-+				    s/\(&&\|^\*End\)\n//
-+				    b join
-+				}
-+				s/\"$//
-+				s/"/\"/gp
-+				}"
-+			)"
-+		    else
-+			driver=""
-+			model=""
-+			run_dialog --msgbox "\\nFailed to read ppd for device ${result}, typo?.\\n" \
-+			7 $((COLS-10)) || return
-+		    fi
-+		    model="-sIjsServer=hpijs -dIjsUseOutputFD $model"
-+		else
-+		    if test -e @@LIBDIR@@/global/hplip.list.gz ; then
-+			model="$(zcat @@LIBDIR@@/global/hplip.list.gz | \
-+			sed -n "s/\($model\|HP $model\):\([^:]*\)/\2/p")"
-+		    fi
-+		    model="-sIjsServer=hpijs -dIjsUseOutputFD $model"
-+		fi
-+	    else
-+		model="-sDEVICE=ijs"
-+	    fi
-+	    ;;
- 	hpdj)	model="-sModel=$model"	;;
- 	stp)	model="-sModel=$model"	;;
- 	omni)	model="-sDeviceName=$model" ;;
---- bin/lprsetup
-+++ bin/lprsetup	2005-03-02 17:52:24.755621169 +0000
-@@ -18,6 +18,8 @@
- #
- type -p readpc &> /dev/null || export PATH=@@LIBDIR@@/bin:${PATH}
- type -p sed    &> /dev/null || { echo "The sed stream editor is required for lprsetup" 2>&1; exit 1; }
-+type -p zgrep  &> /dev/null || { echo "The zgrep pattern matching tool is required for lprsetup" 2>&1; exit 1; }
-+type -p zcat   &> /dev/null || { echo "The zcat expand compressed files tool is required for lprsetup" 2>&1; exit 1; }
- 
- interactive=false
- date=$(date +%Y%m%d)
+ CC		=	gcc
+-CFLAGS		=	-O2 -Wall -pipe -funroll-loops
++CFLAGS		=	$(RPM_OPT_FLAGS) -Wall -pipe -funroll-loops
+ LFLAGS		=	-s
+ INSTALL		=	install
+ LN		=	ln

++++++ lpdfilter-0.45.tar.bz2 -> lpdfilter-0.46.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lpdfilter-0.45/C-Source/Makefile new/lpdfilter-0.46/C-Source/Makefile
--- old/lpdfilter-0.45/C-Source/Makefile	2002-09-10 14:45:33.000000000 +0200
+++ new/lpdfilter-0.46/C-Source/Makefile	2006-06-02 15:58:26.000000000 +0200
@@ -45,7 +45,7 @@
 	rm -f $(IO) $(GETPW) $(PC) $(LPR) *~
 
 
-install: $(IO) $(GETPW) $(PC) $(LPR)
+install:: $(IO) $(GETPW) $(LPR)
 	mkdir -p $(DESTDIR)$(BINLIB)
 	@for p in $^ ; do \
 	    echo $(INSTALL) -m 0755 $$p $(BINLIB)/ ; \
@@ -54,3 +54,8 @@
 	$(LN) $(LNFLAGS) $(GETPW) $(DESTDIR)$(BINLIB)/$(GETPWGE)
 	-chown root:lp $(DESTDIR)$(BINLIB)/$(LPR)
 	-chmod 4711    $(DESTDIR)$(BINLIB)/$(LPR)
+
+install:: $(PC).sh $(PC)
+	mkdir -p $(DESTDIR)$(BINLIB)
+	$(INSTALL) -m 0755 $(PC)    $(DESTDIR)$(BINLIB)/$(PC).bin
+	$(INSTALL) -m 0755 $(PC).sh $(DESTDIR)$(BINLIB)/$(PC)
Binary files old/lpdfilter-0.45/C-Source/getpwhome and new/lpdfilter-0.46/C-Source/getpwhome differ
Binary files old/lpdfilter-0.45/C-Source/lstrip and new/lpdfilter-0.46/C-Source/lstrip differ
Binary files old/lpdfilter-0.45/C-Source/readn and new/lpdfilter-0.46/C-Source/readn differ
Binary files old/lpdfilter-0.45/C-Source/readpc and new/lpdfilter-0.46/C-Source/readpc differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lpdfilter-0.45/C-Source/readpc.sh new/lpdfilter-0.46/C-Source/readpc.sh
--- old/lpdfilter-0.45/C-Source/readpc.sh	1970-01-01 01:00:00.000000000 +0100
+++ new/lpdfilter-0.46/C-Source/readpc.sh	2006-06-02 15:58:27.000000000 +0200
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+if test -z "$1" ; then
+    echo "readpc: queue name required!" 1>&2
+    echo "    usage: readpc <queue> [printcap]" 1>&2
+    exit 1
+fi
+
+(lpc client "$1" ; echo end) | \
+sed -n  "/^${1}\(\|$\)/,/\(^[^[:blank:]][^:]\|$\)/ {
+	    :join
+	    /^${1}.*\$/ {N
+		/\n[^[:blank:]][^:]/ {
+		    s/^\(${1}[^\n]*\).*/\1:/p
+		    b
+		}
+		s/\n[[:blank:]]:/:/
+		b join
+	    }
+	}"
+exit $?
Binary files old/lpdfilter-0.45/C-Source/rewindstdin and new/lpdfilter-0.46/C-Source/rewindstdin differ
Binary files old/lpdfilter-0.45/C-Source/runlpr and new/lpdfilter-0.46/C-Source/runlpr differ
Binary files old/lpdfilter-0.45/C-Source/tolower and new/lpdfilter-0.46/C-Source/tolower differ
Binary files old/lpdfilter-0.45/C-Source/unpjl and new/lpdfilter-0.46/C-Source/unpjl differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lpdfilter-0.45/C-Source/unpjl.c new/lpdfilter-0.46/C-Source/unpjl.c
--- old/lpdfilter-0.45/C-Source/unpjl.c	2001-11-16 17:10:11.000000000 +0100
+++ new/lpdfilter-0.46/C-Source/unpjl.c	2006-06-02 15:58:27.000000000 +0200
@@ -49,7 +49,7 @@
     size_t mlen = (size_t)(sizeof(char) * strlen(magic));
     size_t plen = (size_t)(sizeof(char) * strlen(pjl));
     size_t blen = sizeof(buf);
-    size_t h = 0;		/* offset (r - n)     */
+    int h = 0;			/* offset (r - n)     */
 
     while (1) {
 	ssize_t r = 0;		/* current position   */
@@ -184,14 +184,13 @@
 	if (end)					  /* End of PJL job */
 	    break;
 
-	if (h)			/* Shift begin of last line to start of buf */
+	if (h > 0)		/* Shift begin of last line to start of buf */
 	    memmove(buf, &(bptr[n]), h);
-//	    memcpy(buf, &(bptr[n]), h);
 
     }
 
     /* Eat up any stdin if any */
-    if ((ioctl(STDIN_FILENO, FIONREAD, (int*)&h) < 0) || (h == 0))
+    if ((ioctl(STDIN_FILENO, FIONREAD, &h) < 0) || (h == 0))
 	return 0;
 
     while (h > 0) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lpdfilter-0.45/bin/Makefile new/lpdfilter-0.46/bin/Makefile
--- old/lpdfilter-0.45/bin/Makefile	2001-11-30 15:35:54.000000000 +0100
+++ new/lpdfilter-0.46/bin/Makefile	2006-06-02 16:24:23.000000000 +0200
@@ -16,11 +16,11 @@
 	mkdir -p $(DESTDIR)$(BINLIB)
 	for s in $(SCRIPTS) '' ; do \
 	     test -n "$$s" || break; \
-	     sed 's|@@LIBDIR@@|$(LIBDIR)|g;\
-		  s|@@ETCDIR@@|$(ETCDIR)|g' < $$s > $(DESTDIR)$(BINLIB)/$$s ; \
+	     sed -e 's|@@LIBDIR@@|$(LIBDIR)|g' \
+		 -e 's|@@ETCDIR@@|$(ETCDIR)|g' < $$s > $(DESTDIR)$(BINLIB)/$$s ; \
 	     chmod 0755 $(DESTDIR)$(BINLIB)/$$s ; \
 	done
 	mkdir -p $(DESTDIR)/usr/sbin
-	sed 's|@@LIBDIR@@|$(LIBDIR)|g;\
-		 s|@@ETCDIR@@|$(ETCDIR)|g' < $(SETUP) > $(DESTDIR)/usr/sbin/$(SETUP)
+	sed -e 's|@@LIBDIR@@|$(LIBDIR)|g' \
+	    -e 's|@@ETCDIR@@|$(ETCDIR)|g' < $(SETUP) > $(DESTDIR)/usr/sbin/$(SETUP)
 	chmod 0755 $(DESTDIR)/usr/sbin/$(SETUP)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lpdfilter-0.45/bin/if new/lpdfilter-0.46/bin/if
--- old/lpdfilter-0.45/bin/if	2003-03-21 16:19:13.000000000 +0100
+++ new/lpdfilter-0.46/bin/if	2006-06-02 15:58:27.000000000 +0200
@@ -134,6 +134,26 @@
 esac
 
 #
+# Wait on our control/hold file (LPRng).
+#
+hold="${control%${host}}"
+hold="h${hold#c}"
+n=0
+while test ! -s $control ; do
+    sleep 1
+    test -s $hold && break
+    test $((n=n+1)) -gt 10 && break
+done
+if test ! -s $control ; then
+    if test -s $hold ; then
+	control="$hold"
+	daemon="LPRng"
+    else
+	control=
+    fi
+fi
+
+#
 # Use the specific printcap (Currently no NIS is supported)
 #
 printcap="/etc/printcap"
@@ -145,19 +165,28 @@
 esac
 
 #
+# Now scan the cf/hf, check for the file name of the current run.
 #
-# Now scan the cf, check for the file name of the current run.
-# But first wait on our control file (LPRng).
-#
-n=0
-while test ! -s $control ; do
-    sleep 1
-    test $((n=n+1)) -gt 10 && break
-done
 opt=;arg=
 while read line ; do
-    arg="${line:1}"
-    opt="${line::1}"
+    case "$control" in
+	hf*)
+	    case "$line" in
+		*=*)
+		    arg=${line%%=*}
+		    opt=${line#*=}
+		    ;;
+		*)
+		    arg="${line:1}"
+		    opt="${line::1}"
+		    ;;
+	    esac
+	    ;;
+	*)
+	    arg="${line:1}"
+	    opt="${line::1}"
+	    ;;
+    esac
     arg="${arg%% }"
     set -a
     case "$opt" in
@@ -439,6 +468,7 @@
     #
     # Ghostscript OUT to printer IN filter on fd 5 if any.
     #
+    OutPipe="-sOutputFile=/dev/fd/5"
     if   test -x @@ETCDIR@@/${queue}/post ; then
 	if link=$(readlink @@ETCDIR@@/${queue}/post) ; then
 	    exec 5> >(exec -a "${link##*/}" $link 1>&4)
@@ -451,9 +481,8 @@
 	exec 5> >(exec -a "${arg0##*/}" $post 1>&4)
 	unset arg0
     else
-	exec 5> >(exec -a cat cat - 1>&4)
+	exec 5> >(exec -a "buffer" cat 1>&4)
     fi
-    OutPipe="-sOutputFile=/dev/fd/5"
     GS_OPTIONS="$GS_OPTIONS $OutPipe"
     export GS_OPTIONS
     export GS_LIB=@@ETCDIR@@/${queue}
@@ -469,6 +498,25 @@
 	GS_FONTPATH=${GS_FONTPATH:+"${GS_FONTPATH}:"}$f
     done
     test -n "${GS_FONTPATH}" && export GS_FONTPATH
+else
+    #
+    # PostScript OUT to printer IN filter on fd 5 if any.
+    #
+    OutPipe="/dev/fd/5"
+    if   test -x @@ETCDIR@@/${queue}/post ; then
+	if link=$(readlink @@ETCDIR@@/${queue}/post) ; then
+	    exec 5> >(exec -a "${link##*/}" $link 1>&4)
+	    unset link
+	else
+	    exec 5> >(exec -a "post" @@ETCDIR@@/${queue}/post 1>&4)
+	fi
+    elif test -n "$post" -a -x "${post%% *}" ; then
+	arg0="${post%% *}"
+	exec 5> >(exec -a "${arg0##*/}" $post 1>&4)
+	unset arg0
+    else
+	exec 5> >(exec -a "buffer" cat 1>&4)
+    fi
 fi
 #
 # Export size and dpi
@@ -588,7 +636,7 @@
 	fi
     fi
 ) | case "$drv" in
-    PS)     cat 1>&4 ;;
+    PS)     cat 1> ${OutPipe#*=} ;;
     upp)    gs @@@ETCDIR@@/${queue}/upp	$GS_AFTER	-dSAFER - -c quit ;;
     *.upp)  gs @$drv					-dSAFER - -c quit ;;
     hpdj_*) gs -sDEVICE=${drv%_*} -sModel=${drv#*_}	-dSAFER - -c quit ;;
@@ -617,9 +665,7 @@
 #
 # Close fd 5 if open
 #
-if test "$drv" != "PS" ; then
-    case "$OutPipe" in -sOutputFile=/dev/fd/5) exec 5>&- ;; esac
-fi
+case "${OutPipe#*=}" in /dev/fd/5) exec 5>&- ;; esac
 
 #
 # Reset printer if necessary.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lpdfilter-0.45/bin/lprsetup new/lpdfilter-0.46/bin/lprsetup
--- old/lpdfilter-0.45/bin/lprsetup	2002-09-10 14:45:33.000000000 +0200
+++ new/lpdfilter-0.46/bin/lprsetup	2006-06-02 16:29:36.000000000 +0200
@@ -18,6 +18,8 @@
 #
 type -p readpc &> /dev/null || export PATH=@@LIBDIR@@/bin:${PATH}
 type -p sed    &> /dev/null || { echo "The sed stream editor is required for lprsetup" 2>&1; exit 1; }
+type -p zgrep  &> /dev/null || { echo "The zgrep pattern matching tool is required for lprsetup" 2>&1; exit 1; }
+type -p zcat   &> /dev/null || { echo "The zcat expand compressed files tool is required for lprsetup" 2>&1; exit 1; }
 
 interactive=false
 date=$(date +%Y%m%d)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lpdfilter-0.45/doc/Makefile new/lpdfilter-0.46/doc/Makefile
--- old/lpdfilter-0.45/doc/Makefile	2002-01-11 17:47:55.000000000 +0100
+++ new/lpdfilter-0.46/doc/Makefile	2006-06-02 16:25:31.000000000 +0200
@@ -15,7 +15,7 @@
 	mkdir -p $(DESTDIR)$(MAN)/man8
 	for s in $(DATA) '' ; do \
 	    test -n "$$s" || break; \
-	    sed 's|@@LIBDIR@@|$(LIBDIR)|g;\
-		 s|@@ETCDIR@@|$(ETCDIR)|g' < $$s > $(DESTDIR)$(MAN)/man8/$${s%.man} ; \
+	    sed -e 's|@@LIBDIR@@|$(LIBDIR)|g' \
+		-e 's|@@ETCDIR@@|$(ETCDIR)|g' < $$s > $(DESTDIR)$(MAN)/man8/$${s%.man} ; \
 	    chmod 0644 $(DESTDIR)$(MAN)/man8/$${s%.man} ; \
 	done
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lpdfilter-0.45/etc/Makefile new/lpdfilter-0.46/etc/Makefile
--- old/lpdfilter-0.45/etc/Makefile	2001-12-21 16:30:47.000000000 +0100
+++ new/lpdfilter-0.46/etc/Makefile	2006-06-02 16:23:24.000000000 +0200
@@ -15,7 +15,7 @@
 	mkdir -p $(DESTDIR)$(ETCDIR)
 	for s in $(FILES) '' ; do \
 	    test -n "$$s" || break; \
-	    sed 's|@@LIBDIR@@|$(LIBDIR)|g;\
-		 s|@@ETCDIR@@|$(ETCDIR)|g' < $$s > $(DESTDIR)$(ETCDIR)/$$s ; \
+	    sed -e 's|@@LIBDIR@@|$(LIBDIR)|g' \
+		-e 's|@@ETCDIR@@|$(ETCDIR)|g' < $$s > $(DESTDIR)$(ETCDIR)/$$s ; \
 	    chmod 0644 $(DESTDIR)$(ETCDIR)/$$s ; \
 	done
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lpdfilter-0.45/filter/Makefile new/lpdfilter-0.46/filter/Makefile
--- old/lpdfilter-0.45/filter/Makefile	2001-11-30 15:32:48.000000000 +0100
+++ new/lpdfilter-0.46/filter/Makefile	2006-06-02 16:26:41.000000000 +0200
@@ -15,7 +15,7 @@
 	mkdir -p $(DESTDIR)$(FILTER)
 	for s in $(SCRIPTS) '' ; do \
 	    test -n "$$s" || break; \
-	    sed 's|@@LIBDIR@@|$(LIBDIR)|g;\
-		 s|@@ETCDIR@@|$(ETCDIR)|g' < $$s > $(DESTDIR)$(FILTER)/$$s ; \
+	    sed -e 's|@@LIBDIR@@|$(LIBDIR)|g' \
+		-e 's|@@ETCDIR@@|$(ETCDIR)|g' < $$s > $(DESTDIR)$(FILTER)/$$s ; \
 	    chmod 0755 $(DESTDIR)$(FILTER)/$$s ; \
 	done
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lpdfilter-0.45/global/Makefile new/lpdfilter-0.46/global/Makefile
--- old/lpdfilter-0.45/global/Makefile	2001-11-30 15:37:13.000000000 +0100
+++ new/lpdfilter-0.46/global/Makefile	2006-06-02 16:25:52.000000000 +0200
@@ -15,8 +15,8 @@
 	mkdir -p $(DESTDIR)$(GLOBAL)
 	for s in $(SCRIPTS) '' ; do \
 	     test -n "$$s" || break; \
-	     sed 's|@@LIBDIR@@|$(LIBDIR)|g;\
-		  s|@@ETCDIR@@|$(ETCDIR)|g' < $$s > $(DESTDIR)$(GLOBAL)/$$s ; \
+	     sed -e 's|@@LIBDIR@@|$(LIBDIR)|g' \
+		 -e 's|@@ETCDIR@@|$(ETCDIR)|g' < $$s > $(DESTDIR)$(GLOBAL)/$$s ; \
 	     chmod 0644 $(DESTDIR)$(GLOBAL)/$$s ; \
 	done
 	bash ../bin/makeresol > $(DESTDIR)$(GLOBAL)/resolutions
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lpdfilter-0.45/global/setup.lib new/lpdfilter-0.46/global/setup.lib
--- old/lpdfilter-0.45/global/setup.lib	2002-05-27 13:26:33.000000000 +0200
+++ new/lpdfilter-0.46/global/setup.lib	2006-06-02 16:29:36.000000000 +0200
@@ -544,9 +544,14 @@
 }
 
 # Ask for UPP entries
+use_upp=no
 function upp ()
 {
+    use_upp=yes
     ghostscript
+    use_upp=no
+
+    test -n "$driver" || return
 
     # Reset driver value (we already have gsdevice)
     driver=upp
@@ -571,8 +576,8 @@
 Please typein the name of the device driver given to ghostscript.
 This driver should work with your printer. A list is found in the
 file /usr/share/doc/packages/ghostscript/catalog.devices.
-For some types of main drivers (e.g. hpdj, uniprint, omni) you
-have to add a prefix like hpdj which leads e.g. to hpdj_500.
+For some types of main drivers (e.g. hpijs, hpdj, uniprint, omni)
+you have to add a prefix like hpdj which leads e.g. to hpdj_500.
 Some printers need a post processor filter to convert ghostscript
 output to the appropiate printer language.
 
@@ -588,10 +593,12 @@
 	driver=$result
 	init="$driver"
 	case "$driver" in
+	    hpijs|ijs)	model=ask	;;
 	    hpdj)	model=ask	;;
 	    stp)	model=ask	;;
 	    omni)	model=ask	;;
 	    ppa)	model=ask	;;
+	    cpva)	model=ask	;;
 	    "")		catalog
 			continue	;;
 	esac
@@ -605,6 +612,32 @@
 		    722		'HP DeskJet 722C' \
 		    820		'HP DeskJet 820Cxi, 820Cse' \
 		    1000	'HP DeskJet 1000Cxi, 1000Cse' || continue
+	    elif test "$driver" = "cpva" ; then
+		run_dialog --menu "\\nWhich type of cpva/md do you choose?\\n" 24 $((COLS-10)) 14 \
+		    Printiva-600	'Citizen Printiva 600C' \
+		    Printiva-600U	'Citizen Printiva 600C Upgrade' \
+		    Printiva-700	'Citizen Printiva 700' \
+		    Printiva-1700	'Citizen Printiva 1700' \
+		    MD-2000		'Alps MD 2000' \
+		    MD-2010		'Alps MD 2010' \
+		    MD-4000		'Alps MD 4000' \
+		    MD-2300		'Alps MD 2300' \
+		    MD-1000		'Alps MD 1000' \
+		    MD-1300		'Alps MD 1300' \
+		    MD-1500		'Alps MD 1500' \
+		    MD-5000		'Alps MD 5000' \
+		    MD-5500		'Alps MD 5500' \
+		    DP-5000		'Oki DP 5000' || continue
+	    elif test "$driver" = "hpijs" -o "$driver" = "ijs" ; then
+		if test "$use_upp" = "yes" ; then
+		    run_dialog --inputbox "\\nWhich model of driver ${result} do you choose?\\n" \
+		    10 $((COLS-10)) || continue
+		else
+		    driver=""
+		    model=""
+		    run_dialog --msgbox "\\nDevice ${result} requires upp file, please go use UPP.\\n" \
+		    7 $((COLS-10)) || return
+		fi
 	    else
 		run_dialog --inputbox "\\nWhich model of driver ${result} do you choose?\\n" \
 		10 $((COLS-10)) || continue
@@ -612,6 +645,7 @@
 	    model=$result
 	fi
 
+
 	tmp="$driver"
 	case "$driver" in
 	    ppa[1-9]*)	post=bin2ppa${driver#*ppa} ; driver=ppmraw ;;
@@ -621,7 +655,7 @@
 	    lex1100)	post=bin2lex1100 ; driver=ppmraw   ;;
 	    lex2030)	post=bin2lex2030 ; driver=pbmraw   ;;
 	    cjet)	post=bin2cjet	 ; driver=ljet3    ;;
-	    cpva)	post=bin2cpva	 ; driver=ppmraw   ;;
+	    cpva*)	post=bin2cpva${model}	 ; driver=ppmraw   ;;
 	    stylps)	post=bin2lpstyl	 ; driver=bitcmyk  ;;
 	esac
 	if test -n "$post" ; then
@@ -632,6 +666,43 @@
     done
 
     case "$driver" in
+	hpijs|ijs)
+	    driver=ijs
+	    if test "$use_upp" = "yes" ; then
+		p=/usr/share/cups/model/manufacturer-PPDs/hplip/
+		if test -d ${p} ; then
+		    tmp=$(zgrep -liE "\*ModelName:[ $TAB]+\"($model|HP $model)\"" ${p}/*.ppd.gz 2> /dev/null)
+		    if test -e "$tmp" ; then
+			model="$(zcat $tmp | \
+			sed -n "/^\*FoomaticRIPOptionSetting Model=[^:]\+:[ ${TAB}]*\"/,/^\*End/ {
+				s/^\*[^\"]\+\"//
+				:join
+				/\(&&\|^\*End\)\$/{N
+				    s/\(&&\|^\*End\)\n//
+				    b join
+				}
+				s/\"$//
+				s/"/\"/gp
+				}"
+			)"
+		    else
+			driver=""
+			model=""
+			run_dialog --msgbox "\\nFailed to read ppd for device ${result}, typo?.\\n" \
+			7 $((COLS-10)) || return
+		    fi
+		    model="-sIjsServer=hpijs -dIjsUseOutputFD $model"
+		else
+		    if test -e @@LIBDIR@@/global/hplip.list.gz ; then
+			model="$(zcat @@LIBDIR@@/global/hplip.list.gz | \
+			sed -n "s/\($model\|HP $model\):\([^:]*\)/\2/p")"
+		    fi
+		    model="-sIjsServer=hpijs -dIjsUseOutputFD $model"
+		fi
+	    else
+		model="-sDEVICE=ijs"
+	    fi
+	    ;;
 	hpdj)	model="-sModel=$model"	;;
 	stp)	model="-sModel=$model"	;;
 	omni)	model="-sDeviceName=$model" ;;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lpdfilter-0.45/post/Makefile new/lpdfilter-0.46/post/Makefile
--- old/lpdfilter-0.45/post/Makefile	2001-11-30 15:34:08.000000000 +0100
+++ new/lpdfilter-0.46/post/Makefile	2006-06-02 16:24:57.000000000 +0200
@@ -15,8 +15,8 @@
 	mkdir -p $(DESTDIR)$(POST)
 	for s in $(SCRIPTS) '' ; do \
 	    test -n "$$s" || break; \
-	    sed 's|@@LIBDIR@@|$(LIBDIR)|g;\
-		 s|@@ETCDIR@@|$(ETCDIR)|g' < $$s > $(DESTDIR)$(POST)/$$s ; \
+	    sed -e 's|@@LIBDIR@@|$(LIBDIR)|g' \
+		-e 's|@@ETCDIR@@|$(ETCDIR)|g' < $$s > $(DESTDIR)$(POST)/$$s ; \
 	    chmod 0755 $(DESTDIR)$(POST)/$$s ; \
 	done
 	if test $(DESTDIR)$(POST)/bin2lexXXXX ; then \
@@ -29,3 +29,10 @@
 		ln -sf bin2ppaXXXX $(DESTDIR)$(POST)/bin2ppa$$p ; \
 	    done ; \
 	fi
+	if test $(DESTDIR)$(POST)/bin2cpva ; then \
+	    for p in Printiva-600 Printiva-600U Printiva-700 Printiva-1700 \
+		     MD-2000 MD-2010 MD-4000 MD-2300 MD-1000 MD-1300 \
+		     MD-1500 MD-5000 MD-5500 DP-5000 ; do  \
+		ln -sf bin2cpva $(DESTDIR)$(POST)/bin2cpva$$p ; \
+	    done ; \
+	fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lpdfilter-0.45/post/bin2cpva new/lpdfilter-0.46/post/bin2cpva
--- old/lpdfilter-0.45/post/bin2cpva	2002-01-10 13:06:58.000000000 +0100
+++ new/lpdfilter-0.46/post/bin2cpva	2006-06-02 15:58:27.000000000 +0200
@@ -29,9 +29,15 @@
 #
 # Check for our filter program
 #
-type -p ppmtocpva &> /dev/null || fault_filetype ppmtocpva
+type -p ppmtomd &> /dev/null || fault_filetype ppmtomd
+
+#
+# Optional printer
+#
+model="${0#*bin2cpva}"
+test -n "$model" || model='Printiva-600U'
 
 #
 # Citizen Printiva printers, reads ppm from gs
 # 
-exec -a ppmtocpva ppmtocpva -halftone
+exec -a ppmtomd ppmtomd -mode $model -halftone
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lpdfilter-0.45/pre/Makefile new/lpdfilter-0.46/pre/Makefile
--- old/lpdfilter-0.45/pre/Makefile	2002-01-11 17:04:09.000000000 +0100
+++ new/lpdfilter-0.46/pre/Makefile	2006-06-02 16:27:16.000000000 +0200
@@ -15,8 +15,8 @@
 	mkdir -p $(DESTDIR)$(PRE)
 	for s in $(SCRIPTS) '' ; do \
 	    test -n "$$s" || break; \
-	    sed 's|@@LIBDIR@@|$(LIBDIR)|g;\
-		 s|@@ETCDIR@@|$(ETCDIR)|g' < $$s > $(DESTDIR)$(PRE)/$$s ; \
+	    sed -e 's|@@LIBDIR@@|$(LIBDIR)|g' \
+		-e 's|@@ETCDIR@@|$(ETCDIR)|g' < $$s > $(DESTDIR)$(PRE)/$$s ; \
 	    chmod 0755 $(DESTDIR)$(PRE)/$$s ; \
 	done
 	if test $(DESTDIR)$(PRE)/ps2up4ps ; then \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lpdfilter-0.45/pre/ps2up4ps new/lpdfilter-0.46/pre/ps2up4ps
--- old/lpdfilter-0.45/pre/ps2up4ps	2002-01-10 13:07:36.000000000 +0100
+++ new/lpdfilter-0.46/pre/ps2up4ps	2006-06-02 15:58:27.000000000 +0200
@@ -37,8 +37,8 @@
 #
 nup=${0##*/}
 case "$nup" in
-    ps[0-9]up4ps) nup=${nup:2:1} ;;
-    *)		  nup=-2	 ;;
+    ps[0-9]up4ps) nup=-${nup:2:1} ;;
+    *)		  nup=-2	  ;;
 esac
 
 #
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lpdfilter-0.45/redirect/Makefile new/lpdfilter-0.46/redirect/Makefile
--- old/lpdfilter-0.45/redirect/Makefile	2002-05-27 13:26:33.000000000 +0200
+++ new/lpdfilter-0.46/redirect/Makefile	2006-06-02 16:26:12.000000000 +0200
@@ -15,7 +15,7 @@
 	mkdir -p $(DESTDIR)$(REDIRECT)
 	for s in $(SCRIPTS) '' ; do \
 	    test -n "$$s" || break; \
-	    sed 's|@@LIBDIR@@|$(LIBDIR)|g;\
-		 s|@@ETCDIR@@|$(ETCDIR)|g' < $$s > $(DESTDIR)$(REDIRECT)/$$s ; \
+	    sed -e 's|@@LIBDIR@@|$(LIBDIR)|g' \
+		-e 's|@@ETCDIR@@|$(ETCDIR)|g' < $$s > $(DESTDIR)$(REDIRECT)/$$s ; \
 	    chmod 0755 $(DESTDIR)$(REDIRECT)/$$s ; \
 	done


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...


---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org

    

root＠suse.de

tags

participants (1)