From 6cfd0aa02636aa696656bf162cd7ea8cbc29e30f Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 16 May 2007 12:31:24 +0200 Subject: [PATCH 01/16] Added tag 1.0.2 for changeset a9302389f6d6 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index cbd345a..ee33242 100644 --- a/.hgtags +++ b/.hgtags @@ -33,3 +33,4 @@ abcb45b335e6fce8ed48114317201548804f7067 0.9.16 bd8f6337a96f6ac24287485f99ccd412b60d4524 0.9.23 9b94694d5db0ccd32732c59b56dbc5711290d7b1 1.0.0 09be3af081e7c9ef7ba3069c88f861a9ef67c798 1.0.1 +a9302389f6d6082a88937fcf34479a44854d7686 1.0.2 -- 2.1.4 From 2c6ff76535e1751ae8b13cb1d1c6110c8d9bebe2 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Thu, 17 May 2007 12:54:35 +0200 Subject: [PATCH 02/16] Remove /usr/lib/cups/backend/pdf and /usr/share/cups/model/PS2PDF.ppd - you should use cups-pdf instead --- debian/changelog | 8 + usr/lib/cups/backend/pdf | 169 ------ usr/share/cups/model/PS2PDF.ppd | 1201 --------------------------------------- 3 files changed, 8 insertions(+), 1370 deletions(-) delete mode 100755 usr/lib/cups/backend/pdf delete mode 100644 usr/share/cups/model/PS2PDF.ppd diff --git a/debian/changelog b/debian/changelog index c1b11c0..1597034 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +grml-etc (1.0.3) unstable; urgency=low + + * Remove /usr/lib/cups/backend/pdf and + /usr/share/cups/model/PS2PDF.ppd - you should use cups-pdf + instead. + + -- Michael Prokop Thu, 17 May 2007 11:37:25 +0200 + grml-etc (1.0.2) unstable; urgency=low * Update /etc/runlevel.conf.hdinstall and /etc/runlevel.conf.livecd diff --git a/usr/lib/cups/backend/pdf b/usr/lib/cups/backend/pdf deleted file mode 100755 index 70aec7e..0000000 --- a/usr/lib/cups/backend/pdf +++ /dev/null @@ -1,169 +0,0 @@ -#!/bin/sh -# originally written by Michael Goffioul; modified & adapted by Kurt -# Pfeifle as part of is "Learning Shell Scripting" efforts. (WARNING: -# THIS WAS MY FIRST SHELL SCRIPT!) -# -# This script is intended to be used as a CUPS backend, to create -# PDFs file on-the-fly. Just create a printer using the device URI -# 'pdf:/path/to/dir/. When printing to this printer, a PDF file will -# be generated in the directory specified. The file name will either -# be "-.pdf" or "unknown-.pdf", -# depending wether the jobname is empty or not. -# -# Attention: CUPS backends run with root privileges -- and so does -# ---------- this script! Use at your own risk! -# -# To use it, simply copy this script to your backend directory, and -# create a printer with the correct URI. That's it. -# -# In case you don't know how to create the PDF creating " printer", -# here is a reminder (you need the ps2pdf.ppd' in the CUPS default -# 'model' directory "/usr/share/cups/model/", and it needs to be -# a generic PostScript-PPD such as the distiller.ppd from Adobe):: -# -# "lpdmin -p pdfwriter -v pdf:/home/grml/PDFs -E -m ps2pdf.ppd" -# -# Copyright (C) Michael Goffioul (goffioul@imec.be) 2001 -# (C) Kurt Pfeifle 2002 - - -# debug off by default; comment in if you desire debugging info.... -#DEBUG="yes" - -if [ x"${DEBUG}" = x"yes" ]; then - set -x - LOGFILE="/tmp/pdf.log" -else - # debug off: - LOGFILE="/dev/null" -fi - -PDFBIN=`which ps2pdf` -FILENAME= -PRINTTIME=`date +%b%d-%H%M%S` - -# first log a few things into the log file.... -echo " " >> ${LOGFILE} -echo "####################################" >> ${LOGFILE} -echo "print and log time is ${PRINTTIME}" >> ${LOGFILE} -echo arg0 $0 >> ${LOGFILE} # printer -echo arg1 $1 >> ${LOGFILE} # job -echo arg2 $2 >> ${LOGFILE} # user -echo arg3 $3 >> ${LOGFILE} # title -echo arg4 $4 >> ${LOGFILE} # options -echo arg5 $5 >> ${LOGFILE} # copies -echo arg6 $6 >> ${LOGFILE} # ; empty if taken from 'stdin' -echo args no. is '$#' = $# >> ${LOGFILE} -echo PRINTTIME ${PRINTTIME} >> ${LOGFILE} -echo PATH ${PATH} >> ${LOGFILE} -echo SOFTWARE ${SOFTWARE} >> ${LOGFILE} -echo USER ${USER} >> ${LOGFILE} -echo CHARSET ${CHARSET} >> ${LOGFILE} -echo LANG ${LANG} >> ${LOGFILE} -echo TZ ${TZ} >> ${LOGFILE} -echo PPD ${PPD} >> ${LOGFILE} -echo CUPS_SERVERROOT ${CUPS_SERVERROOT} >> ${LOGFILE} -echo RIP_MAX_CACHE ${RIP_MAX_CACHE} >> ${LOGFILE} -echo TMPDIR $TMPDIR >> ${LOGFILE} -echo CONTENT_TYPE $CONTENT_TYPE >> ${LOGFILE} -echo DEVICE_URI ${DEVICE_URI} >> ${LOGFILE} -echo PRINTER ${PRINTER} >> ${LOGFILE} -echo CUPS_DATADIR ${CUPS_DATADIR} >> ${LOGFILE} -echo CUPS_FONTPATH ${CUPS_FONTPATH} >> ${LOGFILE} -echo "Executable: ${PDFBIN}" >> ${LOGFILE} -echo "Arguments: | 1: $1 | 2: $2 | 3: $3 | 4: $4 | 5: $5 | 6: $6 |" >> ${LOGFILE} -echo " " >> ${LOGFILE} -echo "Executable: ${PDFBIN}" >> ${LOGFILE} -echo " " >> ${LOGFILE} - -# case of no argument, *MUST* print available URI to satisfy cupsd's -# startup query and test for backend availability -if [ $# -eq 0 ]; then - if [ ! -x "$PDFBIN" ]; then - exit 0 - fi - echo "direct pdf \"Unknown\" \"PDF Writing\"" - exit 0 -fi - -# case of wrong number of arguments -if [ $# -ne 5 -a $# -ne 6 ]; then - echo "Usage: pdf job-id user title copies options [file]" - exit 1 -fi - -# get PDF directory from device URI, and check write status -PDFDIR=${DEVICE_URI#pdf:} -if [ ! -d "${PDFDIR}" -o ! -w "${PDFDIR}" ]; then - echo "ERROR: directory ${PDFDIR} not writable" - exit 1 -fi - -echo "PDF directory: ${PDFDIR}" >> ${LOGFILE} - - -# sanitize the job-title (may contain weird characters if printed fromm -# browser...) -TITLE=${3} - - -# first the spaces..... -TITLE=`echo ${TITLE} | tr [:blank:] _`; - -[ x"${DEBUG}" = x"yes" ] && echo "removed all spaces from original name of jobfile. Name is now ${TITLE}" >> ${LOGFILE}; - -# next the colons.... -TITLE=`echo ${TITLE} | tr : _`; -[ x"${DEBUG}" = x"yes" ] && echo "removed all colons from original name of jobfile. Name is now ${TITLE}" >> ${LOGFILE}; - -# then the slashes.... -TITLE=`echo ${TITLE} | tr / _`; -[ x"${DEBUG}" = x"yes" ] && echo "removed all slashes from original name of jobfile. Name is now ${TITLE}" >> ${LOGFILE}; - -# then the question-marks.... -TITLE=`echo ${TITLE} | tr ? _`; -[ x"${DEBUG}" = x"yes" ] && echo "removed all question marks from original name of jobfile. Name is now ${TITLE}" >> ${LOGFILE}; - -# last the backslashes.... -TITLE=`echo ${TITLE} | tr "\134" _`; -[ x"${DEBUG}" = x"yes" ] && echo "removed all backslashes from original name of jobfile. Name is now ${TITLE}" >> ${LOGFILE}; - -# we should now have a sanitized ${TITLE} to use with less danger of screwing things up.... - -SANITIZED_TITLE=${TITLE} - -# generate output filename -OUTPUTFILENAME= -if [ "$3" = "" ]; then - OUTPUTFILENAME="${PDFDIR}/unknown-${PRINTTIME}.pdf" -else - # OUTPUTFILENAME="${PDFDIR}/${3//[^[:alnum:]]/_}.pdf" - # I changed this to user name, and the printtime to track down who - # printed the PDF and when; Samba printing possibly uses 'nobody'... - - OUTPUTFILENAME="${PDFDIR}/${SANITIZED_TITLE}-${PRINTTIME}-${USER}-${2}.pdf" - echo "PDF file: $OUTPUTFILENAME placed in: ${PDFDIR}" >> ${LOGFILE} -fi - -echo "Output file name: $OUTPUTFILENAME" >> ${LOGFILE} - -# run ghostscript -if [ $# -eq 6 ]; then - $PDFBIN $6 "$OUTPUTFILENAME" -#>& /dev/null -else - $PDFBIN - "$OUTPUTFILENAME" -# >& /dev/null -fi - -sleep 10 - -# modify ownership and permissions on the file -# - world readable -# - owns to user specified in argument -chmod a+r "$OUTPUTFILENAME" -if [ "$2" != "" ]; then - chown $2 "$OUTPUTFILENAME" -fi - -exit 0 diff --git a/usr/share/cups/model/PS2PDF.ppd b/usr/share/cups/model/PS2PDF.ppd deleted file mode 100644 index cf997ea..0000000 --- a/usr/share/cups/model/PS2PDF.ppd +++ /dev/null @@ -1,1201 +0,0 @@ -*PPD-Adobe: "4.3" -*% Adobe Systems PostScript(R) Printer Description File -*% For "DANKA PostScript to PDF Conversion Filter". Useful only for -*% the "pdf:/"-backend in CUPS on grml system -*% Date: 28-02-2004, Kurt Pfeifle (-kp-). Based on the INFOSTRM.PPD by Heinz Pieper. -*% Latest change: Sun Sep 11 12:54:25 CEST 2005 [mika] -*% ************************************************************************ -*% D I S C L A I M E R -*% ************************************************************************ -*% The above statement indicates that this PPD was written using the -*% Adobe PPD File Format Specification 4.3, but does not intend to imply -*% approval and acceptance by Adobe Systems, Inc. -*% -*% This PPD comes with no guarantee of any kind. Support by its authors, by -*% Knoppix, by Danka Deutschland or by Heise Verlag is not available. -*% Feedback is appreciated, but no response time is guaranteed: -*% Kurt Pfeifle -*% - -*% ************************************************************************ -*% C O N F O R M A N C E T E S T R E S U L T S -*% ************************************************************************ -*% This PPD has been tested with the Easy Software Products PPD test tool. -*% This tool, 'testcupsppd' has discovered no deviation from the Adobe PPD -*% Specification. 'testcupsppd' is the best tool known to the author for -*% this purpose.... - -*% ************************************************************************ -*% INTERNAL INFORMATION -*% ************************************************************************ -*% InternalVersion: "07.00.02" -*% Platform(s) Supported: "Windows 95" "Windows 98" "Windows Me" -*% "Windows NT" "Windows 2000" "Windows XP" -*% "Macintosh" -*% "Linux" "AIX" "HP-UX" "NetBSD" "FreeBSD" "OpenBSD" -*% "Mac OS X" "Irix" "Solaris" "Digital UNIX" "OSF/1" -*% "Compaq Tru64 UNIX" "CUPS" "ESP PrintPro" - -*% ************************************************************************ -*% M O D I F I C A T I O N I N F O R M A T I O N -*% ************************************************************************ -*% 28-02-2004 Initial design and testing - -*% ************************************************************************ -*% V E R S I O N I N F O R M A T I O N -*% ************************************************************************ -*FormatVersion: "4.3" -*FileVersion: "1.0" -*PSVersion: "(3010.103) 0" -*% InternalVersion: "07.00.02" - -*% ************************************************************************ -*% N A M E I N F O R M A T I O N -*% ************************************************************************ -*Product: "(DANKA PS2PDF Conversion)" -*Manufacturer: "DANKA Digital Product Development" -*ModelName: "DANKA PS2PDF" -*NickName: "DANKA PS2PDF Conversion" -*ShortNickName: "DANKA PS2PDF" -*PCFileName: "PS2PDF.PPD" - -*% ************************************************************************ -*% L A N G U A G E I N F O R M A T I O N -*% ************************************************************************ -*LanguageVersion: German -*LanguageEncoding: ISOLatin1 -*LanguageLevel: "3" - -*% ************************************************************************ -*% C U P S F I L T E R I N F O R M A T I O N -*% ************************************************************************ -*% *cupsFilter: "application/vnd.cups-postscript 0 dankapdfmark" -*% *cupsFilter: "application/vnd.danka-pdfmarked 0 - " -*% the above lines are currently not used (may change in a later version -*% of the 'DANKA PS2PDF Conversion'). - -*% ************************************************************************* -*% G E N E R A L I N F O R M A T I O N A N D D E F A U L T S -*% ************************************************************************* -*ColorDevice: True -*DefaultColorSpace: RGB -*DefaultResolution: 600dpi -*FreeVM: "5509724" -*Protocols: BCP TBCP -*FileSystem: True -*?FileSystem: "(True) == flush" -*Throughput: "110" - -*DefaultOutputOrder: Normal -*OutputOrder Normal: " " - -*Password: "()" -*ExitServer: " - count 0 eq - { false } { true exch startjob } ifelse - not - { - % if no password or not valid - (WARNING : Cannot modify initial VM.) = - (Missing or invalid password.) = - (Please contact the author of this software.) = flush - quit - } if -" -*End - -*% ************************************************************************ -*% H A L F T O N E I N F O R M A T I O N -*% ************************************************************************ -*ContoneOnly: False -*DefaultHalftoneType: 1 -*ScreenFreq: "60.0" -*ScreenAngle: "45.0" -*DefaultScreenProc: Dot -*ScreenProc Dot: " - {abs exch abs 2 copy add 1 gt {1 sub dup mul exch 1 sub dup mul add 1 sub } - {dup mul exch dup mul add 1 exch sub } ifelse } -" -*End - -*ScreenProc Line: " - { exch pop abs neg } bind -" -*End - -*ScreenProc Ellipse: " - {abs exch abs 2 copy mul exch 4 mul add 3 sub dup 0 lt - { pop dup mul exch .75 div dup mul add 4 div 1 exch sub } - { dup 1 gt { pop 1 exch sub dup mul exch 1 exch sub .75 div dup mul add 4 div 1 sub } - { .5 exch sub exch pop exch pop } ifelse } ifelse } bind -" -*End - -*ScreenProc Cross: " - { abs exch abs 2 copy gt { exch } if pop neg } bind -" -*End - -*DefaultTransfer: Null -*Transfer Null: "{ } bind" -*Transfer Null.Inverse: "{ 1 exch sub } bind" - -*% ************************************************************************ -*% C U S T O M P A G E S I Z E -*% ************************************************************************ -*NonUIOrderDependency: 50.0 AnySetup *CustomPageSize -*MaxMediaWidth: "3240" -*MaxMediaHeight: "3240" -*CenterRegistered: True -*HWMargins: 10 10 10 10 -*LeadingEdge Forced: "" -*DefaultLeadingEdge: Forced -*VariablePaperSize: True -*ParamCustomPageSize Width: 1 points 283 842 -*ParamCustomPageSize Height: 2 points 420 1225 -*ParamCustomPageSize WidthOffset: 3 points 0 0 -*ParamCustomPageSize HeightOffset: 4 points 0 0 -*ParamCustomPageSize Orientation: 5 int 0 3 - -*CustomPageSize True: "pop pop pop <> >> setpagedevice" -*End - -*% ************************************************************************ -*% P A P E R H A N D L I N G -*% ************************************************************************ -*% make the correct rotation Heinz Pieper 10-05-99 -*LandscapeOrientation: Plus90 - -*OpenUI *InputSlot: PickOne -*DefaultInputSlot: PickOne -*InputSlot OnlyOne: "" -*CloseUI: *InputSlot - -*OpenUI *PageSize: PickOne -*OrderDependency: 30 AnySetup *PageSize -*DefaultPageSize: A4 -*PageSize Letter/USBrief: " - currentscreen - 2 dict - dup /PageSize [612 792] put - dup /ImagingBBox [0 0 612 792] put - setpagedevice setscreen " -*End - -*PageSize Legal/USLang: " - currentscreen - 2 dict - dup /PageSize [612 1008] put - dup /ImagingBBox [0 0 612 1008] put - setpagedevice setscreen " -*End - -*PageSize A5/A5: " - currentscreen - 2 dict - dup /PageSize [420 595] put - dup /ImagingBBox [0 0 420 595] put - setpagedevice setscreen " -*End - -*PageSize A4/A4: " - currentscreen - 2 dict - dup /PageSize [595 842] put - dup /ImagingBBox [0 0 595 842] put - setpagedevice setscreen " -*End - -*PageSize A3/A3: " - currentscreen - 2 dict - dup /PageSize [842 1191] put - dup /ImagingBBox [0 0 842 1191] put - setpagedevice setscreen " -*End -*CloseUI: *PageSize - - -*OpenUI *PageRegion: PickOne -*OrderDependency: 40 AnySetup *PageRegion -*DefaultPageRegion: A4 -*PageRegion Letter/USBrief: " - currentscreen - 2 dict - dup /PageSize [612 792] put - dup /ImagingBBox [0 0 612 792] put - setpagedevice setscreen " -*End - -*PageRegion Legal/USLang: " - currentscreen - 2 dict - dup /PageSize [612 1008] put - dup /ImagingBBox [0 0 612 1008] put - setpagedevice setscreen " -*End - -*PageRegion A5/A5: " - currentscreen - 2 dict - dup /PageSize [420 595] put - dup /ImagingBBox [0 0 420 595] put - setpagedevice setscreen " -*End - -*PageRegion A4/A4: " - currentscreen - 2 dict - dup /PageSize [595 842] put - dup /ImagingBBox [0 0 595 842] put - setpagedevice setscreen " -*End - -*PageRegion A3/A3: " - currentscreen - 2 dict - dup /PageSize [842 1191] put - dup /ImagingBBox [0 0 842 1191] put - setpagedevice setscreen " -*End -*CloseUI: *PageRegion - - -*DefaultImageableArea: A4 -*ImageableArea Letter/USBrief: "0 0 612 792 " -*ImageableArea Legal/USLang: "0 0 612 1008 " -*ImageableArea A4/A4: "0 0 595 842 " -*ImageableArea A3/A3: "0 0 842 1191 " -*ImageableArea A5/A5: "0 0 420 595 " -*ImageableArea Screen: "0 0 468 373 " -*ImageableArea Executive: "0 0 522 756 " -*ImageableArea Ledger: "0 0 1224 792 " -*ImageableArea Tabloid/11 x 17: "0 0 792 1224 " - -*DefaultPaperDimension: A4 -*PaperDimension Letter/USBrief: "612 792 " -*PaperDimension Legal/USLang: "612 1008 " -*PaperDimension A4/A4: "595 842 " -*PaperDimension A3/A3: "842 1191 " -*PaperDimension A5/A5: "420 595 " -*PaperDimension Screen: "468 373 " -*PaperDimension Executive: "522 756 " -*PaperDimension Ledger: "1224 792 " -*PaperDimension Tabloid/11 x 17: "792 1224 " - -*RequiresPageRegion All: True - - -*% ************************************************************************ -*% M U L T I P L E R E S O L U T I O N S U P P O R T -*% ************************************************************************ -*OpenUI *Resolution: PickOne -*OrderDependency: 50 AnySetup *Resolution -*DefaultResolution: 600dpi -*Resolution 36dpi: "1 dict dup /HWResolution [36 36] put setpagedevice" -*Resolution 72dpi: "1 dict dup /HWResolution [72 72] put setpagedevice" -*Resolution 144dpi: "1 dict dup /HWResolution [144 144] put setpagedevice" -*Resolution 300dpi: "1 dict dup /HWResolution [300 300] put setpagedevice" -*Resolution 600dpi: "1 dict dup /HWResolution [600 600] put setpagedevice" -*Resolution 1200dpi: "1 dict dup /HWResolution [1200 1200] put setpagedevice" -*Resolution 2400dpi: "1 dict dup /HWResolution [2400 2400] put setpagedevice" -*Resolution 4800dpi: "1 dict dup /HWResolution [4800 4800] put setpagedevice" -*Resolution 9600dpi: "1 dict dup /HWResolution [9600 9600] put setpagedevice" -*?Resolution: " - save - currentpagedevice /HWResolution get - 0 get - ( ) cvs print (dpi) = flush - restore" -*End -*CloseUI: *Resolution - -*ResScreenFreq 36dpi: "60.0" -*ResScreenFreq 72dpi: "60.0" -*ResScreenFreq 144dpi: "60.0" -*ResScreenFreq 300dpi: "60.0" -*ResScreenFreq 600dpi: "60.0" -*ResScreenFreq 1200dpi: "60.0" -*ResScreenFreq 2400dpi: "60.0" -*ResScreenFreq 4800dpi: "60.0" -*ResScreenFreq 9600dpi: "60.0" - -*ResScreenAngle 36dpi: "45.0" -*ResScreenAngle 72dpi: "45.0" -*ResScreenAngle 144dpi: "45.0" -*ResScreenAngle 300dpi: "45.0" -*ResScreenAngle 600dpi: "45.0" -*ResScreenAngle 1200dpi: "45.0" -*ResScreenAngle 2400dpi: "45.0" -*ResScreenAngle 4800dpi: "45.0" -*ResScreenAngle 9600dpi: "45.0" - - -*% ************************************************************************ -*% O T H E R U S E R I N T E R F A C E O P T I O N S -*% ************************************************************************ -*% this version doesn't support any user interface options other than -*% the 'n-up' and 'watermark' stuff derived from HP's MIT-licensed code (-kp-) - - -*% ****************************************************************** -*% ====== N-up Printing (Kurt Pfeifle) ======== -*% ****************************************************************** - -*OpenUI *KP-n-up/Pages per Sheet: PickOne -*OrderDependency: 68 AnySetup *KP-n-up -*DefaultKP-n-up: OneUp -*KP-n-up OneUp/1 (Portrait): " -% Copyright (c) - - userdict begin - true setglobal /KPWM 5 dict dup begin /KPWMOn true def /KPWMOdd true def end def false setglobal - userdict /KPWMAngle known not {/KPWMAngle 45 def} if - userdict /KPWMSize known not {/KPWMSize 48 def} if - userdict /KPWMLocation known not {/KPWMLocation true def} if - userdict /KPWMStyle known not {/KPWMStyle .48 def} if - userdict /KPWMDuplex known not {/KPWMDuplex 0 def} if - /KPWMEOP {KPWMDuplex 0 eq {true}{KPWMDuplex 1 eq KPWMOdd eq dup not {erasepage}if - true setglobal /KPWMOdd KPWMOdd not def false setglobal}ifelse} bind def - end - - << - /EndPage {userdict begin userdict /KPWMText known KPWM /KPWMOn get and - {initmatrix - 0.5 setgray 4 setlinewidth true setstrokeadjust 0 setlinejoin 0 setlinecap [] 0 setdash - currentpagedevice /PageSize get aload pop 2 div exch 2 div exch translate - KPWMAngle rotate /KPWMFont userdict /HPppScale known {KPWMSize HPppScale mul}{KPWMSize}ifelse selectfont - KPWMText stringwidth 2 div neg exch 2 div neg exch - userdict /HPppScale known {KPWMSize HPppScale mul}{KPWMSize}ifelse .25 mul sub moveto - KPWMText false charpath userdict /KPWMStyle1 known - {gsave 1 setgray KPWMStyle1 KPWMStyle add setlinewidth stroke grestore} if - 0 setgray KPWMStyle setlinewidth stroke - KPWMLocation not {true setglobal KPWM /KPWMOn false put false setglobal} if - } if - 2 eq {pop false}{pop KPWM begin KPWMEOP end} ifelse - end } bind - >> setpagedevice" -*End - - -*% ****************************************************************** -*% ========= 1-Up Landscape (Kurt Pfeifle) ============ -*% ****************************************************************** - -*KP-n-up OneUpL/1 (Landscape): " -% Copyright (c) - userdict begin - true setglobal /KPWM 5 dict dup begin /KPWMOn true def /KPWMOdd true def end def false setglobal - - userdict /KPWMAngle known not {/KPWMAngle 45 def} if - userdict /KPWMSize known not {/KPWMSize 48 def} if - userdict /KPWMLocation known not {/KPWMLocation true def} if - userdict /KPWMStyle known not {/KPWMStyle .48 def} if - userdict /KPWMDuplex known not {/KPWMDuplex 0 def} if - - /KPWMEOP {KPWMDuplex 0 eq {true}{KPWMDuplex 1 eq KPWMOdd eq dup not {erasepage}if - true setglobal /KPWMOdd KPWMOdd not def false setglobal}ifelse} bind def - end - - << /EndPage - {userdict begin - userdict /KPWMText known KPWM /KPWMOn get and - {initmatrix 0 setgray 1 setlinewidth true setstrokeadjust 0 setlinejoin 0 setlinecap [] 0 setdash - currentpagedevice /PageSize get aload pop 2 div exch 2 div exch translate - KPWMAngle 90 add rotate /KPWMFont userdict /HPppScale known {KPWMSize HPppScale mul}{KPWMSize}ifelse selectfont - KPWMText stringwidth 2 div neg exch 2 div neg exch - userdict /HPppScale known {KPWMSize HPppScale mul}{KPWMSize}ifelse .25 mul sub moveto - KPWMText false charpath userdict /KPWMStyle1 known - {gsave 1 setgray KPWMStyle1 KPWMStyle add setlinewidth stroke grestore} if - 0 setgray KPWMStyle setlinewidth stroke KPWMLocation not - {true setglobal KPWM /KPWMOn false put false setglobal} if - } if - 2 eq {pop false}{pop KPWM begin KPWMEOP end} ifelse end - } bind - >> setpagedevice" -*End - -*% ****************************************************************** -*% ========= 2-Up Portrait (Kurt Pfeifle) ============ -*% ****************************************************************** - -*KP-n-up TwoUp/2 (Portrait): " -% Copyright (c) - userdict begin - userdict /KPWMPgWidth known not - {/KPWMPgWidth currentpagedevice /PageSize get aload pop /KPWMPgHeight exch def def} if - /KPWMShWidth currentpagedevice /PageSize get aload pop /KPWMShHeight exch def def - - /KPWMCTM { - /KPWMScale KPWMShWidth 32 sub KPWMPgHeight div dup KPWMShHeight 32 sub 2 div - KPWMPgWidth div dup 3 1 roll lt {pop} {exch pop} ifelse def - /KPWMX1 KPWMShWidth KPWMPgHeight KPWMScale mul sub 2 div KPWMPgHeight KPWMScale mul add def - /KPWMY1 KPWMShHeight KPWMPgWidth KPWMScale mul 2 mul sub 2 div def - /KPWMY2 KPWMPgWidth KPWMScale mul KPWMY1 add def - } bind def KPWMCTM - - true setglobal /KPWM 5 dict dup begin /KPWMOn true def /KPWMOdd true def end def false setglobal - - /restore {/PageSV where {pop dup PageSV eq - {restore KPWM begin KPWMMatrix setmatrix end}{restore}ifelse}{restore}ifelse} bind def - - userdict /KPWMAngle known not {/KPWMAngle 45 def} if - userdict /KPWMSize known not {/KPWMSize 48 def} if - userdict /KPWMLocation known not {/KPWMLocation true def} if - userdict /KPWMStyle known not {/KPWMStyle .48 def} if - userdict /KPWMDuplex known not {/KPWMDuplex 0 def} if - - /KPWMEOP {KPWMDuplex 0 eq {true}{KPWMDuplex 1 eq KPWMOdd eq dup not {erasepage}if - true setglobal /KPWMOdd KPWMOdd not def false setglobal}ifelse} bind def - - /KPwatermark { - 0 setgray 1 setlinewidth true setstrokeadjust 0 setlinejoin 0 setlinecap [] 0 setdash - 0 0 KPWMPgWidth KPWMPgHeight rectstroke - userdict /KPWMText known KPWMOn and - {KPWMPgWidth 2 div KPWMPgHeight 2 div translate - KPWMAngle rotate /KPWMFont KPWMSize selectfont - KPWMText stringwidth 2 div neg exch 2 div neg exch KPWMSize .25 mul sub moveto - KPWMText false charpath userdict /KPWMStyle1 known - {gsave 1 setgray KPWMStyle1 KPWMScale div KPWMStyle add setlinewidth stroke grestore} if - 0 setgray KPWMStyle setlinewidth stroke - KPWMLocation not {true setglobal KPWM /KPWMOn false put false setglobal} if - } if - } bind def - end - - << - /BeginPage {userdict begin - 2 mod 0 eq { KPWMX1 KPWMY1 translate }{ KPWMX1 KPWMY2 translate } ifelse - 90 rotate KPWMScale KPWMScale scale - KPWM begin true setglobal - /KPWMMatrix matrix currentmatrix def - false setglobal end - end } bind - - /EndPage {userdict begin - KPWM begin KPWMMatrix setmatrix - 2 eq {2 mod 0 ne {KPWMEOP}{false}ifelse}{KPwatermark 2 mod 1 eq {KPWMEOP}{false}ifelse} ifelse end - end } bind - >> setpagedevice - -/setpagedevice {userdict begin dup /PageSize known {/KPWMPgWidth exch /PageSize get aload pop /KPWMPgHeight exch def def - KPWMCTM <> - userdict /KPWMSPD known {KPWMSPD}{setpagedevice} ifelse}if end} bind def" -*End - - -*% ****************************************************************** -*% ========= 2-Up Landscape (Kurt Pfeifle) ============ -*% ****************************************************************** - -*KP-n-up TwoUpL/2 (Landscape): " -% Copyright (c) - userdict begin - userdict /KPWMPgWidth known not - {/KPWMPgWidth currentpagedevice /PageSize get aload pop /KPWMPgHeight exch def def} if - /KPWMShWidth currentpagedevice /PageSize get aload pop /KPWMShHeight exch def def - - /KPWMCTM { - /KPWMScale KPWMShWidth 32 sub KPWMPgHeight div dup KPWMShHeight 32 sub 2 div - KPWMPgWidth div dup 3 1 roll lt {pop} {exch pop} ifelse def - /KPWMX1 KPWMShWidth KPWMPgHeight KPWMScale mul sub 2 div def - /KPWMY1 KPWMShHeight KPWMPgWidth KPWMScale mul 2 mul sub 2 div KPWMShHeight exch sub def - /KPWMY2 KPWMY1 KPWMPgWidth KPWMScale mul sub def - } bind def KPWMCTM - - true setglobal /KPWM 5 dict dup begin /KPWMOn true def /KPWMOdd true def end def false setglobal - - /restore {/PageSV where {pop dup PageSV eq - {restore KPWM begin KPWMMatrix setmatrix end}{restore}ifelse}{restore}ifelse} bind def - - userdict /KPWMAngle known not {/KPWMAngle 45 def} if - userdict /KPWMSize known not {/KPWMSize 48 def} if - userdict /KPWMLocation known not {/KPWMLocation true def} if - userdict /KPWMStyle known not {/KPWMStyle .48 def} if - userdict /KPWMDuplex known not {/KPWMDuplex 0 def} if - - /KPWMEOP {KPWMDuplex 0 eq {true}{KPWMDuplex 1 eq KPWMOdd eq dup not {erasepage}if - true setglobal /KPWMOdd KPWMOdd not def false setglobal}ifelse} bind def - - /KPwatermark { - 0 setgray 1 setlinewidth true setstrokeadjust 0 setlinejoin 0 setlinecap [] 0 setdash - 0 0 KPWMPgWidth KPWMPgHeight rectstroke - userdict /KPWMText known KPWMOn and - {KPWMPgWidth 2 div KPWMPgHeight 2 div translate - KPWMAngle 90 add rotate /KPWMFont KPWMSize selectfont - KPWMText stringwidth 2 div neg exch 2 div neg exch KPWMSize .25 mul sub moveto - KPWMText false charpath userdict /KPWMStyle1 known - {gsave 1 setgray KPWMStyle1 KPWMScale div KPWMStyle add setlinewidth stroke grestore} if - 0 setgray KPWMStyle setlinewidth stroke - KPWMLocation not {true setglobal KPWM /KPWMOn false put false setglobal} if - } if - } bind def - end - - << - /BeginPage {userdict begin - 2 mod 0 eq { KPWMX1 KPWMY1 translate }{ KPWMX1 KPWMY2 translate } ifelse - -90 rotate KPWMScale KPWMScale scale - KPWM begin true setglobal - /KPWMMatrix matrix currentmatrix def - false setglobal end - end } bind - - /EndPage {userdict begin - KPWM begin KPWMMatrix setmatrix - 2 eq {2 mod 0 ne {KPWMEOP}{false}ifelse}{KPwatermark 2 mod 1 eq {KPWMEOP}{false}ifelse} ifelse end - end } bind - >> setpagedevice - -/setpagedevice {userdict begin dup /PageSize known {/KPWMPgWidth exch /PageSize get aload pop /KPWMPgHeight exch def def - KPWMCTM <> - userdict /KPWMSPD known {KPWMSPD}{setpagedevice} ifelse}if end} bind def" -*End - -*% ****************************************************************** -*% ========= 4-Up (Kurt Pfeifle) ============ -*% ****************************************************************** - -*KP-n-up FourUp/4 (Portrait): " -% Copyright (c) - userdict begin - userdict /KPWMPgWidth known not - {/KPWMPgWidth currentpagedevice /PageSize get aload pop /KPWMPgHeight exch def def} if - /KPWMShWidth currentpagedevice /PageSize get aload pop /KPWMShHeight exch def def - - /KPWMCTM { - /KPWMScale KPWMShWidth 32 sub 2 div KPWMPgWidth div dup KPWMShHeight 32 sub 2 div - KPWMPgHeight div dup 3 1 roll lt {pop} {exch pop} ifelse def - /KPWMX1 KPWMShWidth KPWMPgWidth KPWMScale mul 2 mul sub 2 div def - /KPWMX2 KPWMPgWidth KPWMScale mul KPWMX1 add def - /KPWMY1 KPWMShHeight KPWMPgHeight KPWMScale mul 2 mul sub 2 div def - /KPWMY2 KPWMPgHeight KPWMScale mul KPWMY1 add def - } bind def KPWMCTM - - true setglobal /KPWM 5 dict dup begin /KPWMOn true def /KPWMOdd true def end def false setglobal - - /restore {/PageSV where {pop dup PageSV eq - {restore KPWM begin KPWMMatrix setmatrix end}{restore}ifelse}{restore}ifelse} bind def - - userdict /KPWMAngle known not {/KPWMAngle 45 def} if - userdict /KPWMSize known not {/KPWMSize 48 def} if - userdict /KPWMLocation known not {/KPWMLocation true def} if - userdict /KPWMStyle known not {/KPWMStyle .48 def} if - userdict /KPWMDuplex known not {/KPWMDuplex 0 def} if - - /KPWMEOP {KPWMDuplex 0 eq {true}{KPWMDuplex 1 eq KPWMOdd eq dup not {erasepage}if - true setglobal /KPWMOdd KPWMOdd not def false setglobal}ifelse} bind def - - /KPwatermark { - 0 setgray 1 setlinewidth true setstrokeadjust 0 setlinejoin 0 setlinecap [] 0 setdash - 0 0 KPWMPgWidth KPWMPgHeight rectstroke - userdict /KPWMText known KPWMOn and - {KPWMPgWidth 2 div KPWMPgHeight 2 div translate - KPWMAngle rotate /KPWMFont KPWMSize selectfont - KPWMText stringwidth 2 div neg exch 2 div neg exch KPWMSize .25 mul sub moveto - KPWMText false charpath userdict /KPWMStyle1 known - {gsave 1 setgray KPWMStyle1 KPWMScale div KPWMStyle add setlinewidth stroke grestore} if - 0 setgray KPWMStyle setlinewidth stroke - KPWMLocation not {true setglobal KPWM /KPWMOn false put false setglobal} if - } if - } bind def - end - -<< - /BeginPage {userdict begin - 4 mod dup dup dup - 0 eq {KPWMX1 KPWMY2 translate} if - 1 eq {KPWMX2 KPWMY2 translate} if - 2 eq {KPWMX1 KPWMY1 translate} if - 3 eq {KPWMX2 KPWMY1 translate} if - KPWMScale KPWMScale scale - KPWM begin true setglobal - /KPWMMatrix matrix currentmatrix def - false setglobal end - end } bind - - /EndPage {userdict begin - KPWM begin KPWMMatrix setmatrix - 2 eq {4 mod 0 ne {KPWMEOP}{false}ifelse}{KPwatermark 4 mod 3 eq {KPWMEOP}{false}ifelse} ifelse end - end } bind ->> setpagedevice - -/setpagedevice {userdict begin dup /PageSize known {/KPWMPgWidth exch /PageSize get aload pop /KPWMPgHeight exch def def - KPWMCTM <> - userdict /KPWMSPD known {KPWMSPD}{setpagedevice} ifelse}if end} bind def" -*End - - -*% ****************************************************************** -*% ========= 4-Up Landscape (Kurt Pfeifle) ============ -*% ****************************************************************** - -*KP-n-up FourUpL/4 (Landscape): " -% Copyright (c) - userdict begin - userdict /KPWMPgWidth known not - {/KPWMPgWidth currentpagedevice /PageSize get aload pop /KPWMPgHeight exch def def} if - /KPWMShWidth currentpagedevice /PageSize get aload pop /KPWMShHeight exch def def - - /KPWMCTM { - /KPWMScale KPWMShWidth 32 sub 2 div KPWMPgWidth div dup KPWMShHeight 32 sub 2 div - KPWMPgHeight div dup 3 1 roll lt {pop} {exch pop} ifelse def - /KPWMX1 KPWMShWidth KPWMPgWidth KPWMScale mul 2 mul sub 2 div def - /KPWMX2 KPWMPgWidth KPWMScale mul KPWMX1 add def - /KPWMY1 KPWMShHeight KPWMPgHeight KPWMScale mul 2 mul sub 2 div def - /KPWMY2 KPWMPgHeight KPWMScale mul KPWMY1 add def - } bind def KPWMCTM - - true setglobal /KPWM 5 dict dup begin /KPWMOn true def /KPWMOdd true def end def false setglobal - - /restore {/PageSV where {pop dup PageSV eq - {restore KPWM begin KPWMMatrix setmatrix end}{restore}ifelse}{restore}ifelse} bind def - - userdict /KPWMAngle known not {/KPWMAngle 45 def} if - userdict /KPWMSize known not {/KPWMSize 48 def} if - userdict /KPWMLocation known not {/KPWMLocation true def} if - userdict /KPWMStyle known not {/KPWMStyle .48 def} if - userdict /KPWMDuplex known not {/KPWMDuplex 0 def} if - - /KPWMEOP {KPWMDuplex 0 eq {true}{KPWMDuplex 1 eq KPWMOdd eq dup not {erasepage}if - true setglobal /KPWMOdd KPWMOdd not def false setglobal}ifelse} bind def - - /KPwatermark { - 0 setgray 1 setlinewidth true setstrokeadjust 0 setlinejoin 0 setlinecap [] 0 setdash - 0 0 KPWMPgWidth KPWMPgHeight rectstroke - userdict /KPWMText known KPWMOn and - {KPWMPgWidth 2 div KPWMPgHeight 2 div translate - KPWMAngle 90 add rotate /KPWMFont KPWMSize selectfont - KPWMText stringwidth 2 div neg exch 2 div neg exch KPWMSize .25 mul sub moveto - KPWMText false charpath userdict /KPWMStyle1 known - {gsave 1 setgray KPWMStyle1 KPWMScale div KPWMStyle add setlinewidth stroke grestore} if - 0 setgray KPWMStyle setlinewidth stroke - KPWMLocation not {true setglobal KPWM /KPWMOn false put false setglobal} if - } if - } bind def - end - - << - /BeginPage {userdict begin - 4 mod dup dup dup - 0 eq {KPWMX1 KPWMY1 translate} if - 1 eq {KPWMX1 KPWMY2 translate} if - 2 eq {KPWMX2 KPWMY1 translate} if - 3 eq {KPWMX2 KPWMY2 translate} if - KPWMScale KPWMScale scale - KPWM begin true setglobal - /KPWMMatrix matrix currentmatrix def - false setglobal end - end } bind - - /EndPage {userdict begin - KPWM begin KPWMMatrix setmatrix - 2 eq {4 mod 0 ne {KPWMEOP}{false}ifelse}{KPwatermark 4 mod 3 eq {KPWMEOP}{false}ifelse} ifelse end - end } bind - >> setpagedevice - -/setpagedevice {userdict begin dup /PageSize known {/KPWMPgWidth exch /PageSize get aload pop /KPWMPgHeight exch def def - KPWMCTM <> - userdict /KPWMSPD known {KPWMSPD}{setpagedevice} ifelse}if end} bind def" -*End - - -*% ****************************************************************** -*% ========= 6-Up Portrait (Kurt Pfeifle) ============ -*% ****************************************************************** - -*KP-n-up SixUp/6 (Portrait): " -% Copyright (c) - userdict begin - userdict /KPWMPgWidth known not - {/KPWMPgWidth currentpagedevice /PageSize get aload pop /KPWMPgHeight exch def def} if - /KPWMShWidth currentpagedevice /PageSize get aload pop /KPWMShHeight exch def def - - /KPWMCTM { - /KPWMScale KPWMShWidth 32 sub 2 div KPWMPgHeight div dup KPWMShHeight 32 sub 3 div - KPWMPgWidth div dup 3 1 roll lt {pop} {exch pop} ifelse def - /KPWMX1 KPWMShWidth KPWMPgHeight KPWMScale mul 2 mul sub 2 div KPWMPgHeight KPWMScale mul add def - /KPWMY1 KPWMShHeight KPWMPgWidth KPWMScale mul 3 mul sub 2 div def - } bind def KPWMCTM - - true setglobal /KPWM 5 dict dup begin /KPWMOn true def /KPWMOdd true def end def false setglobal - - /restore {/PageSV where {pop dup PageSV eq - {restore KPWM begin KPWMMatrix setmatrix end}{restore}ifelse}{restore}ifelse} bind def - - userdict /KPWMAngle known not {/KPWMAngle 45 def} if - userdict /KPWMSize known not {/KPWMSize 48 def} if - userdict /KPWMLocation known not {/KPWMLocation true def} if - userdict /KPWMStyle known not {/KPWMStyle .48 def} if - userdict /KPWMDuplex known not {/KPWMDuplex 0 def} if - - /KPWMEOP {KPWMDuplex 0 eq {true}{KPWMDuplex 1 eq KPWMOdd eq dup not {erasepage}if - true setglobal /KPWMOdd KPWMOdd not def false setglobal}ifelse} bind def - - /KPwatermark { - 0 setgray 1 setlinewidth true setstrokeadjust 0 setlinejoin 0 setlinecap [] 0 setdash - 0 0 KPWMPgWidth KPWMPgHeight rectstroke - userdict /KPWMText known KPWMOn and - {KPWMPgWidth 2 div KPWMPgHeight 2 div translate - KPWMAngle rotate /KPWMFont KPWMSize selectfont - KPWMText stringwidth 2 div neg exch 2 div neg exch KPWMSize .25 mul sub moveto - KPWMText false charpath userdict /KPWMStyle1 known - {gsave 1 setgray KPWMStyle1 KPWMScale div KPWMStyle add setlinewidth stroke grestore} if - 0 setgray KPWMStyle setlinewidth stroke - KPWMLocation not {true setglobal KPWM /KPWMOn false put false setglobal} if - } if - } bind def - end - - << - /BeginPage {userdict begin - 6 mod dup - 3 idiv KPWMPgHeight KPWMScale mul mul KPWMX1 add - exch dup 3 idiv 3 mul sub KPWMPgWidth KPWMScale mul mul KPWMY1 add - translate - 90 rotate KPWMScale KPWMScale scale - KPWM begin true setglobal - /KPWMMatrix matrix currentmatrix def - false setglobal end - end } bind - - /EndPage {userdict begin - KPWM begin KPWMMatrix setmatrix - 2 eq {6 mod 0 ne {KPWMEOP}{false}ifelse}{KPwatermark 6 mod 5 eq {KPWMEOP}{false}ifelse} ifelse end - end } bind - >> setpagedevice - -/setpagedevice {userdict begin dup /PageSize known {/KPWMPgWidth exch /PageSize get aload pop /KPWMPgHeight exch def def - KPWMCTM <> - userdict /KPWMSPD known {KPWMSPD}{setpagedevice} ifelse}if end} bind def" -*End - - -*% ****************************************************************** -*% ========= 6-Up Landscape (Kurt Pfeifle) ============ -*% ****************************************************************** - -*KP-n-up SixUpL/6 (Landscape): " -% Copyright (c) - userdict begin - userdict /KPWMPgWidth known not - {/KPWMPgWidth currentpagedevice /PageSize get aload pop /KPWMPgHeight exch def def} if - /KPWMShWidth currentpagedevice /PageSize get aload pop /KPWMShHeight exch def def - - /KPWMCTM { - /KPWMScale KPWMShWidth 32 sub 2 div KPWMPgHeight div dup KPWMShHeight 32 sub 3 div - KPWMPgWidth div dup 3 1 roll lt {pop} {exch pop} ifelse def - /KPWMX1 KPWMShWidth KPWMPgHeight KPWMScale mul 2 mul sub 2 div def - /KPWMY1 KPWMShHeight KPWMPgWidth KPWMScale mul 3 mul sub 2 div KPWMPgWidth KPWMScale mul add def - } bind def KPWMCTM - - true setglobal /KPWM 5 dict dup begin /KPWMOn true def /KPWMOdd true def end def false setglobal - - /restore {/PageSV where {pop dup PageSV eq - {restore KPWM begin KPWMMatrix setmatrix end}{restore}ifelse}{restore}ifelse} bind def - - userdict /KPWMAngle known not {/KPWMAngle 45 def} if - userdict /KPWMSize known not {/KPWMSize 48 def} if - userdict /KPWMLocation known not {/KPWMLocation true def} if - userdict /KPWMStyle known not {/KPWMStyle .48 def} if - userdict /KPWMDuplex known not {/KPWMDuplex 0 def} if - - /KPWMEOP {KPWMDuplex 0 eq {true}{KPWMDuplex 1 eq KPWMOdd eq dup not {erasepage}if - true setglobal /KPWMOdd KPWMOdd not def false setglobal}ifelse} bind def - - /KPwatermark { - 0 setgray 1 setlinewidth true setstrokeadjust 0 setlinejoin 0 setlinecap [] 0 setdash - 0 0 KPWMPgWidth KPWMPgHeight rectstroke - userdict /KPWMText known KPWMOn and - {KPWMPgWidth 2 div KPWMPgHeight 2 div translate - KPWMAngle 90 add rotate /KPWMFont KPWMSize selectfont - KPWMText stringwidth 2 div neg exch 2 div neg exch KPWMSize .25 mul sub moveto - KPWMText false charpath userdict /KPWMStyle1 known - {gsave 1 setgray KPWMStyle1 KPWMScale div KPWMStyle add setlinewidth stroke grestore} if - 0 setgray KPWMStyle setlinewidth stroke - KPWMLocation not {true setglobal KPWM /KPWMOn false put false setglobal} if - } if - } bind def - end - - << - /BeginPage {userdict begin - 6 mod dup - dup 2 idiv 2 mul sub KPWMPgHeight KPWMScale mul mul KPWMX1 add - exch 2 idiv 2 exch sub KPWMPgWidth KPWMScale mul mul KPWMY1 add - translate - -90 rotate KPWMScale KPWMScale scale - KPWM begin true setglobal - /KPWMMatrix matrix currentmatrix def - false setglobal end - end } bind - - /EndPage {userdict begin - KPWM begin KPWMMatrix setmatrix - 2 eq {6 mod 0 ne {KPWMEOP}{false}ifelse}{KPwatermark 6 mod 5 eq {KPWMEOP}{false}ifelse} ifelse end - end } bind - >> setpagedevice - -/setpagedevice {userdict begin dup /PageSize known {/KPWMPgWidth exch /PageSize get aload pop /KPWMPgHeight exch def def - KPWMCTM <> - userdict /KPWMSPD known {KPWMSPD}{setpagedevice} ifelse}if end} bind def" -*End - -*CloseUI: *KP-n-up - -*% ************************************************************************* -*% === Watermark Text Selection (Kurt Pfeifle) ======== -*% ************************************************************************* - -*OpenUI *KPWMText/Watermark: PickOne -*OrderDependency: 65 AnySetup *KPWMText -*DefaultKPWMText: grml -*KPWMText None/None: "" -*KPWMText DankaDigitalProductsDevelopment/Danka Digital Products Development: "userdict /KPWMText (Danka Digital Products Development) put" -*KPWMText DPD/DPD: "userdict /KPWMText (DPD) put" -*KPWMText grml/grml: "userdict /KPWMText (grml) put" -*KPWMText DankaAtTheDesktop/Danka at the Desktop: "userdict /KPWMText (Danka at the Desktop) put" -*KPWMText CompanyConfidential/Company Confidential: "userdict /KPWMText (Company Confidential) put" -*KPWMText CompanyProprietary/Company Proprietary: "userdict /KPWMText (Company Proprietary) put" -*KPWMText CompanyPrivate/Company Private: "userdict /KPWMText (Company Private) put" -*KPWMText Confidential/Confidential: "userdict /KPWMText (Confidential) put" -*KPWMText Copy/Copy: "userdict /KPWMText (Copy) put" -*KPWMText Copyright/Copyright: "userdict /KPWMText (Copyright) put" -*KPWMText Draft/Draft: "userdict /KPWMText (Draft) put" -*KPWMText FileCopy/File Copy: "userdict /KPWMText (File Copy) put" -*KPWMText Final/Final Version: "userdict /KPWMText (Final Version) put" -*KPWMText ForInternalUse/For Internal Use Only: "userdict /KPWMText (For Internal Use Only) put" -*KPWMText Preliminary/Preliminary Version: "userdict /KPWMText (Preliminary Version) put" -*KPWMText Proof/Proof: "userdict /KPWMText (Proof) put" -*KPWMText ReviewCopy/Review Copy: "userdict /KPWMText (Review Copy) put" -*KPWMText Sample/Sample: "userdict /KPWMText (Sample) put" -*KPWMText TopSecret/Top Secret: "userdict /KPWMText (Top Secret) put" -*KPWMText Urgent/Urgent: "userdict /KPWMText (Urgent) put" -*CloseUI: *KPWMText - - -*% ****************************************************************** -*% === WaterMark Font Selection (Kurt Pfeifle)======== -*% ****************************************************************** - -*OpenUI *KPWMFont/Watermark Font: PickOne -*OrderDependency: 65 AnySetup *KPWMFont -*DefaultKPWMFont: HelveticaB -*KPWMFont CourierB/Courier Bold: " - /Courier-Bold findfont dup length dict begin - {1 index /FID ne {def} {pop pop} ifelse} forall - /Encoding ISOLatin1Encoding def currentdict - end - /KPWMFont exch definefont pop" -*End -*KPWMFont TimesB/Times Bold: " - /Times-Bold findfont dup length dict begin - {1 index /FID ne {def} {pop pop} ifelse} forall - /Encoding ISOLatin1Encoding def currentdict - end - /KPWMFont exch definefont pop" -*End -*KPWMFont HelveticaB/Helvetica Bold: " - /Helvetica-Bold findfont dup length dict begin - {1 index /FID ne {def} {pop pop} ifelse} forall - /Encoding ISOLatin1Encoding def currentdict - end - /KPWMFont exch definefont pop" -*End -*KPWMFont PalatinoB/Palatino Bold:" - /Palatino-Bold findfont dup length dict begin - {1 index /FID ne {def} {pop pop} ifelse} forall - /Encoding ISOLatin1Encoding def currentdict - end - /KPWMFont exch definefont pop" -*End -*KPWMFont PalatinoBI/Palatino Bold Italic: " - /Palatino-BoldItalic findfont dup length dict begin - {1 index /FID ne {def} {pop pop} ifelse} forall - /Encoding ISOLatin1Encoding def currentdict - end - /KPWMFont exch definefont pop" -*End -*KPWMFont NewCenturySchlbk-Bold/New Century Schoolbook Bold: " - /NewCenturySchlbk-Bold findfont dup length dict begin - {1 index /FID ne {def} {pop pop} ifelse} forall - /Encoding ISOLatin1Encoding def currentdict - end - /KPWMFont exch definefont pop" -*End -*CloseUI: *KPWMFont - - -*% ****************************************************************** -*% === WaterMark Size Selection (Kurt Pfeifle) ======== -*% ****************************************************************** - -*OpenUI *KPWMFontSize/Watermark Font Size: PickOne -*OrderDependency: 65 AnySetup *KPWMFontSize -*DefaultKPWMFontSize: pt144 -*KPWMFontSize pt24/24 Punkte: "userdict /KPWMSize 24 put" -*KPWMFontSize pt30/30 Punkte: "userdict /KPWMSize 30 put" -*KPWMFontSize pt36/36 Punkte: "userdict /KPWMSize 36 put" -*KPWMFontSize pt42/42 Punkte: "userdict /KPWMSize 42 put" -*KPWMFontSize pt48/48 Punkte: "userdict /KPWMSize 48 put" -*KPWMFontSize pt54/54 Punkte: "userdict /KPWMSize 54 put" -*KPWMFontSize pt60/60 Punkte: "userdict /KPWMSize 60 put" -*KPWMFontSize pt66/66 Punkte: "userdict /KPWMSize 66 put" -*KPWMFontSize pt72/72 Punkte: "userdict /KPWMSize 72 put" -*KPWMFontSize pt78/78 Punkte: "userdict /KPWMSize 78 put" -*KPWMFontSize pt84/84 Punkte: "userdict /KPWMSize 84 put" -*KPWMFontSize pt90/90 Punkte: "userdict /KPWMSize 90 put" -*KPWMFontSize pt96/96 Punkte: "userdict /KPWMSize 96 put" -*KPWMFontSize pt108/108 Punkte: "userdict /KPWMSize 108 put" -*KPWMFontSize pt120/120 Punkte: "userdict /KPWMSize 120 put" -*KPWMFontSize pt144/144 Punkte: "userdict /KPWMSize 144 put" -*CloseUI: *KPWMFontSize - - -*% ****************************************************************** -*% === WaterMark Angle Selection (Kurt Pfeifle) ======== -*% ****************************************************************** - -*OpenUI *KPWMTextAngle/Watermark Text Angel: PickOne -*OrderDependency: 65 AnySetup *KPWMTextAngle -*DefaultKPWMTextAngle: Deg60 -*KPWMTextAngle Deg90/90 Grad: "userdict /KPWMAngle 90 put" -*KPWMTextAngle Deg80/80 Grad: "userdict /KPWMAngle 80 put" -*KPWMTextAngle Deg75/75 Grad: "userdict /KPWMAngle 75 put" -*KPWMTextAngle Deg66/66 Grad: "userdict /KPWMAngle 66 put" -*KPWMTextAngle Deg60/60 Grad: "userdict /KPWMAngle 60 put" -*KPWMTextAngle Deg50/50 Grad: "userdict /KPWMAngle 50 put" -*KPWMTextAngle Deg45/45 Grad: "userdict /KPWMAngle 45 put" -*KPWMTextAngle Deg40/40 Grad: "userdict /KPWMAngle 40 put" -*KPWMTextAngle Deg30/30 Grad: "userdict /KPWMAngle 30 put" -*KPWMTextAngle Deg20/20 Grad: "userdict /KPWMAngle 20 put" -*KPWMTextAngle Deg15/15 Grad: "userdict /KPWMAngle 15 put" -*KPWMTextAngle Deg10/10 Grad: "userdict /KPWMAngle 10 put" -*KPWMTextAngle Deg0/0 Grad: "userdict /KPWMAngle 0 put" -*KPWMTextAngle DegN10/-10 Grad: "userdict /KPWMAngle -10 put" -*KPWMTextAngle DegN15/-15 Grad: "userdict /KPWMAngle -15 put" -*KPWMTextAngle DegN20/-20 Grad: "userdict /KPWMAngle -20 put" -*KPWMTextAngle DegN30/-30 Grad: "userdict /KPWMAngle -30 put" -*KPWMTextAngle DegN40/-40 Grad: "userdict /KPWMAngle -40 put" -*KPWMTextAngle DegN45/-45 Grad: "userdict /KPWMAngle -45 put" -*KPWMTextAngle DegN50/-50 Grad: "userdict /KPWMAngle -50 put" -*KPWMTextAngle DegN60/-60 Grad: "userdict /KPWMAngle -60 put" -*KPWMTextAngle DegN66/-66 Grad: "userdict /KPWMAngle -66 put" -*KPWMTextAngle DegN75/-75 Grad: "userdict /KPWMAngle -75 put" -*KPWMTextAngle DegN80/-80 Grad: "userdict /KPWMAngle -80 put" -*KPWMTextAngle DegN90/-90 Grad: "userdict /KPWMAngle -90 put" -*CloseUI: *KPWMTextAngle - - -*% ****************************************************************** -*% === WaterMark Style Selection (Kurt Pfeifle) ======== -*% ****************************************************************** - -*OpenUI *KPWMTextStyle/Watermark Font Style: PickOne -*OrderDependency: 65 AnySetup *KPWMTextStyle -*DefaultKPWMTextStyle: Halo -*KPWMTextStyle Narrow/Narrow Outline: "userdict /KPWMStyle .24 put" -*KPWMTextStyle Medium/Medium Outline: "userdict /KPWMStyle .48 put" -*KPWMTextStyle Wide/Wide Outline: "userdict /KPWMStyle .96 put" -*KPWMTextStyle VeryWide/Very Wide Outline: "userdict /KPWMStyle 1.92 put" -*KPWMTextStyle Halo/Wide Outline Halo: "userdict /KPWMStyle .96 put userdict /KPWMStyle1 .84 put" -*CloseUI: *KPWMTextStyle - - -*% ****************************************************************** -*% === WaterMark Location Selection (Kurt Pfeifle) ======== -*% ****************************************************************** - - -*OpenUI *KPWMLocation/Print Watermark: Boolean -*OrderDependency: 65 AnySetup *KPWMLocation -*DefaultKPWMLocation: False -*KPWMLocation True/All Pages: "userdict /KPWMLocation true put" -*KPWMLocation False/First Page Only: "userdict /KPWMLocation false put" -*CloseUI: *KPWMLocation - -*% ****************************************************************** -*% ===== PPD Version information & warning (Kurt Pfeifle) ====== -*% ****************************************************************** - -*OpenUI *KPPPDInfo/About this Danka-enhanced PPD: PickOne -*OrderDependency: 65 AnySetup *KPPPDInfo -*DefaultKPPPDInfo: KPModified -*KPPPDInfo KPModified/PPD was modified by Kurt Pfeifle -- Danka DPD: "" -*KPPPDInfo KPGuarantee/* no guarantee is provided whatsoever: "" -*KPPPDInfo KPLimitation/* new functions might not work under all conditions: "" -*KPPPDInfo KPDanger/* please do take your own precautions --: "" -*KPPPDInfo KPWarning/ -- it does not prevent pregnancy nor AIDS: "" -*CloseUI: *KPPPDInfo - - -*% ************************************************************************ -*% F O N T I N F O R M A T I O N -*% ************************************************************************ -*ADHasEuro: True -*DefaultFont: Courier -*Font AdobeSansMM: Standard "(001.000)" Standard Disk -*Font AdobeSerifMM: Standard "(001.001)" Standard Disk -*Font AlbertusMT-Italic: Standard "(001.001)" Standard Disk -*Font AlbertusMT-Light: Standard "(001.001)" Standard Disk -*Font AlbertusMT: Standard "(001.001)" Standard Disk -*Font AntiqueOlive-Bold: Standard "(001.002)" Standard Disk -*Font AntiqueOlive-Compact: Standard "(001.002)" Standard Disk -*Font AntiqueOlive-Italic: Standard "(001.002)" Standard Disk -*Font AntiqueOlive-Roman: Standard "(001.002)" Standard Disk -*Font Apple-Chancery: Standard "(3.0)" Standard Disk -*Font Arial-BoldItalicMT: Standard "(001.002)" Standard Disk -*Font Arial-BoldMT: Standard "(001.002)" Standard Disk -*Font Arial-ItalicMT: Standard "(001.002)" Standard Disk -*Font ArialMT: Standard "(001.002)" Standard Disk -*Font AvantGarde-Book: Standard "(003.000)" Standard Disk -*Font AvantGarde-BookOblique: Standard "(003.000)" Standard Disk -*Font AvantGarde-Demi: Standard "(003.000)" Standard Disk -*Font AvantGarde-DemiOblique: Standard "(003.000)" Standard Disk -*Font Bodoni-Bold: Standard "(001.003)" Standard Disk -*Font Bodoni-BoldItalic: Standard "(001.003)" Standard Disk -*Font Bodoni-Italic: Standard "(001.003)" Standard Disk -*Font Bodoni-Poster: Standard "(001.003)" Standard Disk -*Font Bodoni-PosterCompressed: Standard "(001.002)" Standard Disk -*Font Bodoni: Standard "(001.003)" Standard Disk -*Font Bookman-Demi: Standard "(003.000)" Standard Disk -*Font Bookman-DemiItalic: Standard "(003.000)" Standard Disk -*Font Bookman-Light: Standard "(003.000)" Standard Disk -*Font Bookman-LightItalic: Standard "(003.000)" Standard Disk -*Font Carta: Special "(001.001)" Special Disk -*Font Chicago: Standard "(3.0)" Standard Disk -*Font Clarendon-Bold: Standard "(001.002)" Standard Disk -*Font Clarendon-Light: Standard "(001.002)" Standard Disk -*Font Clarendon: Standard "(001.002)" Standard Disk -*Font CooperBlack-Italic: Standard "(001.004)" Standard Disk -*Font CooperBlack: Standard "(001.004)" Standard Disk -*Font Copperplate-ThirtyThreeBC: Standard "(001.003)" Standard Disk -*Font Copperplate-ThirtyTwoBC: Standard "(001.003)" Standard Disk -*Font Coronet-Regular: Standard "(001.001)" Standard Disk -*Font Courier-Bold: Standard "(004.000)" Standard Disk -*Font Courier-BoldOblique: Standard "(004.000)" Standard Disk -*Font Courier-Oblique: Standard "(004.000)" Standard Disk -*Font Courier: Standard "(004.000)" Standard Disk -*Font Eurostile-Bold: Standard "(001.002)" Standard Disk -*Font Eurostile-BoldExtendedTwo: Standard "(001.003)" Standard Disk -*Font Eurostile-ExtendedTwo: Standard "(001.003)" Standard Disk -*Font Eurostile: Standard "(001.003)" Standard Disk -*Font Geneva: Standard "(3.0)" Standard Disk -*Font GillSans-Bold: Standard "(001.002)" Standard Disk -*Font GillSans-BoldCondensed: Standard "(001.002)" Standard Disk -*Font GillSans-BoldItalic: Standard "(001.003)" Standard Disk -*Font GillSans-Condensed: Standard "(001.002)" Standard Disk -*Font GillSans-ExtraBold: Standard "(001.002)" Standard Disk -*Font GillSans-Italic: Standard "(001.003)" Standard Disk -*Font GillSans-Light: Standard "(001.002)" Standard Disk -*Font GillSans-LightItalic: Standard "(001.003)" Standard Disk -*Font GillSans: Standard "(001.003)" Standard Disk -*Font Goudy-Bold: Standard "(001.003)" Standard Disk -*Font Goudy-BoldItalic: Standard "(001.003)" Standard Disk -*Font Goudy-ExtraBold: Standard "(001.002)" Standard Disk -*Font Goudy-Italic: Standard "(001.003)" Standard Disk -*Font Goudy: Standard "(001.004)" Standard Disk -*Font Helvetica-Bold: Standard "(003.000)" Standard Disk -*Font Helvetica-BoldOblique: Standard "(003.000)" Standard Disk -*Font Helvetica-Condensed-Bold: Standard "(003.000)" Standard Disk -*Font Helvetica-Condensed-BoldObl: Standard "(003.000)" Standard Disk -*Font Helvetica-Condensed-Oblique: Standard "(003.000)" Standard Disk -*Font Helvetica-Condensed: Standard "(003.000)" Standard Disk -*Font Helvetica-Narrow-Bold: Standard "(003.000)" Standard Disk -*Font Helvetica-Narrow-BoldOblique: Standard "(003.000)" Standard Disk -*Font Helvetica-Narrow-Oblique: Standard "(003.000)" Standard Disk -*Font Helvetica-Narrow: Standard "(003.000)" Standard Disk -*Font Helvetica-Oblique: Standard "(003.000)" Standard Disk -*Font Helvetica: Standard "(003.000)" Standard Disk -*Font HoeflerText-Black: Standard "(1.0)" Unknown Disk -*Font HoeflerText-BlackItalic: Standard "(1.0)" Unknown Disk -*Font HoeflerText-Italic: Standard "(1.0)" Unknown Disk -*Font HoeflerText-Ornaments: Special "(001.001)" Standard Disk -*Font HoeflerText-Regular: Standard "(1.0)" Unknown Disk -*Font JoannaMT-Bold: Standard "(001.001)" Standard Disk -*Font JoannaMT-BoldItalic: Standard "(001.001)" Standard Disk -*Font JoannaMT-Italic: Standard "(001.001)" Standard Disk -*Font JoannaMT: Standard "(001.001)" Standard Disk -*Font LetterGothic-Bold: Standard "(001.007)" Standard Disk -*Font LetterGothic-BoldSlanted: Standard "(001.006)" Standard Disk -*Font LetterGothic-Slanted: Standard "(001.005)" Standard Disk -*Font LetterGothic: Standard "(001.005)" Standard Disk -*Font LubalinGraph-Book: Standard "(001.004)" Standard Disk -*Font LubalinGraph-BookOblique: Standard "(001.004)" Standard Disk -*Font LubalinGraph-Demi: Standard "(001.004)" Standard Disk -*Font LubalinGraph-DemiOblique: Standard "(001.004)" Standard Disk -*Font Marigold: Standard "(001.001)" Standard Disk -*Font MonaLisa-Recut: Standard "(001.001)" Standard Disk -*Font Monaco: Standard "(3.0)" Standard Disk -*Font NewCenturySchlbk-Bold: Standard "(003.000)" Standard Disk -*Font NewCenturySchlbk-BoldItalic: Standard "(003.000)" Standard Disk -*Font NewCenturySchlbk-Italic: Standard "(003.000)" Standard Disk -*Font NewCenturySchlbk-Roman: Standard "(003.000)" Standard Disk -*Font NewYork: Standard "(3.0)" Standard Disk -*Font Optima-Bold: Standard "(001.007)" Standard Disk -*Font Optima-BoldItalic: Standard "(001.001)" Standard Disk -*Font Optima-Italic: Standard "(001.001)" Standard Disk -*Font Optima: Standard "(001.006)" Standard Disk -*Font Oxford: Standard "(001.001)" Standard Disk -*Font Palatino-Bold: Standard "(003.000)" Standard Disk -*Font Palatino-BoldItalic: Standard "(003.000)" Standard Disk -*Font Palatino-Italic: Standard "(003.000)" Standard Disk -*Font Palatino-Roman: Standard "(003.000)" Standard Disk -*Font StempelGaramond-Bold: Standard "(001.003)" Standard Disk -*Font StempelGaramond-BoldItalic: Standard "(001.003)" Standard Disk -*Font StempelGaramond-Italic: Standard "(001.003)" Standard Disk -*Font StempelGaramond-Roman: Standard "(001.003)" Standard Disk -*Font Symbol: Special "(001.008)" Special Disk -*Font Tekton: Standard "(001.002)" Standard Disk -*Font Times-Bold: Standard "(003.000)" Standard Disk -*Font Times-BoldItalic: Standard "(003.000)" Standard Disk -*Font Times-Italic: Standard "(003.000)" Standard Disk -*Font Times-Roman: Standard "(003.000)" Standard Disk -*Font TimesNewRomanPS-BoldItalicMT: Standard "(001.003)" Standard Disk -*Font TimesNewRomanPS-BoldMT: Standard "(001.003)" Standard Disk -*Font TimesNewRomanPS-ItalicMT: Standard "(001.003)" Standard Disk -*Font TimesNewRomanPSMT: Standard "(001.003)" Standard Disk -*Font Univers-Bold: Standard "(001.004)" Standard Disk -*Font Univers-BoldExt: Standard "(001.001)" Standard Disk -*Font Univers-BoldExtObl: Standard "(001.001)" Standard Disk -*Font Univers-BoldOblique: Standard "(001.004)" Standard Disk -*Font Univers-Condensed: Standard "(001.003)" Standard Disk -*Font Univers-CondensedBold: Standard "(001.002)" Standard Disk -*Font Univers-CondensedBoldOblique: Standard "(001.002)" Standard Disk -*Font Univers-CondensedOblique: Standard "(001.003)" Standard Disk -*Font Univers-Extended: Standard "(001.001)" Standard Disk -*Font Univers-ExtendedObl: Standard "(001.001)" Standard Disk -*Font Univers-Light: Standard "(001.004)" Standard Disk -*Font Univers-LightOblique: Standard "(001.004)" Standard Disk -*Font Univers-Oblique: Standard "(001.004)" Standard Disk -*Font Univers: Standard "(001.004)" Standard Disk -*Font Wingdings-Regular: Special "(002.000)" Special Disk -*Font ZapfChancery-MediumItalic: Standard "(003.000)" Standard Disk -*Font ZapfDingbats: Special "(002.000)" Special Disk - -*?FontQuery: " - save - { count 1 gt - { exch dup 127 string cvs (/) print print (:) print - /Font resourcestatus {pop pop (Yes)} {(No)} ifelse = - } { exit } ifelse - } bind loop - (*) = flush - restore" -*End -*?FontList: " -save - (*) {cvn ==} 128 string /Font resourceforall - (*) = flush -restore" -*End - -*% ************************************************************************ -*% -*% Last Edit Date: 03-05-2003 Kurt Pfeifle (-kp-), DANKA Europe Ltd. -*% End of PPD file for DANKA PostScript Merge Filter -*% -*% ************************************************************************ -*% E N D O F P P D -*% ************************************************************************ -- 2.1.4 From 59c3d693f1f7dcafcd0ea62806a59283adaa8753 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Thu, 17 May 2007 12:55:05 +0200 Subject: [PATCH 03/16] Remove /usr from debian/rules --- debian/rules | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/rules b/debian/rules index 54f6847..954b80c 100755 --- a/debian/rules +++ b/debian/rules @@ -29,7 +29,6 @@ install: build # Add here commands to install the package into debian/grml-etc. cp -a etc/ debian/grml-etc/ - cp -a usr/ debian/grml-etc/ # Build architecture-independent files here. binary-indep: build install -- 2.1.4 From 8359ed6ff9046cc6e2c5a2704a8d766c3c63330b Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Thu, 17 May 2007 12:57:02 +0200 Subject: [PATCH 04/16] Added tag 1.0.3 for changeset 61b93dfc9f51 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index ee33242..06ccfb9 100644 --- a/.hgtags +++ b/.hgtags @@ -34,3 +34,4 @@ bd8f6337a96f6ac24287485f99ccd412b60d4524 0.9.23 9b94694d5db0ccd32732c59b56dbc5711290d7b1 1.0.0 09be3af081e7c9ef7ba3069c88f861a9ef67c798 1.0.1 a9302389f6d6082a88937fcf34479a44854d7686 1.0.2 +61b93dfc9f519fcac84839f82f8ee4e1bb043087 1.0.3 -- 2.1.4 From abea827009c701721267da3ab537883a3b971d97 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sun, 20 May 2007 12:37:29 +0200 Subject: [PATCH 05/16] /etc/skel/.w3m/config: fix editor line --- debian/changelog | 8 ++++++++ etc/skel/.w3m/config | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1597034..f987bf1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +grml-etc (1.0.4) unstable; urgency=low + + * /etc/skel/.w3m/config: use 'editor /usr/bin/editor' instead + of 'editor /usr/local/bin/vim'. Thanks for bugreport goes to + Jan-Pieter Jacobs! + + -- Michael Prokop Sun, 20 May 2007 12:35:12 +0200 + grml-etc (1.0.3) unstable; urgency=low * Remove /usr/lib/cups/backend/pdf and diff --git a/etc/skel/.w3m/config b/etc/skel/.w3m/config index ad14013..965a31c 100644 --- a/etc/skel/.w3m/config +++ b/etc/skel/.w3m/config @@ -42,8 +42,8 @@ extbrowser3 extbrowser2 extbrowser /usr/bin/lynx mailer -editor /usr/local/bin/vim -urimethodmap ~/.w3m/urimethodmap, /usr/local/etc/w3m/urimethodmap +editor /usr/bin/editor +urimethodmap ~/.w3m/urimethodmap mailcap ~/.w3m/mailcap, /etc/mailcap mime_types ~/.mime.types, /etc/mime.types index_file -- 2.1.4 From e8c54af9bc8ddef8956f7b3395d32748c65e6c86 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sun, 20 May 2007 13:02:42 +0200 Subject: [PATCH 06/16] Added tag 1.0.4 for changeset 3290e7ce41f4 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 06ccfb9..21ee5df 100644 --- a/.hgtags +++ b/.hgtags @@ -35,3 +35,4 @@ bd8f6337a96f6ac24287485f99ccd412b60d4524 0.9.23 09be3af081e7c9ef7ba3069c88f861a9ef67c798 1.0.1 a9302389f6d6082a88937fcf34479a44854d7686 1.0.2 61b93dfc9f519fcac84839f82f8ee4e1bb043087 1.0.3 +3290e7ce41f4b37ffbed8047910dc44399b89f43 1.0.4 -- 2.1.4 From 130b951dc71f3b56eb04033b25ed0d32ff7ab5d4 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Tue, 22 May 2007 14:27:15 +0200 Subject: [PATCH 07/16] /etc/locale.gen.grml: add support for nl_BE. --- debian/changelog | 7 +++++++ etc/locale.gen.grml | 3 +++ 2 files changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index f987bf1..abcbeee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +grml-etc (1.0.5) unstable; urgency=low + + * /etc/locale.gen.grml: add support for nl_BE. + Thanks for the bugreport, Jan-Pieter Jacobs. + + -- Michael Prokop Tue, 22 May 2007 14:26:37 +0200 + grml-etc (1.0.4) unstable; urgency=low * /etc/skel/.w3m/config: use 'editor /usr/bin/editor' instead diff --git a/etc/locale.gen.grml b/etc/locale.gen.grml index 87b1994..bf89c52 100644 --- a/etc/locale.gen.grml +++ b/etc/locale.gen.grml @@ -64,6 +64,9 @@ it_IT ISO-8859-1 it_IT.UTF-8 UTF-8 ja_JP.EUC-JP EUC-JP ja_JP.UTF-8 UTF-8 +nl_BE ISO-8859-1 +nl_BE.UTF-8 UTF-8 +nl_BE@euro ISO-8859-15 nl_NL@euro ISO-8859-15 nl_NL ISO-8859-1 nl_NL.UTF-8 UTF-8 -- 2.1.4 From e62d60fd5660e4147d47c016508f45cfd0b04d9b Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Tue, 22 May 2007 14:29:26 +0200 Subject: [PATCH 08/16] Added tag 1.0.5 for changeset a22d1d13db76 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 21ee5df..26646c6 100644 --- a/.hgtags +++ b/.hgtags @@ -36,3 +36,4 @@ bd8f6337a96f6ac24287485f99ccd412b60d4524 0.9.23 a9302389f6d6082a88937fcf34479a44854d7686 1.0.2 61b93dfc9f519fcac84839f82f8ee4e1bb043087 1.0.3 3290e7ce41f4b37ffbed8047910dc44399b89f43 1.0.4 +a22d1d13db76ec3bd1dd3fcb7b038df25e8bf40c 1.0.5 -- 2.1.4 From ccc67962fc0b800c56353d44d58bded99b859b2d Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sun, 27 May 2007 19:33:10 +0200 Subject: [PATCH 09/16] Add /etc/skel/.ipython/ipythonrc --- debian/changelog | 7 + etc/skel/.ipython/ipythonrc | 641 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 648 insertions(+) create mode 100644 etc/skel/.ipython/ipythonrc diff --git a/debian/changelog b/debian/changelog index abcbeee..fd5051f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +grml-etc (1.0.6) unstable; urgency=low + + * Add /etc/skel/.ipython/ipythonrc - configuration file + for ipython. + + -- Michael Prokop Sun, 27 May 2007 19:32:52 +0200 + grml-etc (1.0.5) unstable; urgency=low * /etc/locale.gen.grml: add support for nl_BE. diff --git a/etc/skel/.ipython/ipythonrc b/etc/skel/.ipython/ipythonrc new file mode 100644 index 0000000..08affe5 --- /dev/null +++ b/etc/skel/.ipython/ipythonrc @@ -0,0 +1,641 @@ +#!/bin/sh +# Filename: i$HOME/.ipython/ipythonrc +# Purpose: configuration file for ipython +# Authors: grml-team (grml.org), (c) Michael Prokop +# Bug-Reports: see http://grml.org/bugs/ +# License: This file is licensed under the GPL v2. +# Latest change: Fre Mai 25 02:40:10 CEST 2007 [mika] +################################################################################ + +#*************************************************************************** +# +# Configuration file for IPython -- ipythonrc format +# +# =========================================================== +# Deprecation note: you should look into modifying ipy_user_conf.py (located +# in ~/.ipython or ~/_ipython, depending on your platform) instead, it's a +# more flexible and robust (and better supported!) configuration +# method. +# =========================================================== +# +# The format of this file is simply one of 'key value' lines. +# Lines containing only whitespace at the beginning and then a # are ignored +# as comments. But comments can NOT be put on lines with data. + +# The meaning and use of each key are explained below. + +#--------------------------------------------------------------------------- +# Section: included files + +# Put one or more *config* files (with the syntax of this file) you want to +# include. For keys with a unique value the outermost file has precedence. For +# keys with multiple values, they all get assembled into a list which then +# gets loaded by IPython. + +# In this file, all lists of things should simply be space-separated. + +# This allows you to build hierarchies of files which recursively load +# lower-level services. If this is your main ~/.ipython/ipythonrc file, you +# should only keep here basic things you always want available. Then you can +# include it in every other special-purpose config file you create. +include + +#--------------------------------------------------------------------------- +# Section: startup setup + +# These are mostly things which parallel a command line option of the same +# name. + +# Keys in this section should only appear once. If any key from this section +# is encountered more than once, the last value remains, all earlier ones get +# discarded. + +# Automatic calling of callable objects. If set to 1 or 2, callable objects +# are automatically called when invoked at the command line, even if you don't +# type parentheses. IPython adds the parentheses for you. For example: + +#In [1]: str 45 +#------> str(45) +#Out[1]: '45' + +# IPython reprints your line with '---->' indicating that it added +# parentheses. While this option is very convenient for interactive use, it +# may occasionally cause problems with objects which have side-effects if +# called unexpectedly. + +# The valid values for autocall are: + +# autocall 0 -> disabled (you can toggle it at runtime with the %autocall magic) + +# autocall 1 -> active, but do not apply if there are no arguments on the line. + +# In this mode, you get: + +#In [1]: callable +#Out[1]: + +#In [2]: callable 'hello' +#------> callable('hello') +#Out[2]: False + +# 2 -> Active always. Even if no arguments are present, the callable object +# is called: + +#In [4]: callable +#------> callable() + +# Note that even with autocall off, you can still use '/' at the start of a +# line to treat the first argument on the command line as a function and add +# parentheses to it: + +#In [8]: /str 43 +#------> str(43) +#Out[8]: '43' + +autocall 1 + +# Auto-edit syntax errors. When you use the %edit magic in ipython to edit +# source code (see the 'editor' variable below), it is possible that you save +# a file with syntax errors in it. If this variable is true, IPython will ask +# you whether to re-open the editor immediately to correct such an error. + +autoedit_syntax 0 + +# Auto-indent. IPython can recognize lines ending in ':' and indent the next +# line, while also un-indenting automatically after 'raise' or 'return'. + +# This feature uses the readline library, so it will honor your ~/.inputrc +# configuration (or whatever file your INPUTRC variable points to). Adding +# the following lines to your .inputrc file can make indent/unindenting more +# convenient (M-i indents, M-u unindents): + +# $if Python +# "\M-i": " " +# "\M-u": "\d\d\d\d" +# $endif + +# The feature is potentially a bit dangerous, because it can cause problems +# with pasting of indented code (the pasted code gets re-indented on each +# line). But it's a huge time-saver when working interactively. The magic +# function %autoindent allows you to toggle it on/off at runtime. + +autoindent 1 + +# Auto-magic. This gives you access to all the magic functions without having +# to prepend them with an % sign. If you define a variable with the same name +# as a magic function (say who=1), you will need to access the magic function +# with % (%who in this example). However, if later you delete your variable +# (del who), you'll recover the automagic calling form. + +# Considering that many magic functions provide a lot of shell-like +# functionality, automagic gives you something close to a full Python+system +# shell environment (and you can extend it further if you want). + +automagic 1 + +# Size of the output cache. After this many entries are stored, the cache will +# get flushed. Depending on the size of your intermediate calculations, you +# may have memory problems if you make it too big, since keeping things in the +# cache prevents Python from reclaiming the memory for old results. Experiment +# with a value that works well for you. + +# If you choose cache_size 0 IPython will revert to python's regular >>> +# unnumbered prompt. You will still have _, __ and ___ for your last three +# results, but that will be it. No dynamic _1, _2, etc. will be created. If +# you are running on a slow machine or with very limited memory, this may +# help. + +cache_size 1000 + +# Classic mode: Setting 'classic 1' you lose many of IPython niceties, +# but that's your choice! Classic 1 -> same as IPython -classic. +# Note that this is _not_ the normal python interpreter, it's simply +# IPython emulating most of the classic interpreter's behavior. +classic 0 + +# colors - Coloring option for prompts and traceback printouts. + +# Currently available schemes: NoColor, Linux, LightBG. + +# This option allows coloring the prompts and traceback printouts. This +# requires a terminal which can properly handle color escape sequences. If you +# are having problems with this, use the NoColor scheme (uses no color escapes +# at all). + +# The Linux option works well in linux console type environments: dark +# background with light fonts. + +# LightBG is similar to Linux but swaps dark/light colors to be more readable +# in light background terminals. + +# keep uncommented only the one you want: +colors Linux +#colors LightBG +#colors NoColor + +######################## +# Note to Windows users +# +# Color and readline support is avaialble to Windows users via Gary Bishop's +# readline library. You can find Gary's tools at +# http://sourceforge.net/projects/uncpythontools. +# Note that his readline module requires in turn the ctypes library, available +# at http://starship.python.net/crew/theller/ctypes. +######################## + +# color_info: IPython can display information about objects via a set of +# functions, and optionally can use colors for this, syntax highlighting +# source code and various other elements. This information is passed through a +# pager (it defaults to 'less' if $PAGER is not set). + +# If your pager has problems, try to setting it to properly handle escapes +# (see the less manpage for detail), or disable this option. The magic +# function %color_info allows you to toggle this interactively for testing. + +color_info 1 + +# confirm_exit: set to 1 if you want IPython to confirm when you try to exit +# with an EOF (Control-d in Unix, Control-Z/Enter in Windows). Note that using +# the magic functions %Exit or %Quit you can force a direct exit, bypassing +# any confirmation. + +confirm_exit 1 + +# Use deep_reload() as a substitute for reload() by default. deep_reload() is +# still available as dreload() and appears as a builtin. + +deep_reload 0 + +# Which editor to use with the %edit command. If you leave this at 0, IPython +# will honor your EDITOR environment variable. Since this editor is invoked on +# the fly by ipython and is meant for editing small code snippets, you may +# want to use a small, lightweight editor here. + +# For Emacs users, setting up your Emacs server properly as described in the +# manual is a good idea. An alternative is to use jed, a very light editor +# with much of the feel of Emacs (though not as powerful for heavy-duty work). + +editor 0 + +# log 1 -> same as ipython -log. This automatically logs to ./ipython.log +log 0 + +# Same as ipython -Logfile YourLogfileName. +# Don't use with log 1 (use one or the other) +logfile '~/.ipython/ipython.log' + +# banner 0 -> same as ipython -nobanner +banner 1 + +# messages 0 -> same as ipython -nomessages +messages 1 + +# Automatically call the pdb debugger after every uncaught exception. If you +# are used to debugging using pdb, this puts you automatically inside of it +# after any call (either in IPython or in code called by it) which triggers an +# exception which goes uncaught. +pdb 0 + +# Enable the pprint module for printing. pprint tends to give a more readable +# display (than print) for complex nested data structures. +pprint 1 + +# Prompt strings + +# Most bash-like escapes can be used to customize IPython's prompts, as well as +# a few additional ones which are IPython-specific. All valid prompt escapes +# are described in detail in the Customization section of the IPython HTML/PDF +# manual. + +# Use \# to represent the current prompt number, and quote them to protect spaces. +prompt_in1 'In [\#]: ' +# \D is replaced by as many dots as there are digits in the current value of \#. +prompt_in2 ' .\D.: ' +prompt_out 'Out[\#]: ' + +#prompt_in1 '[ip] \C_LightBlue\u@\C_White\h \Y1 \# \C_White% ' +#prompt_in2 '\C_Green|\C_LightGreen\D\C_Green> ' +#prompt_out '<\#> ' + +# Select whether to left-pad the output prompts to match the length of the +# input ones. This allows you for example to use a simple '>' as an output +# prompt, and yet have the output line up with the input. If set to false, +# the output prompts will be unpadded (flush left). +prompts_pad_left 1 + +# Pylab support: when ipython is started with the -pylab switch, by default it +# executes 'from matplotlib.pylab import *'. Set this variable to false if you +# want to disable this behavior. + +# For details on pylab, see the matplotlib website: +# http://matplotlib.sf.net +pylab_import_all 1 + +# quick 1 -> same as ipython -quick +quick 0 + +# Use the readline library (1) or not (0). Most users will want this on, but +# if you experience strange problems with line management (mainly when using +# IPython inside Emacs buffers) you may try disabling it. Not having it on +# prevents you from getting command history with the arrow keys, searching and +# name completion using TAB. + +readline 1 + +# Screen Length: number of lines of your screen. This is used to control +# printing of very long strings. Strings longer than this number of lines will +# be paged with the less command instead of directly printed. + +# The default value for this is 0, which means IPython will auto-detect your +# screen size every time it needs to print. If for some reason this isn't +# working well (it needs curses support), specify it yourself. Otherwise don't +# change the default. + +screen_length 0 + +# Prompt separators for input and output. +# Use \n for newline explicitly, without quotes. +# Use 0 (like at the cmd line) to turn off a given separator. + +# The structure of prompt printing is: +# (SeparateIn)Input.... +# (SeparateOut)Output... +# (SeparateOut2), # that is, no newline is printed after Out2 +# By choosing these you can organize your output any way you want. + +#separate_in \n +separate_in 0 +separate_out 0 +separate_out2 0 + +# 'nosep 1' is a shorthand for '-SeparateIn 0 -SeparateOut 0 -SeparateOut2 0'. +# Simply removes all input/output separators, overriding the choices above. +nosep 0 + +# Wildcard searches - IPython has a system for searching names using +# shell-like wildcards; type %psearch? for details. This variables sets +# whether by default such searches should be case sensitive or not. You can +# always override the default at the system command line or the IPython +# prompt. + +wildcards_case_sensitive 1 + +# Object information: at what level of detail to display the string form of an +# object. If set to 0, ipython will compute the string form of any object X, +# by calling str(X), when X? is typed. If set to 1, str(X) will only be +# computed when X?? is given, and if set to 2 or higher, it will never be +# computed (there is no X??? level of detail). This is mostly of use to +# people who frequently manipulate objects whose string representation is +# extremely expensive to compute. + +object_info_string_level 0 + +# xmode - Exception reporting mode. + +# Valid modes: Plain, Context and Verbose. + +# Plain: similar to python's normal traceback printing. + +# Context: prints 5 lines of context source code around each line in the +# traceback. + +# Verbose: similar to Context, but additionally prints the variables currently +# visible where the exception happened (shortening their strings if too +# long). This can potentially be very slow, if you happen to have a huge data +# structure whose string representation is complex to compute. Your computer +# may appear to freeze for a while with cpu usage at 100%. If this occurs, you +# can cancel the traceback with Ctrl-C (maybe hitting it more than once). + +#xmode Plain +xmode Context +#xmode Verbose + +# multi_line_specials: if true, allow magics, aliases and shell escapes (via +# !cmd) to be used in multi-line input (like for loops). For example, if you +# have this active, the following is valid in IPython: +# +#In [17]: for i in range(3): +# ....: mkdir $i +# ....: !touch $i/hello +# ....: ls -l $i + +multi_line_specials 1 + +# System calls: When IPython makes system calls (e.g. via special syntax like +# !cmd or !!cmd, or magics like %sc or %sx), it can print the command it is +# executing to standard output, prefixed by a header string. + +system_header "IPython system call: " + +system_verbose 1 + +# wxversion: request a specific wxPython version (used for -wthread) + +# Set this to the value of wxPython you want to use, but note that this +# feature requires you to have the wxversion Python module to work. If you +# don't have the wxversion module (try 'import wxversion' at the prompt to +# check) or simply want to leave the system to pick up the default, leave this +# variable at 0. + +wxversion 0 + +#--------------------------------------------------------------------------- +# Section: Readline configuration (readline is not available for MS-Windows) + +# This is done via the following options: + +# (i) readline_parse_and_bind: this option can appear as many times as you +# want, each time defining a string to be executed via a +# readline.parse_and_bind() command. The syntax for valid commands of this +# kind can be found by reading the documentation for the GNU readline library, +# as these commands are of the kind which readline accepts in its +# configuration file. + +# The TAB key can be used to complete names at the command line in one of two +# ways: 'complete' and 'menu-complete'. The difference is that 'complete' only +# completes as much as possible while 'menu-complete' cycles through all +# possible completions. Leave the one you prefer uncommented. + +readline_parse_and_bind tab: complete +#readline_parse_and_bind tab: menu-complete + +# This binds Control-l to printing the list of all possible completions when +# there is more than one (what 'complete' does when hitting TAB twice, or at +# the first TAB if show-all-if-ambiguous is on) +readline_parse_and_bind "\C-l": possible-completions +# readline_parse_and_bind "\C-l": clear-screen + +# This forces readline to automatically print the above list when tab +# completion is set to 'complete'. You can still get this list manually by +# using the key bound to 'possible-completions' (Control-l by default) or by +# hitting TAB twice. Turning this on makes the printing happen at the first +# TAB. +readline_parse_and_bind set show-all-if-ambiguous on + +# If you have TAB set to complete names, you can rebind any key (Control-o by +# default) to insert a true TAB character. +readline_parse_and_bind "\C-o": tab-insert + +# These commands allow you to indent/unindent easily, with the 4-space +# convention of the Python coding standards. Since IPython's internal +# auto-indent system also uses 4 spaces, you should not change the number of +# spaces in the code below. +readline_parse_and_bind "\M-i": " " +readline_parse_and_bind "\M-o": "\d\d\d\d" +readline_parse_and_bind "\M-I": "\d\d\d\d" + +# Bindings for incremental searches in the history. These searches use the +# string typed so far on the command line and search anything in the previous +# input history containing them. +readline_parse_and_bind "\C-r": reverse-search-history +readline_parse_and_bind "\C-s": forward-search-history + +# Bindings for completing the current line in the history of previous +# commands. This allows you to recall any previous command by typing its first +# few letters and hitting Control-p, bypassing all intermediate commands which +# may be in the history (much faster than hitting up-arrow 50 times!) +readline_parse_and_bind "\C-p": history-search-backward +readline_parse_and_bind "\C-n": history-search-forward + +# I also like to have the same functionality on the plain arrow keys. If you'd +# rather have the arrows use all the history (and not just match what you've +# typed so far), comment out or delete the next two lines. +readline_parse_and_bind "\e[A": history-search-backward +readline_parse_and_bind "\e[B": history-search-forward + +# These are typically on by default under *nix, but not win32. +readline_parse_and_bind "\C-k": kill-line +readline_parse_and_bind "\C-u": unix-line-discard + +# (ii) readline_remove_delims: a string of characters to be removed from the +# default word-delimiters list used by readline, so that completions may be +# performed on strings which contain them. + +readline_remove_delims -/~ + +# (iii) readline_merge_completions: whether to merge the result of all +# possible completions or not. If true, IPython will complete filenames, +# python names and aliases and return all possible completions. If you set it +# to false, each completer is used at a time, and only if it doesn't return +# any completions is the next one used. + +# The default order is: [python_matches, file_matches, alias_matches] + +readline_merge_completions 1 + +# (iv) readline_omit__names: normally hitting after a '.' in a name +# will complete all attributes of an object, including all the special methods +# whose names start with single or double underscores (like __getitem__ or +# __class__). + +# This variable allows you to control this completion behavior: + +# readline_omit__names 1 -> completion will omit showing any names starting +# with two __, but it will still show names starting with one _. + +# readline_omit__names 2 -> completion will omit all names beginning with one +# _ (which obviously means filtering out the double __ ones). + +# Even when this option is set, you can still see those names by explicitly +# typing a _ after the period and hitting : 'name._' will always +# complete attribute names starting with '_'. + +# This option is off by default so that new users see all attributes of any +# objects they are dealing with. + +readline_omit__names 0 + +#--------------------------------------------------------------------------- +# Section: modules to be loaded with 'import ...' + +# List, separated by spaces, the names of the modules you want to import + +# Example: +# import_mod sys os +# will produce internally the statements +# import sys +# import os + +# Each import is executed in its own try/except block, so if one module +# fails to load the others will still be ok. + +import_mod + +# Load all the actual syntax extensions for shell-like operation, which live +# in the InterpreterExec standard extension. +import_all IPython.Extensions.InterpreterExec + +#--------------------------------------------------------------------------- +# Section: modules to import some functions from: 'from ... import ...' + +# List, one per line, the modules for which you want only to import some +# functions. Give the module name first and then the name of functions to be +# imported from that module. + +# Example: + +# import_some IPython.genutils timing timings +# will produce internally the statement +# from IPython.genutils import timing, timings + +# timing() and timings() are two IPython utilities for timing the execution of +# your own functions, which you may find useful. Just commment out the above +# line if you want to test them. + +# If you have more than one modules_some line, each gets its own try/except +# block (like modules, see above). + +import_some + +#--------------------------------------------------------------------------- +# Section: modules to import all from : 'from ... import *' + +# List (same syntax as import_mod above) those modules for which you want to +# import all functions. Remember, this is a potentially dangerous thing to do, +# since it is very easy to overwrite names of things you need. Use with +# caution. + +# Example: +# import_all sys os +# will produce internally the statements +# from sys import * +# from os import * + +# As before, each will be called in a separate try/except block. + +import_all + +#--------------------------------------------------------------------------- +# Section: Python code to execute. + +# Put here code to be explicitly executed (keep it simple!) +# Put one line of python code per line. All whitespace is removed (this is a +# feature, not a bug), so don't get fancy building loops here. +# This is just for quick convenient creation of things you want available. + +# Example: +# execute x = 1 +# execute print 'hello world'; y = z = 'a' +# will produce internally +# x = 1 +# print 'hello world'; y = z = 'a' +# and each *line* (not each statement, we don't do python syntax parsing) is +# executed in its own try/except block. + +execute + +# Note for the adventurous: you can use this to define your own names for the +# magic functions, by playing some namespace tricks: + +# execute __IPYTHON__.magic_pf = __IPYTHON__.magic_profile + +# defines %pf as a new name for %profile. + +#--------------------------------------------------------------------------- +# Section: Pyhton files to load and execute. + +# Put here the full names of files you want executed with execfile(file). If +# you want complicated initialization, just write whatever you want in a +# regular python file and load it from here. + +# Filenames defined here (which *must* include the extension) are searched for +# through all of sys.path. Since IPython adds your .ipython directory to +# sys.path, they can also be placed in your .ipython dir and will be +# found. Otherwise (if you want to execute things not in .ipyton nor in +# sys.path) give a full path (you can use ~, it gets expanded) + +# Example: +# execfile file1.py ~/file2.py +# will generate +# execfile('file1.py') +# execfile('_path_to_your_home/file2.py') + +# As before, each file gets its own try/except block. + +execfile + +# If you are feeling adventurous, you can even add functionality to IPython +# through here. IPython works through a global variable called __ip which +# exists at the time when these files are read. If you know what you are doing +# (read the source) you can add functions to __ip in files loaded here. + +# The file example-magic.py contains a simple but correct example. Try it: + +# execfile example-magic.py + +# Look at the examples in IPython/iplib.py for more details on how these magic +# functions need to process their arguments. + +#--------------------------------------------------------------------------- +# Section: aliases for system shell commands + +# Here you can define your own names for system commands. The syntax is +# similar to that of the builtin %alias function: + +# alias alias_name command_string + +# The resulting aliases are auto-generated magic functions (hence usable as +# %alias_name) + +# For example: + +# alias myls ls -la + +# will define 'myls' as an alias for executing the system command 'ls -la'. +# This allows you to customize IPython's environment to have the same aliases +# you are accustomed to from your own shell. + +# You can also define aliases with parameters using %s specifiers (one per +# parameter): + +# alias parts echo first %s second %s + +# will give you in IPython: +# >>> %parts A B +# first A second B + +# Use one 'alias' statement per alias you wish to define. + +# alias + +#************************* end of file ************************ -- 2.1.4 From 485c20d992931f32b8a3ae210fff31c0fbb620cb Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 28 May 2007 13:57:02 +0200 Subject: [PATCH 10/16] /etc/skel/.xinitrc: support $XKEYMODEL --- debian/changelog | 6 ++++++ etc/skel/.xinitrc | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index fd5051f..9c784ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +grml-etc (1.0.7) unstable; urgency=low + + * /etc/skel/.xinitrc: support $XKEYMODEL + + -- Michael Prokop Mon, 28 May 2007 13:56:38 +0200 + grml-etc (1.0.6) unstable; urgency=low * Add /etc/skel/.ipython/ipythonrc - configuration file diff --git a/etc/skel/.xinitrc b/etc/skel/.xinitrc index 669521a..a0ed5fe 100755 --- a/etc/skel/.xinitrc +++ b/etc/skel/.xinitrc @@ -48,7 +48,11 @@ if [ $XKEYBOARD == "us" ] ; then [ -r $HOME/.Xmodmap ] && xmodmap $HOME/.Xmodmap else - setxkbmap "$XKEYBOARD" + if [ -n "$XKEYMODEL" ] ; then + setxkbmap -model "$XKEYMODEL" -layout "$XKEYBOARD" + else + setxkbmap "$XKEYBOARD" + fi fi # mouse for lefty: -- 2.1.4 From 364c03c2008a5a35217b9265bd922fcb11440295 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 28 May 2007 13:58:25 +0200 Subject: [PATCH 11/16] remove shebang line from /etc/skel/.ipython/ipythonrc --- etc/skel/.ipython/ipythonrc | 1 - 1 file changed, 1 deletion(-) diff --git a/etc/skel/.ipython/ipythonrc b/etc/skel/.ipython/ipythonrc index 08affe5..873be55 100644 --- a/etc/skel/.ipython/ipythonrc +++ b/etc/skel/.ipython/ipythonrc @@ -1,4 +1,3 @@ -#!/bin/sh # Filename: i$HOME/.ipython/ipythonrc # Purpose: configuration file for ipython # Authors: grml-team (grml.org), (c) Michael Prokop -- 2.1.4 From af828395d8e2526c826759fa1a68e58b11d076c5 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 28 May 2007 13:59:14 +0200 Subject: [PATCH 12/16] Added tag 1.0.7 for changeset 7caaae7e42ea --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 26646c6..702b080 100644 --- a/.hgtags +++ b/.hgtags @@ -37,3 +37,4 @@ a9302389f6d6082a88937fcf34479a44854d7686 1.0.2 61b93dfc9f519fcac84839f82f8ee4e1bb043087 1.0.3 3290e7ce41f4b37ffbed8047910dc44399b89f43 1.0.4 a22d1d13db76ec3bd1dd3fcb7b038df25e8bf40c 1.0.5 +7caaae7e42ea1ac58975972e3693680c8a4a7a6e 1.0.7 -- 2.1.4 From c7b59f63dacb4da9edcab7ff89ec92fe71c4d753 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 4 Jun 2007 23:22:58 +0200 Subject: [PATCH 13/16] Adding /etc/skel/.channels/channels.conf-AT-vienna --- debian/changelog | 6 ++++++ etc/skel/.channels/channels.conf-AT-vienna | 14 ++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 etc/skel/.channels/channels.conf-AT-vienna diff --git a/debian/changelog b/debian/changelog index 9c784ed..bfb634e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +grml-etc (1.0.8) unstable; urgency=low + + * Adding /etc/skel/.channels/channels.conf-AT-vienna. + + -- Michael Prokop Sun, 03 Jun 2007 23:49:09 +0200 + grml-etc (1.0.7) unstable; urgency=low * /etc/skel/.xinitrc: support $XKEYMODEL diff --git a/etc/skel/.channels/channels.conf-AT-vienna b/etc/skel/.channels/channels.conf-AT-vienna new file mode 100644 index 0000000..4089208 --- /dev/null +++ b/etc/skel/.channels/channels.conf-AT-vienna @@ -0,0 +1,14 @@ +# Filename: channels.conf-AT-vienna +# Purpose: channel configuration file for DVB-T in Vienna/Austria. +# Authors: grml-team (grml.org), (c) Michael Prokop +# Bug-Reports: see http://grml.org/bugs/ +# License: This file is licensed under the GPL v2. +# Latest change: Son Jun 03 23:48:52 CEST 2007 [mika] +################################################################################ +# Usage example: 'ln -s ~/.channels/channels.conf-AT-vienna ~/.mplayer/channels.conf' +################################################################################ +ORF1:794000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_3_4:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:1010:1011:10101 +ORF2 W:794000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_3_4:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:1020:1021:10102 +ATV:794000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_3_4:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:1040:1041:10120 +ORF2 N:794000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_3_4:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:1020:1021:10122 +## END OF FILE ################################################################# -- 2.1.4 From 92137a1a25f0fdb54244007b732f733a58884ff3 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 4 Jun 2007 23:24:13 +0200 Subject: [PATCH 14/16] Added /etc/skel/.Xmodmap.neo --- debian/changelog | 3 + etc/skel/.Xmodmap.neo | 153 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 156 insertions(+) create mode 100644 etc/skel/.Xmodmap.neo diff --git a/debian/changelog b/debian/changelog index bfb634e..ea755ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ grml-etc (1.0.8) unstable; urgency=low * Adding /etc/skel/.channels/channels.conf-AT-vienna. + * Added /etc/skel/.Xmodmap.neo (see + http://pebbles.schattenlauf.de/layout.php for details). + [Closes: issue218] -- Michael Prokop Sun, 03 Jun 2007 23:49:09 +0200 diff --git a/etc/skel/.Xmodmap.neo b/etc/skel/.Xmodmap.neo new file mode 100644 index 0000000..64ef468 --- /dev/null +++ b/etc/skel/.Xmodmap.neo @@ -0,0 +1,153 @@ +!! ~/.xmodmap +!! +!! created by Benjamin Kellermann +!! and Erik Streb +!! +!! The german NEO Layout Version 1.9.6 +!! see http://pebbles.schattenlauf.de/layout.php for details +!! +!! To try the layout in this file, simply do xmodmap . +!! To load the layout in this file at X startup, simply store it as +!! ~/.xmodmap (named .xmodmap in your home directory) + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +! The first row (number Row) +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!eigentlich sollte die folgende Zeile rein, aber auf älteren Systemen ist der +!dead_stroke noch nicht definiert +!keycode 49 = dead_circumflex dead_caron dead_breve dead_stroke +keycode 49 = dead_circumflex dead_caron dead_breve + +keycode 10 = 1 degree 1 onequarter oneeighth +keycode 11 = 2 paragraph 2 onehalf +keycode 12 = 3 section 3 threequarters threeeighths +keycode 13 = 4 dollar yen cent Prior Prior +keycode 14 = 5 EuroSign sterling currency fiveeighths implies +keycode 15 = 6 ordfeminine ae AE 6 ifonlyif + +keycode 16 = 7 masculine oe OE seveneighths +keycode 17 = 8 doublelowquotemark singlelowquotemark guillemotright slash U2203 +keycode 18 = 9 leftdoublequotemark leftsinglequotemark guillemotleft asterisk U2200 +keycode 19 = 0 rightdoublequotemark rightsinglequotemark U203A minus notsign + +keycode 20 = minus endash emdash U2039 minus logicalor +keycode 21 = dead_acute dead_grave dead_cedilla dead_ogonek dead_abovedot dead_abovering + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +! The upper row +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +keycode 24 = x X at Greek_xi x Greek_XI +keycode 25 = v V underscore v BackSpace U039B +keycode 26 = l L bracketleft Greek_lambda Up Up +keycode 27 = c C bracketright Greek_chi Tab Tab +keycode 28 = w W asciicircum w Insert + +keycode 29 = k K exclam Greek_kappa exclamdown copyright +keycode 30 = h H less Greek_psi 7 Greek_PSI +keycode 31 = g G greater Greek_gamma 8 Greek_GAMMA +keycode 32 = f F equal Greek_phi 9 Greek_PHI +keycode 33 = q Q ampersand q plus logicaland +keycode 34 = ssharp ssharp U133 U132 schwa SCHWA +keycode 35 = dead_tilde dead_macron dead_diaeresis dead_doubleacute dead_belowdot dead_belowdot + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +! The home row (middle row) +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +keycode 38 = u U backslash backslash Home Home +keycode 39 = i I slash Greek_iota Left Left +keycode 40 = a A braceleft Greek_alpha Down Down +keycode 41 = e E braceright Greek_epsilon Right Right +keycode 42 = o O asterisk Greek_omega End End + +keycode 43 = s S question Greek_sigma questiondown Greek_SIGMA +keycode 44 = n N parenleft Greek_nu 4 numerosign +keycode 45 = r R parenright Greek_rho 5 registered +keycode 46 = t T minus Greek_tau 6 trademark +keycode 47 = d D colon Greek_delta comma Greek_DELTA +keycode 48 = y Y y Greek_upsilon thorn THORN + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +! The lower row +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +keycode 52 = odiaeresis Odiaeresis numbersign odiaeresis Escape +keycode 53 = udiaeresis Udiaeresis dollar udiaeresis Delete integral +keycode 54 = adiaeresis Adiaeresis bar Greek_eta Next Next +keycode 55 = p P asciitilde Greek_pi Return Greek_PI +keycode 56 = z Z grave Greek_zeta z Greek_OMEGA + +keycode 57 = b B plus Greek_beta infinity enfilledcircbullet +keycode 58 = m M percent mu 1 +keycode 59 = comma apostrophe apostrophe U3D1 2 radical +keycode 60 = period ellipsis quotedbl Greek_theta 3 Greek_THETA +keycode 61 = j J semicolon j period nabla + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +! Modifier definition +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +! Make CapsLock an additional Alt_Gr (Mode_switch is for 3rd and 4th level) +remove Lock = Caps_Lock +remove Mod3 = ISO_Level3_Shift +keycode 66 = Mode_switch Mode_switch Caps_Lock Caps_Lock + +! Make AltGr and apostrophe to Mode_switch (which is the 3rd and 4th level) +keycode 113 = ISO_Level3_Shift ISO_Level3_Shift ISO_Level3_Shift ISO_Level3_Shift KP_Decimal +!keycode 48 = Mode_switch Mode_switch U133 U132 schwa SCHWA +add Mod5 = Mode_switch + +! If the left win key should modify the 5th and 6th, comment this out +!keycode 115 = ISO_Level3_Shift +! the right win key modifies the 5th and 6th +!keycode 116 = ISO_Level3_Shift + +! Make the former qwertz-# and qwertz-< to Mod5 (ISO_Level3_Shift) +keycode 51 = Mode_switch Mode_switch +keycode 94 = ISO_Level3_Shift ISO_Level3_Shift +add Mod3 = ISO_Level3_Shift + +! force to learn the new Escape! +!keycode 9 = + +keycode 65 = space space space nobreakspace 0 U202F + + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +! Keypad +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +! The uppest row +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +!keycode 77 = Num_Lock Pointer_EnableKeys +keycode 112 = KP_Divide KP_Divide division U2215 +keycode 63 = KP_Multiply KP_Multiply multiply U22C5 +keycode 82 = KP_Subtract KP_Subtract U2212 + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +! The upper row +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +keycode 79 = KP_Home KP_7 KP_7 U226A +keycode 80 = KP_Up KP_8 uparrow U2229 +keycode 81 = KP_Prior KP_9 KP_9 U226B +keycode 86 = KP_Add KP_Add plusminus U2213 + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +! The middle row +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +keycode 83 = KP_Left KP_4 leftarrow U2282 +keycode 84 = KP_Begin KP_5 dagger U220A +keycode 85 = KP_Right KP_6 rightarrow U2283 + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +! The lower row +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +keycode 87 = KP_End KP_1 KP_1 U2264 +keycode 88 = KP_Down KP_2 downarrow U222A +keycode 89 = KP_Next KP_3 KP_3 U2265 +keycode 108 = KP_Enter KP_Enter notequal U2248 +!keysym KP_Equal + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +! The lowest row +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +keycode 90 = KP_Insert KP_0 percent U2030 +keycode 91 = KP_Delete KP_Decimal period comma -- 2.1.4 From 85d40c22fec46d99e415fa2d514792e9d4abab12 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 4 Jun 2007 23:24:50 +0200 Subject: [PATCH 15/16] Added tag 1.0.8 for changeset de42c27c56a3 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 702b080..e287b08 100644 --- a/.hgtags +++ b/.hgtags @@ -38,3 +38,4 @@ a9302389f6d6082a88937fcf34479a44854d7686 1.0.2 3290e7ce41f4b37ffbed8047910dc44399b89f43 1.0.4 a22d1d13db76ec3bd1dd3fcb7b038df25e8bf40c 1.0.5 7caaae7e42ea1ac58975972e3693680c8a4a7a6e 1.0.7 +de42c27c56a350ada69749fb612fdb2ff0604ade 1.0.8 -- 2.1.4 From 0991fd358c727286d2568e548aa4fb426cb0ea02 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 4 Jun 2007 23:33:17 +0200 Subject: [PATCH 16/16] /etc/init.d/grml-reboot: sync devices before deactivating pcmcia --- debian/changelog | 8 ++++++++ etc/init.d/grml-reboot | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ea755ed..f8db84a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +grml-etc (1.0.9) unstable; urgency=low + + * /etc/init.d/grml-reboot: sync devices before deactivating + pcmcia system devices. Thanks for the bugreport, Josef Teske! + [Closes: issue219] + + -- Michael Prokop Mon, 04 Jun 2007 23:32:18 +0200 + grml-etc (1.0.8) unstable; urgency=low * Adding /etc/skel/.channels/channels.conf-AT-vienna. diff --git a/etc/init.d/grml-reboot b/etc/init.d/grml-reboot index 990736b..882246c 100755 --- a/etc/init.d/grml-reboot +++ b/etc/init.d/grml-reboot @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Klaus Knopper, (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Sam Mär 31 14:02:06 CEST 2007 [mika] +# Latest change: Mon Jun 04 23:32:07 CEST 2007 [mika] ################################################################################ export PATH=/sbin:/bin:/usr/bin:/usr/sbin @@ -55,6 +55,9 @@ echo "0" > /proc/sys/kernel/printk # We may kill our network connection here before unmounting NFS. Bad luck. # poweroff pcmcia devices if [ -d /sys/bus/pcmcia -a -x /sbin/pccardctl ] ; then + # make sure we don't lose any data, see issue219 for details + log_begin_msg "Syncing devices..." + sync ; log_end_msg $? log_begin_msg "Shutting down PCMCIA devices..." pccardctl eject >/dev/null 2>&1 log_end_msg $? -- 2.1.4