Attachment 107128 Details for Bug 147838 – file.diff

[patch] file.diff

file.diff (text/plain), 49.82 KB, created by Chris Petrik on 2010-06-13 19:50:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Petrik

Created: 2010-06-13 19:50:07 UTC

Size: 49.82 KB

patch

obsolete

>Index: audio/csound/Makefile
>===================================================================
>RCS file: /usr/local/freebsdcvs/ports/audio/csound/Makefile,v
>retrieving revision 1.52
>diff -u -r1.52 Makefile
>--- audio/csound/Makefile	31 May 2010 01:57:23 -0000	1.52
>+++ audio/csound/Makefile	13 Jun 2010 18:35:02 -0000
>@@ -17,7 +17,7 @@
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:src
> DIST_SUBDIR=	csound
> 
>-MAINTAINER=	chris@officialunix.com
>+MAINTAINER=	ports@freebsd.org
> COMMENT=	Sound synthesizer
> 
> LIB_DEPENDS=	sndfile:${PORTSDIR}/audio/libsndfile
>Index: audio/smasher/Makefile
>===================================================================
>RCS file: /usr/local/freebsdcvs/ports/audio/smasher/Makefile,v
>retrieving revision 1.12
>diff -u -r1.12 Makefile
>--- audio/smasher/Makefile	28 Mar 2010 06:31:20 -0000	1.12
>+++ audio/smasher/Makefile	13 Jun 2010 18:35:31 -0000
>@@ -12,7 +12,7 @@
> MASTER_SITES=	SF
> DISTNAME=	${PORTNAME}-${PORTVERSION}-source
> 
>-MAINTAINER=	chris@officialunix.com
>+MAINTAINER=	ports@freebsd.org
> COMMENT=	Cross platform audio loop slicer
> 
> LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile \
>Index: editors/diakonos/Makefile
>===================================================================
>RCS file: /usr/local/freebsdcvs/ports/editors/diakonos/Makefile,v
>retrieving revision 1.6
>diff -u -r1.6 Makefile
>--- editors/diakonos/Makefile	13 Mar 2010 20:11:02 -0000	1.6
>+++ editors/diakonos/Makefile	13 Jun 2010 18:38:10 -0000
>@@ -11,7 +11,7 @@
> MASTER_SITES=	http://purepistos.net/diakonos/ \
> 		http://distfiles.officialunix.com/
> 
>-MAINTAINER=	chris@officialunix.com
>+MAINTAINER=	ports@freebsd.org
> COMMENT=	A Linux editor for the masses
> 
> USE_RUBY=	yes
>Index: emulators/fceux/Makefile
>===================================================================
>RCS file: /usr/local/freebsdcvs/ports/emulators/fceux/Makefile,v
>retrieving revision 1.38
>diff -u -r1.38 Makefile
>--- emulators/fceux/Makefile	4 May 2010 11:39:21 -0000	1.38
>+++ emulators/fceux/Makefile	13 Jun 2010 18:38:50 -0000
>@@ -11,7 +11,7 @@
> MASTER_SITES=	SF/fceultra/Source%20Code/${PORTVERSION}%20src/
> DISTNAME=	${PORTNAME}-${PORTVERSION}.src
> 
>-MAINTAINER=	chris@officialunix.com
>+MAINTAINER=	ports@freebsd.org
> COMMENT=	A portable NES/Famicom emulator based on Bero's original FCE
> 
> USE_BZIP2=	yes
>Index: games/doom/Makefile
>===================================================================
>RCS file: /usr/local/freebsdcvs/ports/games/doom/Makefile,v
>retrieving revision 1.42
>diff -u -r1.42 Makefile
>--- games/doom/Makefile	13 Mar 2010 20:12:16 -0000	1.42
>+++ games/doom/Makefile	13 Jun 2010 18:44:05 -0000
>@@ -12,7 +12,7 @@
> MASTER_SITES=	${MASTER_SITE_IDSOFTWARE:S|$|source/|}
> DISTNAME=	doomsrc
> 
>-MAINTAINER=	chris@officialunix.com
>+MAINTAINER=	ports@freebsd.org
> COMMENT=	DOOM: the game and the sound server
> 
> NO_CDROM=	requested by IDsoftware
>Index: games/etuxracer/Makefile
>===================================================================
>RCS file: /usr/local/freebsdcvs/ports/games/etuxracer/Makefile,v
>retrieving revision 1.39
>diff -u -r1.39 Makefile
>--- games/etuxracer/Makefile	13 May 2010 09:23:41 -0000	1.39
>+++ games/etuxracer/Makefile	13 Jun 2010 18:44:34 -0000
>@@ -12,7 +12,7 @@
> MASTER_SITES=	SF/extremetuxracer/extreme-tuxracer/${PORTVERSION}/
> DISTNAME=	extremetuxracer-${PORTVERSION}
> 
>-MAINTAINER=	chris@officialunix.com
>+MAINTAINER=	ports@freebsd.org
> COMMENT=	A 3d penguin racing game using OpenGL
> 
> LIB_DEPENDS=	tcl85:${PORTSDIR}/lang/tcl85 \
>Index: games/tuxracer/Makefile
>===================================================================
>RCS file: /usr/local/freebsdcvs/ports/games/tuxracer/Makefile,v
>retrieving revision 1.38
>diff -u -r1.38 Makefile
>--- games/tuxracer/Makefile	13 Mar 2010 20:12:16 -0000	1.38
>+++ games/tuxracer/Makefile	13 Jun 2010 18:44:51 -0000
>@@ -13,7 +13,7 @@
> DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz \
> 		${PORTNAME}-data-${PORTVERSION}.tar.gz
> 
>-MAINTAINER=	chris@officialunix.com
>+MAINTAINER=	ports@freebsd.org
> COMMENT=	A 3d penguin racing game using OpenGL
> 
> LIB_DEPENDS=	tcl85:${PORTSDIR}/lang/tcl85
>Index: irc/kvirc/Makefile
>===================================================================
>RCS file: /usr/local/freebsdcvs/ports/irc/kvirc/Makefile,v
>retrieving revision 1.70
>diff -u -r1.70 Makefile
>--- irc/kvirc/Makefile	31 May 2010 01:59:26 -0000	1.70
>+++ irc/kvirc/Makefile	13 Jun 2010 18:45:11 -0000
>@@ -15,7 +15,7 @@
> 		LOCAL/beech
> MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTVERSION}/source
> 
>-MAINTAINER=	chris@officialunix.com
>+MAINTAINER=	ports@freebsd.org
> COMMENT=	IRC client for QT and KDE
> 
> USE_AUTOTOOLS=	libtool:22
>Index: irc/kvirc-devel/Makefile
>===================================================================
>RCS file: /usr/local/freebsdcvs/ports/irc/kvirc-devel/Makefile,v
>retrieving revision 1.68
>diff -u -r1.68 Makefile
>--- irc/kvirc-devel/Makefile	31 May 2010 01:59:26 -0000	1.68
>+++ irc/kvirc-devel/Makefile	13 Jun 2010 18:45:34 -0000
>@@ -13,7 +13,7 @@
> 		http://distfiles.officialunix.com/
> PKGNAMESUFFIX=	-devel
> 
>-MAINTAINER=	chris@officialunix.com
>+MAINTAINER=	ports@freebsd.org
> COMMENT=	IRC client for QT4 and KDE4
> 
> USE_BZIP2=	yes
>Index: print/hplip/Makefile
>===================================================================
>RCS file: /usr/local/freebsdcvs/ports/print/hplip/Makefile,v
>retrieving revision 1.35
>diff -u -r1.35 Makefile
>--- print/hplip/Makefile	2 Jun 2010 19:14:14 -0000	1.35
>+++ print/hplip/Makefile	13 Jun 2010 18:46:00 -0000
>@@ -2,16 +2,20 @@
> # Date created:		1 April 2006
> # Whom:			amistry@am-productions.biz
> #
>+<<<<<<< Makefile
>+# $FreeBSD: ports/print/hplip/Makefile,v 1.32 2010/05/17 13:16:56 pav Exp $
>+=======
> # $FreeBSD: ports/print/hplip/Makefile,v 1.35 2010/06/02 19:14:14 sylvio Exp $
>+>>>>>>> 1.35
> #
> 
> PORTNAME=	hplip
> PORTVERSION=	3.10.5
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	print
> MASTER_SITES=	SF
> 
>-MAINTAINER=	chris@officialunix.com
>+MAINTAINER=	ports@freebsd.org
> COMMENT=	Drivers and utilities for HP Printers and All-in-One devices
> 
> LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
>@@ -19,7 +23,6 @@
> 		cupsdriver.1:${PORTSDIR}/print/cups-base \
> 		cups.2:${PORTSDIR}/print/cups-client \
> 		cupsimage.2:${PORTSDIR}/print/cups-image
>-		
> RUN_DEPENDS=	${PYTHON_SITELIBDIR}/reportlab/__init__.py:${PORTSDIR}/print/py-reportlab2 \
> 		espgs:${PORTSDIR}/print/cups-pstoraster \
> 		foomatic-rip:${PORTSDIR}/print/foomatic-filters \
>@@ -33,14 +36,16 @@
> 		--disable-pp-build \
> 		--enable-foomatic-ppd-install \
> 		--enable-foomatic-rip-hplip-install \
>+		--enable-foomatic-drv-install \
> 		--enable-hpijs-install \
>-		--with-icondir=${LOCALBASE}/share/applications \
>+		--with-icondir=${DESKTOPDIR} \
> 		--with-cupsbackenddir=${LOCALBASE}/libexec/cups/backend \
> 		--with-cupsfilterdir=${LOCALBASE}/libexec/cups/filter \
> 		--with-drvdir=${LOCALBASE}/libexec/cups/driver \
> 		--with-hpppddir=${LOCALBASE}/share/ppd/HP \
> 		--with-mimedir=${LOCALBASE}/etc/cups \
>-		--with-docdir=${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
>+		--with-docdir=${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} \
>+		--with-systraydir=${LOCALBASE}/etc/xdg/autostart
> 
> USE_LDCONFIG=	yes
> USE_GHOSTSCRIPT_RUN=	yes
>@@ -60,7 +65,10 @@
> OPTIONS=	QT "Build QT4 gui" off \
> 		DBUS "D-Bus support (required for fax tools)" off \
> 		XSANE "Scanning support via XSane" off \
>-		SNMP "Support for Simple Network Management Protocol" off
>+		NETBUILD "Enable network build (SNMP)" off \
>+		SCAN "Enable scanning support and programs" off \
>+		POLICYKIT "Enable policykit support" off \
>+		PPBUILD "Enable parallel port build" off
> 
> .include <bsd.port.options.mk>
> 
>@@ -68,16 +76,22 @@
> LIB_DEPENDS+=	usb:${PORTSDIR}/devel/libusb
> .endif
> 
>-.if defined(WITH_SNMP) && (${ARCH} == i386)
>+.if defined(WITH_NETBUILD) && (${ARCH} == i386)
> BROKEN=	can't link with libsnmp, net-mgmt/net-snmp should be fixed first
> .endif
> 
> .if !defined(WITHOUT_QT)
> USE_QT_VER=	4
> QT_COMPONENTS=	gui
>-CONFIGURE_ARGS+=	--enable-qt4
>+CONFIGURE_ARGS+=	--enable-qt4 \
>+			--enable-gui-build
> RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui
> LIB_DEPENDS+=	pyglib-2.0:${PORTSDIR}/devel/py-gobject
>+PLIST_SUB+=	GUI=""
>+.else
>+CONFIGURE_ARGS+=	--disable-qt4 \
>+			--disable-gui-build
>+PLIST_SUB+=	GUI="@comment "
> .endif
> 
> .if !defined(WITHOUT_DBUS)
>@@ -98,13 +112,44 @@
> RUN_DEPENDS+=	xsane:${PORTSDIR}/graphics/xsane
> .endif
> 
>+<<<<<<< Makefile
>+.if defined(WITH_NETBUILD)
>+LIB_DEPENDS+=	netsnmp.16:${PORTSDIR}/net-mgmt/net-snmp
>+=======
> .if defined(WITH_SNMP)
> LIB_DEPENDS+=	netsnmp.20:${PORTSDIR}/net-mgmt/net-snmp
>+>>>>>>> 1.35
> CONFIGURE_ARGS+=	--enable-network-build
> .else
> CONFIGURE_ARGS+=	--disable-network-build
> .endif
> 
>+.if !defined(WITHOUT_SCAN)
>+CONFIGURE_ARGS+=	--enable-scan-build
>+PLIST_SUB+=	SCN=""
>+.else
>+CONFIGURE_ARGS+=	--disable-scan-build
>+PLIST_SUB+=	SCN="@comment "
>+.endif
>+
>+.if !defined(WITHOUT_POLICYKIT)
>+LIB_DEPENDS+=	polkit.2:${PORTSDIR}/sysutils/policykit
>+CONFIGURE_ARGS+=	--enable-policykit
>+.else
>+CONFIGURE_ARGS+=	--disable-policykit
>+.endif
>+
>+.if defined(WITH_POLICYKIT) && defined(WITH_QT)
>+LIB_DEPENDS+=	polkit-qt-core.0:${PORTSDIR}/sysutils/policykit-qt
>+CONFIGURE_ARGS+=	--enable-policykit
>+.else
>+CONFIGURE_ARGS+=	--disable-policykit
>+.endif
>+
>+.if defined(WITH_PPBUILD)
>+IGNORE=	no ppdev.h file, this will be fixed once I have the time
>+.endif
>+
> .if defined(NOPORTDOCS)
> CONFIGURE_ARGS+=	--enable-doc-build=no
> .endif
>Index: print/hplip/pkg-plist
>===================================================================
>RCS file: /usr/local/freebsdcvs/ports/print/hplip/pkg-plist,v
>retrieving revision 1.13
>diff -u -r1.13 pkg-plist
>--- print/hplip/pkg-plist	17 May 2010 13:07:38 -0000	1.13
>+++ print/hplip/pkg-plist	2 Jun 2010 00:27:52 -0000
>@@ -25,7 +25,7 @@
> bin/hp-systray
> bin/hp-testpage
> bin/hp-timedate
>-bin/hp-toolbox
>+%%SCN%%bin/hp-toolbox
> bin/hp-unload
> bin/hp-wificonfig
> bin/hpijs
>@@ -48,11 +48,11 @@
> %%PYTHON_SITELIBDIR%%/hpmudext.so
> %%PYTHON_SITELIBDIR%%/pcardext.la
> %%PYTHON_SITELIBDIR%%/pcardext.so
>-%%PYTHON_SITELIBDIR%%/scanext.la
>-%%PYTHON_SITELIBDIR%%/scanext.so
>-lib/sane/libsane-hpaio.la
>-lib/sane/libsane-hpaio.so
>-lib/sane/libsane-hpaio.so.1
>+%%SCN%%%%PYTHON_SITELIBDIR%%/scanext.la
>+%%SCN%%%%PYTHON_SITELIBDIR%%/scanext.so
>+%%SCN%%lib/sane/libsane-hpaio.la
>+%%SCN%%lib/sane/libsane-hpaio.so
>+%%SCN%%lib/sane/libsane-hpaio.so.1
> libexec/cups/filter/hpcac
> libexec/cups/filter/hpcups
> %%FAX%%libexec/cups/filter/hpcupsfax
>@@ -128,319 +128,319 @@
> %%DATADIR%%/colorcal.py
> %%DATADIR%%/copier/__init__.py
> %%DATADIR%%/copier/copier.py
>-%%DATADIR%%/data/images/128x128/audio.png
>-%%DATADIR%%/data/images/128x128/bmp.png
>-%%DATADIR%%/data/images/128x128/gif.png
>-%%DATADIR%%/data/images/128x128/hp_logo.png
>-%%DATADIR%%/data/images/128x128/jpg.png
>-%%DATADIR%%/data/images/128x128/movie.png
>-%%DATADIR%%/data/images/128x128/mpg.png
>-%%DATADIR%%/data/images/128x128/png.png
>-%%DATADIR%%/data/images/128x128/tif.png
>-%%DATADIR%%/data/images/128x128/unknown.png
>-%%DATADIR%%/data/images/16x16/active.png
>-%%DATADIR%%/data/images/16x16/add_user.png
>-%%DATADIR%%/data/images/16x16/add_user_quick.png
>-%%DATADIR%%/data/images/16x16/add_users.png
>-%%DATADIR%%/data/images/16x16/battery.png
>-%%DATADIR%%/data/images/16x16/busy.png
>-%%DATADIR%%/data/images/16x16/cancel.png
>-%%DATADIR%%/data/images/16x16/close.png
>-%%DATADIR%%/data/images/16x16/down.png
>-%%DATADIR%%/data/images/16x16/down_user.png
>-%%DATADIR%%/data/images/16x16/download.png
>-%%DATADIR%%/data/images/16x16/edit.png
>-%%DATADIR%%/data/images/16x16/error.png
>-%%DATADIR%%/data/images/16x16/fab.png
>-%%DATADIR%%/data/images/16x16/fax.png
>-%%DATADIR%%/data/images/16x16/folder_open.png
>-%%DATADIR%%/data/images/16x16/folder_remove.png
>-%%DATADIR%%/data/images/16x16/help.png
>-%%DATADIR%%/data/images/16x16/hp_logo.png
>-%%DATADIR%%/data/images/16x16/idle.png
>-%%DATADIR%%/data/images/16x16/info.png
>-%%DATADIR%%/data/images/16x16/inkdrop.png
>-%%DATADIR%%/data/images/16x16/list_add.png
>-%%DATADIR%%/data/images/16x16/list_remove.png
>-%%DATADIR%%/data/images/16x16/makecopies.png
>-%%DATADIR%%/data/images/16x16/mimetypes.png
>-%%DATADIR%%/data/images/16x16/minus.png
>-%%DATADIR%%/data/images/16x16/next.png
>-%%DATADIR%%/data/images/16x16/ok.png
>-%%DATADIR%%/data/images/16x16/paper.png
>-%%DATADIR%%/data/images/16x16/pcard.png
>-%%DATADIR%%/data/images/16x16/plus.png
>-%%DATADIR%%/data/images/16x16/prev.png
>-%%DATADIR%%/data/images/16x16/print.png
>-%%DATADIR%%/data/images/16x16/quit.png
>-%%DATADIR%%/data/images/16x16/refresh.png
>-%%DATADIR%%/data/images/16x16/refresh1.png
>-%%DATADIR%%/data/images/16x16/remove_user.png
>-%%DATADIR%%/data/images/16x16/scan.png
>-%%DATADIR%%/data/images/16x16/settings.png
>-%%DATADIR%%/data/images/16x16/status_refresh.png
>-%%DATADIR%%/data/images/16x16/thumbnail.png
>-%%DATADIR%%/data/images/16x16/toner.png
>-%%DATADIR%%/data/images/16x16/up.png
>-%%DATADIR%%/data/images/16x16/up_user.png
>-%%DATADIR%%/data/images/16x16/warning.png
>-%%DATADIR%%/data/images/24x24/add_to_group.png
>-%%DATADIR%%/data/images/24x24/new_group.png
>-%%DATADIR%%/data/images/24x24/new_group_from_selection.png
>-%%DATADIR%%/data/images/24x24/new_user.png
>-%%DATADIR%%/data/images/24x24/remove_from_group.png
>-%%DATADIR%%/data/images/24x24/remove_group.png
>-%%DATADIR%%/data/images/24x24/remove_user.png
>-%%DATADIR%%/data/images/24x24/rename_group.png
>-%%DATADIR%%/data/images/256x256/hp_logo.png
>-%%DATADIR%%/data/images/32x32/align.png
>-%%DATADIR%%/data/images/32x32/battery.png
>-%%DATADIR%%/data/images/32x32/busy.png
>-%%DATADIR%%/data/images/32x32/clean.png
>-%%DATADIR%%/data/images/32x32/colorcal.png
>-%%DATADIR%%/data/images/32x32/cups.png
>-%%DATADIR%%/data/images/32x32/download.png
>-%%DATADIR%%/data/images/32x32/error.png
>-%%DATADIR%%/data/images/32x32/ews.png
>-%%DATADIR%%/data/images/32x32/fab.png
>-%%DATADIR%%/data/images/32x32/fax-disabled.png
>-%%DATADIR%%/data/images/32x32/fax.png
>-%%DATADIR%%/data/images/32x32/fax_machine.png
>-%%DATADIR%%/data/images/32x32/fax_setup.png
>-%%DATADIR%%/data/images/32x32/firmware.png
>-%%DATADIR%%/data/images/32x32/help.png
>-%%DATADIR%%/data/images/32x32/hp_logo.png
>-%%DATADIR%%/data/images/32x32/idle.png
>-%%DATADIR%%/data/images/32x32/info.png
>-%%DATADIR%%/data/images/32x32/inkdrop.png
>-%%DATADIR%%/data/images/32x32/keys.png
>-%%DATADIR%%/data/images/32x32/linefeed_cal.png
>-%%DATADIR%%/data/images/32x32/lock.png
>-%%DATADIR%%/data/images/32x32/lporg.png
>-%%DATADIR%%/data/images/32x32/makecopies-disabled.png
>-%%DATADIR%%/data/images/32x32/makecopies.png
>-%%DATADIR%%/data/images/32x32/ok.png
>-%%DATADIR%%/data/images/32x32/paper.png
>-%%DATADIR%%/data/images/32x32/pcard-disabled.png
>-%%DATADIR%%/data/images/32x32/pcard.png
>-%%DATADIR%%/data/images/32x32/plugin.png
>-%%DATADIR%%/data/images/32x32/pq_diag.png
>-%%DATADIR%%/data/images/32x32/print-disabled.png
>-%%DATADIR%%/data/images/32x32/print.png
>-%%DATADIR%%/data/images/32x32/scan-disabled.png
>-%%DATADIR%%/data/images/32x32/scan.png
>-%%DATADIR%%/data/images/32x32/settings.png
>-%%DATADIR%%/data/images/32x32/testpage.png
>-%%DATADIR%%/data/images/32x32/toner.png
>-%%DATADIR%%/data/images/32x32/toner_cartridge.png
>-%%DATADIR%%/data/images/32x32/warning.png
>-%%DATADIR%%/data/images/32x32/wireless.png
>-%%DATADIR%%/data/images/64x64/hp_logo.png
>-%%DATADIR%%/data/images/256x256/logo.png
>-%%DATADIR%%/data/images/devices/120.png
>-%%DATADIR%%/data/images/devices/COLOR_INKJET_PRINTER_CP1700.png
>-%%DATADIR%%/data/images/devices/CP_1700.png
>-%%DATADIR%%/data/images/devices/DESKJET_1120C.png
>-%%DATADIR%%/data/images/devices/DESKJET_1220C.png
>-%%DATADIR%%/data/images/devices/DESKJET_2500C.png
>-%%DATADIR%%/data/images/devices/DESKJET_3820.png
>-%%DATADIR%%/data/images/devices/DESKJET_5740.png
>-%%DATADIR%%/data/images/devices/DESKJET_610.png
>-%%DATADIR%%/data/images/devices/DESKJET_630C.png
>-%%DATADIR%%/data/images/devices/DESKJET_650C.png
>-%%DATADIR%%/data/images/devices/DESKJET_840C.png
>-%%DATADIR%%/data/images/devices/DESKJET_916C.png
>-%%DATADIR%%/data/images/devices/DESKJET_9600.png
>-%%DATADIR%%/data/images/devices/DESKJET_960C.png
>-%%DATADIR%%/data/images/devices/DESKJET_970C.png
>-%%DATADIR%%/data/images/devices/DESKJET_990C.png
>-%%DATADIR%%/data/images/devices/DESKJET_995C.png
>-%%DATADIR%%/data/images/devices/Deskjet_3740.png
>-%%DATADIR%%/data/images/devices/Deskjet_5400_series.png
>-%%DATADIR%%/data/images/devices/Deskjet_5700.png
>-%%DATADIR%%/data/images/devices/Deskjet_5900_series.png
>-%%DATADIR%%/data/images/devices/Deskjet_6500.png
>-%%DATADIR%%/data/images/devices/Deskjet_6800.png
>-%%DATADIR%%/data/images/devices/HP_2000C.png
>-%%DATADIR%%/data/images/devices/HP_2500C.png
>-%%DATADIR%%/data/images/devices/HP_BI_3000.png
>-%%DATADIR%%/data/images/devices/HP_Business_Inkjet_1200.png
>-%%DATADIR%%/data/images/devices/HP_Color_LaserJet_1500.png
>-%%DATADIR%%/data/images/devices/HP_Color_LaserJet_2840.png
>-%%DATADIR%%/data/images/devices/HP_Color_LaserJet_4500.png
>-%%DATADIR%%/data/images/devices/HP_Color_LaserJet_4730mfp.png
>-%%DATADIR%%/data/images/devices/HP_Color_LaserJet_8550.png
>-%%DATADIR%%/data/images/devices/HP_LJ1xxx.png
>-%%DATADIR%%/data/images/devices/HP_LaserJet_1012.png
>-%%DATADIR%%/data/images/devices/HP_LaserJet_1220.png
>-%%DATADIR%%/data/images/devices/HP_LaserJet_3200M.png
>-%%DATADIR%%/data/images/devices/HP_LaserJet_3300_3310_3320.png
>-%%DATADIR%%/data/images/devices/HP_LaserJet_4000.png
>-%%DATADIR%%/data/images/devices/HP_LaserJet_4100_MFP.png
>-%%DATADIR%%/data/images/devices/HP_LaserJet_4M.png
>-%%DATADIR%%/data/images/devices/HP_LaserJet_5Si.png
>-%%DATADIR%%/data/images/devices/HP_LaserJet_6MP.png
>-%%DATADIR%%/data/images/devices/HP_LaserJet_8100_Series.png
>-%%DATADIR%%/data/images/devices/HP_LaserJet_9000_MFP.png
>-%%DATADIR%%/data/images/devices/HP_LaserJet_9040_MFP.png
>-%%DATADIR%%/data/images/devices/HP_LaserJet_9500dn.png
>-%%DATADIR%%/data/images/devices/HP_LaserJet_m1005.png
>-%%DATADIR%%/data/images/devices/HP_LaserJet_m1522.png
>-%%DATADIR%%/data/images/devices/HP_Officejet_Pro_L7700.png
>-%%DATADIR%%/data/images/devices/LASERJET_3500.png
>-%%DATADIR%%/data/images/devices/LASERJET_4650.png
>-%%DATADIR%%/data/images/devices/LASERJET_4650dtn.png
>-%%DATADIR%%/data/images/devices/LASERJET_5500.png
>-%%DATADIR%%/data/images/devices/LASERJET_5500dtn.png
>-%%DATADIR%%/data/images/devices/LASERJET_5550.png
>-%%DATADIR%%/data/images/devices/LASERJET_5550DTN.png
>-%%DATADIR%%/data/images/devices/OFFICEJET_PRO_1150C.png
>-%%DATADIR%%/data/images/devices/OfficeJet_5105.png
>-%%DATADIR%%/data/images/devices/OfficeJet_6100_Series.png
>-%%DATADIR%%/data/images/devices/OfficeJet_G85.png
>-%%DATADIR%%/data/images/devices/OfficeJet_Series_300.png
>-%%DATADIR%%/data/images/devices/Officejet_6150_Series.png
>-%%DATADIR%%/data/images/devices/Officejet_6200_series.png
>-%%DATADIR%%/data/images/devices/Officejet_7200_series.png
>-%%DATADIR%%/data/images/devices/Officejet_9100_series.png
>-%%DATADIR%%/data/images/devices/PHOTOSMART_100.png
>-%%DATADIR%%/data/images/devices/PHOTOSMART_1218.png
>-%%DATADIR%%/data/images/devices/PHOTOSMART_1315.png
>-%%DATADIR%%/data/images/devices/PHOTOSMART_P1100.png
>-%%DATADIR%%/data/images/devices/PSC_900_Series.png
>-%%DATADIR%%/data/images/devices/Photosmart_2600_series.png
>-%%DATADIR%%/data/images/devices/Photosmart_2700_series.png
>-%%DATADIR%%/data/images/devices/Photosmart_3300_series.png
>-%%DATADIR%%/data/images/devices/Photosmart_370_series.png
>-%%DATADIR%%/data/images/devices/Photosmart_7400_series.png
>-%%DATADIR%%/data/images/devices/Photosmart_8050.png
>-%%DATADIR%%/data/images/devices/Photosmart_8100_series.png
>-%%DATADIR%%/data/images/devices/Photosmart_8250.png
>-%%DATADIR%%/data/images/devices/Photosmart_8400_series.png
>-%%DATADIR%%/data/images/devices/Photosmart_8750_series.png
>-%%DATADIR%%/data/images/devices/Photosmart_C3100.png
>-%%DATADIR%%/data/images/devices/Photosmart_C4100.png
>-%%DATADIR%%/data/images/devices/Photosmart_C5100.png
>-%%DATADIR%%/data/images/devices/Photosmart_C6100.png
>-%%DATADIR%%/data/images/devices/Photosmart_D5060.png
>-%%DATADIR%%/data/images/devices/Photosmart_D5100.png
>-%%DATADIR%%/data/images/devices/Photosmart_D6160.png
>-%%DATADIR%%/data/images/devices/Photosmart_D7100.png
>-%%DATADIR%%/data/images/devices/Photosmart_D7300.png
>-%%DATADIR%%/data/images/devices/Photosmart_Pro_B8300.png
>-%%DATADIR%%/data/images/devices/Photosmart_Pro_B9180.png
>-%%DATADIR%%/data/images/devices/Photosmart_a310.png
>-%%DATADIR%%/data/images/devices/Photosmart_a510.png
>-%%DATADIR%%/data/images/devices/Photosmart_a710.png
>-%%DATADIR%%/data/images/devices/cp1160.png
>-%%DATADIR%%/data/images/devices/default_business_inkjet.png
>-%%DATADIR%%/data/images/devices/default_designjet.png
>-%%DATADIR%%/data/images/devices/default_deskjet.png
>-%%DATADIR%%/data/images/devices/default_laserjet.png
>-%%DATADIR%%/data/images/devices/default_officejet.png
>-%%DATADIR%%/data/images/devices/default_photosmart.png
>-%%DATADIR%%/data/images/devices/default_printer.png
>-%%DATADIR%%/data/images/devices/default_psc.png
>-%%DATADIR%%/data/images/devices/desket_5650.png
>-%%DATADIR%%/data/images/devices/deskjet_1280.png
>-%%DATADIR%%/data/images/devices/deskjet_3200.png
>-%%DATADIR%%/data/images/devices/deskjet_3320.png
>-%%DATADIR%%/data/images/devices/deskjet_3325.png
>-%%DATADIR%%/data/images/devices/deskjet_3420.png
>-%%DATADIR%%/data/images/devices/deskjet_3425.png
>-%%DATADIR%%/data/images/devices/deskjet_3500.png
>-%%DATADIR%%/data/images/devices/deskjet_3600.png
>-%%DATADIR%%/data/images/devices/deskjet_3840.png
>-%%DATADIR%%/data/images/devices/deskjet_5100.png
>-%%DATADIR%%/data/images/devices/deskjet_5550.png
>-%%DATADIR%%/data/images/devices/deskjet_5552.png
>-%%DATADIR%%/data/images/devices/deskjet_5600.png
>-%%DATADIR%%/data/images/devices/deskjet_6120.png
>-%%DATADIR%%/data/images/devices/deskjet_6980.png
>-%%DATADIR%%/data/images/devices/deskjet_D2360.png
>-%%DATADIR%%/data/images/devices/dj350.png
>-%%DATADIR%%/data/images/devices/dj450.png
>-%%DATADIR%%/data/images/devices/hp_LaserJet_1200.png
>-%%DATADIR%%/data/images/devices/hp_LaserJet_2100.png
>-%%DATADIR%%/data/images/devices/hp_LaserJet_3015.png
>-%%DATADIR%%/data/images/devices/hp_LaserJet_3020.png
>-%%DATADIR%%/data/images/devices/hp_LaserJet_4345_mfp.png
>-%%DATADIR%%/data/images/devices/hp_LaserJet_5000.png
>-%%DATADIR%%/data/images/devices/hp_LaserJet_8000.png
>-%%DATADIR%%/data/images/devices/hp_business_inkjet_1100.png
>-%%DATADIR%%/data/images/devices/hp_business_inkjet_2200.png
>-%%DATADIR%%/data/images/devices/hp_business_inkjet_2600.png
>-%%DATADIR%%/data/images/devices/hp_business_inkjet_3000.png
>-%%DATADIR%%/data/images/devices/hp_color_LaserJet_2550.png
>-%%DATADIR%%/data/images/devices/hp_color_LaserJet_3700.png
>-%%DATADIR%%/data/images/devices/hp_color_LaserJet_4600.png
>-%%DATADIR%%/data/images/devices/hp_color_LaserJet_9500.png
>-%%DATADIR%%/data/images/devices/hp_color_laserjet_cm1015_mfp.png
>-%%DATADIR%%/data/images/devices/hp_color_laserjet_cm1312_mfp.png
>-%%DATADIR%%/data/images/devices/hp_color_laserjet_cp2025.png
>-%%DATADIR%%/data/images/devices/hp_color_laserjet_cp3505.png
>-%%DATADIR%%/data/images/devices/hp_color_laserjet_cp3525.png
>-%%DATADIR%%/data/images/devices/hp_color_laserjet_cp4005.png
>-%%DATADIR%%/data/images/devices/hp_color_laserjet_cp6015.png
>-%%DATADIR%%/data/images/devices/hp_deskjet_9300.png
>-%%DATADIR%%/data/images/devices/hp_deskjet_f4200.png
>-%%DATADIR%%/data/images/devices/hp_laserjet_3050.png
>-%%DATADIR%%/data/images/devices/hp_laserjet_m2727_mfp.png
>-%%DATADIR%%/data/images/devices/hp_laserjet_p2015.png
>-%%DATADIR%%/data/images/devices/hp_photosmart_b8500_series.png
>-%%DATADIR%%/data/images/devices/laserjet_2410.png
>-%%DATADIR%%/data/images/devices/officejet_4200_series.png
>-%%DATADIR%%/data/images/devices/officejet_500.png
>-%%DATADIR%%/data/images/devices/officejet_5500_series.png
>-%%DATADIR%%/data/images/devices/officejet_5600.png
>-%%DATADIR%%/data/images/devices/officejet_j3600_series.png
>-%%DATADIR%%/data/images/devices/officejet_j5500_series.png
>-%%DATADIR%%/data/images/devices/officejet_k550.png
>-%%DATADIR%%/data/images/devices/officejet_k80.png
>-%%DATADIR%%/data/images/devices/photosmart_7150.png
>-%%DATADIR%%/data/images/devices/photosmart_7900_series.png
>-%%DATADIR%%/data/images/devices/photosmart_a610.png
>-%%DATADIR%%/data/images/devices/photosmart_a820_series.png
>-%%DATADIR%%/data/images/devices/psc_1100_series.png
>-%%DATADIR%%/data/images/devices/psc_1610.png
>-%%DATADIR%%/data/images/devices/psc_2300_series.png
>-%%DATADIR%%/data/images/other/aio_align.png
>-%%DATADIR%%/data/images/other/align10.png
>-%%DATADIR%%/data/images/other/clean.png
>-%%DATADIR%%/data/images/other/color_adj.png
>-%%DATADIR%%/data/images/other/confidential_coverpage.png
>-%%DATADIR%%/data/images/other/confidential_title.png
>-%%DATADIR%%/data/images/other/fax.png
>-%%DATADIR%%/data/images/other/fax2.png
>-%%DATADIR%%/data/images/other/generic_coverpage.png
>-%%DATADIR%%/data/images/other/generic_title.png
>-%%DATADIR%%/data/images/other/h-kc-2.png
>-%%DATADIR%%/data/images/other/h-kc-3.png
>-%%DATADIR%%/data/images/other/hp-tux-printer.png
>-%%DATADIR%%/data/images/other/load_paper.png
>-%%DATADIR%%/data/images/other/opensource-75x65.png
>-%%DATADIR%%/data/images/other/panel_lcd.png
>-%%DATADIR%%/data/images/other/pens.png
>-%%DATADIR%%/data/images/other/powered_by_python.png
>-%%DATADIR%%/data/images/other/signal0.png
>-%%DATADIR%%/data/images/other/signal1.png
>-%%DATADIR%%/data/images/other/signal2.png
>-%%DATADIR%%/data/images/other/signal3.png
>-%%DATADIR%%/data/images/other/signal4.png
>-%%DATADIR%%/data/images/other/signal5.png
>-%%DATADIR%%/data/images/other/standard_coverpage.png
>-%%DATADIR%%/data/images/other/type4_color_patch.png
>-%%DATADIR%%/data/images/other/type4_gray_patch.png
>-%%DATADIR%%/data/images/other/urgent_coverpage.png
>-%%DATADIR%%/data/images/other/urgent_title.png
>-%%DATADIR%%/data/images/other/usb_connection.png
>-%%DATADIR%%/data/images/other/v-c-2.png
>-%%DATADIR%%/data/images/other/v-c-3.png
>-%%DATADIR%%/data/images/other/v-k-2.png
>-%%DATADIR%%/data/images/other/v-k-3.png
>-%%DATADIR%%/data/images/other/v-kc-2.png
>-%%DATADIR%%/data/images/other/v-kc-3.png
>-%%DATADIR%%/data/images/other/zca.png
>+%%SCN%%%%DATADIR%%/data/images/128x128/audio.png
>+%%SCN%%%%DATADIR%%/data/images/128x128/bmp.png
>+%%SCN%%%%DATADIR%%/data/images/128x128/gif.png
>+%%SCN%%%%DATADIR%%/data/images/128x128/hp_logo.png
>+%%SCN%%%%DATADIR%%/data/images/128x128/jpg.png
>+%%SCN%%%%DATADIR%%/data/images/128x128/movie.png
>+%%SCN%%%%DATADIR%%/data/images/128x128/mpg.png
>+%%SCN%%%%DATADIR%%/data/images/128x128/png.png
>+%%SCN%%%%DATADIR%%/data/images/128x128/tif.png
>+%%SCN%%%%DATADIR%%/data/images/128x128/unknown.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/active.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/add_user.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/add_user_quick.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/add_users.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/battery.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/busy.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/cancel.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/close.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/down.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/down_user.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/download.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/edit.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/error.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/fab.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/fax.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/folder_open.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/folder_remove.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/help.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/hp_logo.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/idle.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/info.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/inkdrop.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/list_add.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/list_remove.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/makecopies.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/mimetypes.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/minus.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/next.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/ok.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/paper.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/pcard.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/plus.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/prev.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/print.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/quit.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/refresh.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/refresh1.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/remove_user.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/scan.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/settings.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/status_refresh.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/thumbnail.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/toner.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/up.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/up_user.png
>+%%SCN%%%%DATADIR%%/data/images/16x16/warning.png
>+%%SCN%%%%DATADIR%%/data/images/24x24/add_to_group.png
>+%%SCN%%%%DATADIR%%/data/images/24x24/new_group.png
>+%%SCN%%%%DATADIR%%/data/images/24x24/new_group_from_selection.png
>+%%SCN%%%%DATADIR%%/data/images/24x24/new_user.png
>+%%SCN%%%%DATADIR%%/data/images/24x24/remove_from_group.png
>+%%SCN%%%%DATADIR%%/data/images/24x24/remove_group.png
>+%%SCN%%%%DATADIR%%/data/images/24x24/remove_user.png
>+%%SCN%%%%DATADIR%%/data/images/24x24/rename_group.png
>+%%SCN%%%%DATADIR%%/data/images/256x256/hp_logo.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/align.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/battery.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/busy.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/clean.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/colorcal.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/cups.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/download.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/error.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/ews.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/fab.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/fax-disabled.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/fax.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/fax_machine.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/fax_setup.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/firmware.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/help.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/hp_logo.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/idle.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/info.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/inkdrop.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/keys.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/linefeed_cal.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/lock.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/lporg.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/makecopies-disabled.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/makecopies.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/ok.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/paper.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/pcard-disabled.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/pcard.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/plugin.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/pq_diag.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/print-disabled.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/print.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/scan-disabled.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/scan.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/settings.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/testpage.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/toner.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/toner_cartridge.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/warning.png
>+%%SCN%%%%DATADIR%%/data/images/32x32/wireless.png
>+%%SCN%%%%DATADIR%%/data/images/64x64/hp_logo.png
>+%%SCN%%%%DATADIR%%/data/images/256x256/logo.png
>+%%GUI%%%%DATADIR%%/data/images/devices/120.png
>+%%GUI%%%%DATADIR%%/data/images/devices/COLOR_INKJET_PRINTER_CP1700.png
>+%%GUI%%%%DATADIR%%/data/images/devices/CP_1700.png
>+%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_1120C.png
>+%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_1220C.png
>+%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_2500C.png
>+%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_3820.png
>+%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_5740.png
>+%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_610.png
>+%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_630C.png
>+%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_650C.png
>+%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_840C.png
>+%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_916C.png
>+%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_9600.png
>+%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_960C.png
>+%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_970C.png
>+%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_990C.png
>+%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_995C.png
>+%%GUI%%%%DATADIR%%/data/images/devices/Deskjet_3740.png
>+%%GUI%%%%DATADIR%%/data/images/devices/Deskjet_5400_series.png
>+%%GUI%%%%DATADIR%%/data/images/devices/Deskjet_5700.png
>+%%GUI%%%%DATADIR%%/data/images/devices/Deskjet_5900_series.png
>+%%GUI%%%%DATADIR%%/data/images/devices/Deskjet_6500.png
>+%%GUI%%%%DATADIR%%/data/images/devices/Deskjet_6800.png
>+%%GUI%%%%DATADIR%%/data/images/devices/HP_2000C.png
>+%%GUI%%%%DATADIR%%/data/images/devices/HP_2500C.png
>+%%GUI%%%%DATADIR%%/data/images/devices/HP_BI_3000.png
>+%%GUI%%%%DATADIR%%/data/images/devices/HP_Business_Inkjet_1200.png
>+%%GUI%%%%DATADIR%%/data/images/devices/HP_Color_LaserJet_1500.png
>+%%GUI%%%%DATADIR%%/data/images/devices/HP_Color_LaserJet_2840.png
>+%%GUI%%%%DATADIR%%/data/images/devices/HP_Color_LaserJet_4500.png
>+%%GUI%%%%DATADIR%%/data/images/devices/HP_Color_LaserJet_4730mfp.png
>+%%GUI%%%%DATADIR%%/data/images/devices/HP_Color_LaserJet_8550.png
>+%%GUI%%%%DATADIR%%/data/images/devices/HP_LJ1xxx.png
>+%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_1012.png
>+%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_1220.png
>+%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_3200M.png
>+%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_3300_3310_3320.png
>+%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_4000.png
>+%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_4100_MFP.png
>+%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_4M.png
>+%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_5Si.png
>+%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_6MP.png
>+%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_8100_Series.png
>+%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_9000_MFP.png
>+%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_9040_MFP.png
>+%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_9500dn.png
>+%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_m1005.png
>+%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_m1522.png
>+%%GUI%%%%DATADIR%%/data/images/devices/HP_Officejet_Pro_L7700.png
>+%%GUI%%%%DATADIR%%/data/images/devices/LASERJET_3500.png
>+%%GUI%%%%DATADIR%%/data/images/devices/LASERJET_4650.png
>+%%GUI%%%%DATADIR%%/data/images/devices/LASERJET_4650dtn.png
>+%%GUI%%%%DATADIR%%/data/images/devices/LASERJET_5500.png
>+%%GUI%%%%DATADIR%%/data/images/devices/LASERJET_5500dtn.png
>+%%GUI%%%%DATADIR%%/data/images/devices/LASERJET_5550.png
>+%%GUI%%%%DATADIR%%/data/images/devices/LASERJET_5550DTN.png
>+%%GUI%%%%DATADIR%%/data/images/devices/OFFICEJET_PRO_1150C.png
>+%%GUI%%%%DATADIR%%/data/images/devices/OfficeJet_5105.png
>+%%GUI%%%%DATADIR%%/data/images/devices/OfficeJet_6100_Series.png
>+%%GUI%%%%DATADIR%%/data/images/devices/OfficeJet_G85.png
>+%%GUI%%%%DATADIR%%/data/images/devices/OfficeJet_Series_300.png
>+%%GUI%%%%DATADIR%%/data/images/devices/Officejet_6150_Series.png
>+%%GUI%%%%DATADIR%%/data/images/devices/Officejet_6200_series.png
>+%%GUI%%%%DATADIR%%/data/images/devices/Officejet_7200_series.png
>+%%GUI%%%%DATADIR%%/data/images/devices/Officejet_9100_series.png
>+%%GUI%%%%DATADIR%%/data/images/devices/PHOTOSMART_100.png
>+%%GUI%%%%DATADIR%%/data/images/devices/PHOTOSMART_1218.png
>+%%GUI%%%%DATADIR%%/data/images/devices/PHOTOSMART_1315.png
>+%%GUI%%%%DATADIR%%/data/images/devices/PHOTOSMART_P1100.png
>+%%GUI%%%%DATADIR%%/data/images/devices/PSC_900_Series.png
>+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_2600_series.png
>+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_2700_series.png
>+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_3300_series.png
>+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_370_series.png
>+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_7400_series.png
>+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_8050.png
>+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_8100_series.png
>+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_8250.png
>+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_8400_series.png
>+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_8750_series.png
>+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_C3100.png
>+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_C4100.png
>+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_C5100.png
>+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_C6100.png
>+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_D5060.png
>+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_D5100.png
>+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_D6160.png
>+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_D7100.png
>+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_D7300.png
>+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_Pro_B8300.png
>+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_Pro_B9180.png
>+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_a310.png
>+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_a510.png
>+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_a710.png
>+%%GUI%%%%DATADIR%%/data/images/devices/cp1160.png
>+%%GUI%%%%DATADIR%%/data/images/devices/default_business_inkjet.png
>+%%GUI%%%%DATADIR%%/data/images/devices/default_designjet.png
>+%%GUI%%%%DATADIR%%/data/images/devices/default_deskjet.png
>+%%GUI%%%%DATADIR%%/data/images/devices/default_laserjet.png
>+%%GUI%%%%DATADIR%%/data/images/devices/default_officejet.png
>+%%GUI%%%%DATADIR%%/data/images/devices/default_photosmart.png
>+%%GUI%%%%DATADIR%%/data/images/devices/default_printer.png
>+%%GUI%%%%DATADIR%%/data/images/devices/default_psc.png
>+%%GUI%%%%DATADIR%%/data/images/devices/desket_5650.png
>+%%GUI%%%%DATADIR%%/data/images/devices/deskjet_1280.png
>+%%GUI%%%%DATADIR%%/data/images/devices/deskjet_3200.png
>+%%GUI%%%%DATADIR%%/data/images/devices/deskjet_3320.png
>+%%GUI%%%%DATADIR%%/data/images/devices/deskjet_3325.png
>+%%GUI%%%%DATADIR%%/data/images/devices/deskjet_3420.png
>+%%GUI%%%%DATADIR%%/data/images/devices/deskjet_3425.png
>+%%GUI%%%%DATADIR%%/data/images/devices/deskjet_3500.png
>+%%GUI%%%%DATADIR%%/data/images/devices/deskjet_3600.png
>+%%GUI%%%%DATADIR%%/data/images/devices/deskjet_3840.png
>+%%GUI%%%%DATADIR%%/data/images/devices/deskjet_5100.png
>+%%GUI%%%%DATADIR%%/data/images/devices/deskjet_5550.png
>+%%GUI%%%%DATADIR%%/data/images/devices/deskjet_5552.png
>+%%GUI%%%%DATADIR%%/data/images/devices/deskjet_5600.png
>+%%GUI%%%%DATADIR%%/data/images/devices/deskjet_6120.png
>+%%GUI%%%%DATADIR%%/data/images/devices/deskjet_6980.png
>+%%GUI%%%%DATADIR%%/data/images/devices/deskjet_D2360.png
>+%%GUI%%%%DATADIR%%/data/images/devices/dj350.png
>+%%GUI%%%%DATADIR%%/data/images/devices/dj450.png
>+%%GUI%%%%DATADIR%%/data/images/devices/hp_LaserJet_1200.png
>+%%GUI%%%%DATADIR%%/data/images/devices/hp_LaserJet_2100.png
>+%%GUI%%%%DATADIR%%/data/images/devices/hp_LaserJet_3015.png
>+%%GUI%%%%DATADIR%%/data/images/devices/hp_LaserJet_3020.png
>+%%GUI%%%%DATADIR%%/data/images/devices/hp_LaserJet_4345_mfp.png
>+%%GUI%%%%DATADIR%%/data/images/devices/hp_LaserJet_5000.png
>+%%GUI%%%%DATADIR%%/data/images/devices/hp_LaserJet_8000.png
>+%%GUI%%%%DATADIR%%/data/images/devices/hp_business_inkjet_1100.png
>+%%GUI%%%%DATADIR%%/data/images/devices/hp_business_inkjet_2200.png
>+%%GUI%%%%DATADIR%%/data/images/devices/hp_business_inkjet_2600.png
>+%%GUI%%%%DATADIR%%/data/images/devices/hp_business_inkjet_3000.png
>+%%GUI%%%%DATADIR%%/data/images/devices/hp_color_LaserJet_2550.png
>+%%GUI%%%%DATADIR%%/data/images/devices/hp_color_LaserJet_3700.png
>+%%GUI%%%%DATADIR%%/data/images/devices/hp_color_LaserJet_4600.png
>+%%GUI%%%%DATADIR%%/data/images/devices/hp_color_LaserJet_9500.png
>+%%GUI%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cm1015_mfp.png
>+%%GUI%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cm1312_mfp.png
>+%%GUI%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cp2025.png
>+%%GUI%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cp3505.png
>+%%GUI%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cp3525.png
>+%%GUI%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cp4005.png
>+%%GUI%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cp6015.png
>+%%GUI%%%%DATADIR%%/data/images/devices/hp_deskjet_9300.png
>+%%GUI%%%%DATADIR%%/data/images/devices/hp_deskjet_f4200.png
>+%%GUI%%%%DATADIR%%/data/images/devices/hp_laserjet_3050.png
>+%%GUI%%%%DATADIR%%/data/images/devices/hp_laserjet_m2727_mfp.png
>+%%GUI%%%%DATADIR%%/data/images/devices/hp_laserjet_p2015.png
>+%%GUI%%%%DATADIR%%/data/images/devices/hp_photosmart_b8500_series.png
>+%%GUI%%%%DATADIR%%/data/images/devices/laserjet_2410.png
>+%%GUI%%%%DATADIR%%/data/images/devices/officejet_4200_series.png
>+%%GUI%%%%DATADIR%%/data/images/devices/officejet_500.png
>+%%GUI%%%%DATADIR%%/data/images/devices/officejet_5500_series.png
>+%%GUI%%%%DATADIR%%/data/images/devices/officejet_5600.png
>+%%GUI%%%%DATADIR%%/data/images/devices/officejet_j3600_series.png
>+%%GUI%%%%DATADIR%%/data/images/devices/officejet_j5500_series.png
>+%%GUI%%%%DATADIR%%/data/images/devices/officejet_k550.png
>+%%GUI%%%%DATADIR%%/data/images/devices/officejet_k80.png
>+%%GUI%%%%DATADIR%%/data/images/devices/photosmart_7150.png
>+%%GUI%%%%DATADIR%%/data/images/devices/photosmart_7900_series.png
>+%%GUI%%%%DATADIR%%/data/images/devices/photosmart_a610.png
>+%%GUI%%%%DATADIR%%/data/images/devices/photosmart_a820_series.png
>+%%GUI%%%%DATADIR%%/data/images/devices/psc_1100_series.png
>+%%GUI%%%%DATADIR%%/data/images/devices/psc_1610.png
>+%%GUI%%%%DATADIR%%/data/images/devices/psc_2300_series.png
>+%%GUI%%%%DATADIR%%/data/images/other/aio_align.png
>+%%GUI%%%%DATADIR%%/data/images/other/align10.png
>+%%GUI%%%%DATADIR%%/data/images/other/clean.png
>+%%GUI%%%%DATADIR%%/data/images/other/color_adj.png
>+%%GUI%%%%DATADIR%%/data/images/other/confidential_coverpage.png
>+%%GUI%%%%DATADIR%%/data/images/other/confidential_title.png
>+%%GUI%%%%DATADIR%%/data/images/other/fax.png
>+%%GUI%%%%DATADIR%%/data/images/other/fax2.png
>+%%GUI%%%%DATADIR%%/data/images/other/generic_coverpage.png
>+%%GUI%%%%DATADIR%%/data/images/other/generic_title.png
>+%%GUI%%%%DATADIR%%/data/images/other/h-kc-2.png
>+%%GUI%%%%DATADIR%%/data/images/other/h-kc-3.png
>+%%GUI%%%%DATADIR%%/data/images/other/hp-tux-printer.png
>+%%GUI%%%%DATADIR%%/data/images/other/load_paper.png
>+%%GUI%%%%DATADIR%%/data/images/other/opensource-75x65.png
>+%%GUI%%%%DATADIR%%/data/images/other/panel_lcd.png
>+%%GUI%%%%DATADIR%%/data/images/other/pens.png
>+%%GUI%%%%DATADIR%%/data/images/other/powered_by_python.png
>+%%GUI%%%%DATADIR%%/data/images/other/signal0.png
>+%%GUI%%%%DATADIR%%/data/images/other/signal1.png
>+%%GUI%%%%DATADIR%%/data/images/other/signal2.png
>+%%GUI%%%%DATADIR%%/data/images/other/signal3.png
>+%%GUI%%%%DATADIR%%/data/images/other/signal4.png
>+%%GUI%%%%DATADIR%%/data/images/other/signal5.png
>+%%GUI%%%%DATADIR%%/data/images/other/standard_coverpage.png
>+%%GUI%%%%DATADIR%%/data/images/other/type4_color_patch.png
>+%%GUI%%%%DATADIR%%/data/images/other/type4_gray_patch.png
>+%%GUI%%%%DATADIR%%/data/images/other/urgent_coverpage.png
>+%%GUI%%%%DATADIR%%/data/images/other/urgent_title.png
>+%%GUI%%%%DATADIR%%/data/images/other/usb_connection.png
>+%%GUI%%%%DATADIR%%/data/images/other/v-c-2.png
>+%%GUI%%%%DATADIR%%/data/images/other/v-c-3.png
>+%%GUI%%%%DATADIR%%/data/images/other/v-k-2.png
>+%%GUI%%%%DATADIR%%/data/images/other/v-k-3.png
>+%%GUI%%%%DATADIR%%/data/images/other/v-kc-2.png
>+%%GUI%%%%DATADIR%%/data/images/other/v-kc-3.png
>+%%GUI%%%%DATADIR%%/data/images/other/zca.png
> %%DATADIR%%/data/ldl/cb2pcal.ldl.gz
> %%DATADIR%%/data/ldl/cb2pcal_done.ldl.gz
> %%DATADIR%%/data/ldl/cbbcal.ldl.gz
>@@ -515,76 +515,76 @@
> %%DATADIR%%/prnt/pcl.py
> %%DATADIR%%/probe.py
> %%DATADIR%%/query.py
>-%%DATADIR%%/scan.py
>-%%DATADIR%%/scan/__init__.py
>-%%DATADIR%%/scan/sane.py
>+%%SCN%%%%DATADIR%%/scan.py
>+%%SCN%%%%DATADIR%%/scan/__init__.py
>+%%SCN%%%%DATADIR%%/scan/sane.py
> %%DATADIR%%/sendfax.py
> %%DATADIR%%/setup.py
> %%DATADIR%%/systray.py
> %%DATADIR%%/testpage.py
> %%DATADIR%%/timedate.py
> %%DATADIR%%/toolbox.py
>-%%DATADIR%%/ui4/__init__.py
>-%%DATADIR%%/ui4/aboutdialog.py
>-%%DATADIR%%/ui4/aboutdialog_base.py
>-%%DATADIR%%/ui4/aligndialog.py
>-%%DATADIR%%/ui4/aligndialog_base.py
>-%%DATADIR%%/ui4/cleandialog.py
>-%%DATADIR%%/ui4/cleandialog_base.py
>-%%DATADIR%%/ui4/colorcaldialog.py
>-%%DATADIR%%/ui4/colorcaldialog_base.py
>-%%DATADIR%%/ui4/devicesetupdialog.py
>-%%DATADIR%%/ui4/devicesetupdialog_base.py
>-%%DATADIR%%/ui4/deviceuricombobox.py
>-%%DATADIR%%/ui4/devmgr5.py
>-%%DATADIR%%/ui4/devmgr5_base.py
>-%%DATADIR%%/ui4/fabgrouptable.py
>-%%DATADIR%%/ui4/fabnametable.py
>-%%DATADIR%%/ui4/fabwindow.py
>-%%DATADIR%%/ui4/fabwindow_base.py
>-%%DATADIR%%/ui4/faxsetupdialog.py
>-%%DATADIR%%/ui4/faxsetupdialog_base.py
>-%%DATADIR%%/ui4/filetable.py
>-%%DATADIR%%/ui4/firmwaredialog.py
>-%%DATADIR%%/ui4/firmwaredialog_base.py
>-%%DATADIR%%/ui4/infodialog.py
>-%%DATADIR%%/ui4/infodialog_base.py
>-%%DATADIR%%/ui4/linefeedcaldialog.py
>-%%DATADIR%%/ui4/linefeedcaldialog_base.py
>-%%DATADIR%%/ui4/loadpapergroupbox.py
>-%%DATADIR%%/ui4/makecopiesdialog.py
>-%%DATADIR%%/ui4/makecopiesdialog_base.py
>-%%DATADIR%%/ui4/mimetypesdialog.py
>-%%DATADIR%%/ui4/mimetypesdialog_base.py
>-%%DATADIR%%/ui4/nodevicesdialog.py
>-%%DATADIR%%/ui4/nodevicesdialog_base.py
>-%%DATADIR%%/ui4/plugindialog.py
>-%%DATADIR%%/ui4/plugindialog_base.py
>-%%DATADIR%%/ui4/pluginlicensedialog.py
>-%%DATADIR%%/ui4/pluginlicensedialog_base.py
>-%%DATADIR%%/ui4/pqdiagdialog.py
>-%%DATADIR%%/ui4/pqdiagdialog_base.py
>-%%DATADIR%%/ui4/printdialog.py
>-%%DATADIR%%/ui4/printdialog_base.py
>-%%DATADIR%%/ui4/printernamecombobox.py
>-%%DATADIR%%/ui4/printsettingsdialog.py
>-%%DATADIR%%/ui4/printsettingsdialog_base.py
>-%%DATADIR%%/ui4/printsettingstoolbox.py
>-%%DATADIR%%/ui4/printtestpagedialog.py
>-%%DATADIR%%/ui4/printtestpagedialog_base.py
>-%%DATADIR%%/ui4/readonlyradiobutton.py
>-%%DATADIR%%/ui4/sendfaxdialog.py
>-%%DATADIR%%/ui4/sendfaxdialog_base.py
>-%%DATADIR%%/ui4/settingsdialog.py
>-%%DATADIR%%/ui4/settingsdialog_base.py
>-%%DATADIR%%/ui4/setupdialog.py
>-%%DATADIR%%/ui4/setupdialog_base.py
>-%%DATADIR%%/ui4/systemtray.py
>-%%DATADIR%%/ui4/systrayframe.py
>-%%DATADIR%%/ui4/systrayframe_base.py
>-%%DATADIR%%/ui4/ui_utils.py
>-%%DATADIR%%/ui4/wifisetupdialog.py
>-%%DATADIR%%/ui4/wifisetupdialog_base.py
>+%%GUI%%%%DATADIR/ui4/__init__.py
>+%%GUI%%%%DATADIR/ui4/aboutdialog.py
>+%%GUI%%%%DATADIR/ui4/aboutdialog_base.py
>+%%GUI%%%%DATADIR/ui4/aligndialog.py
>+%%GUI%%%%DATADIR/ui4/aligndialog_base.py
>+%%GUI%%%%DATADIR/ui4/cleandialog.py
>+%%GUI%%%%DATADIR/ui4/cleandialog_base.py
>+%%GUI%%%%DATADIR/ui4/colorcaldialog.py
>+%%GUI%%%%DATADIR/ui4/colorcaldialog_base.py
>+%%GUI%%%%DATADIR/ui4/devicesetupdialog.py
>+%%GUI%%%%DATADIR/ui4/devicesetupdialog_base.py
>+%%GUI%%%%DATADIR/ui4/deviceuricombobox.py
>+%%GUI%%%%DATADIR/ui4/devmgr5.py
>+%%GUI%%%%DATADIR/ui4/devmgr5_base.py
>+%%GUI%%%%DATADIR/ui4/fabgrouptable.py
>+%%GUI%%%%DATADIR/ui4/fabnametable.py
>+%%GUI%%%%DATADIR/ui4/fabwindow.py
>+%%GUI%%%%DATADIR/ui4/fabwindow_base.py
>+%%GUI%%%%DATADIR/ui4/faxsetupdialog.py
>+%%GUI%%%%DATADIR/ui4/faxsetupdialog_base.py
>+%%GUI%%%%DATADIR/ui4/filetable.py
>+%%GUI%%%%DATADIR/ui4/firmwaredialog.py
>+%%GUI%%%%DATADIR/ui4/firmwaredialog_base.py
>+%%GUI%%%%DATADIR/ui4/infodialog.py
>+%%GUI%%%%DATADIR/ui4/infodialog_base.py
>+%%GUI%%%%DATADIR/ui4/linefeedcaldialog.py
>+%%GUI%%%%DATADIR/ui4/linefeedcaldialog_base.py
>+%%GUI%%%%DATADIR/ui4/loadpapergroupbox.py
>+%%GUI%%%%DATADIR/ui4/makecopiesdialog.py
>+%%GUI%%%%DATADIR/ui4/makecopiesdialog_base.py
>+%%GUI%%%%DATADIR/ui4/mimetypesdialog.py
>+%%GUI%%%%DATADIR/ui4/mimetypesdialog_base.py
>+%%GUI%%%%DATADIR/ui4/nodevicesdialog.py
>+%%GUI%%%%DATADIR/ui4/nodevicesdialog_base.py
>+%%GUI%%%%DATADIR/ui4/plugindialog.py
>+%%GUI%%%%DATADIR/ui4/plugindialog_base.py
>+%%GUI%%%%DATADIR/ui4/pluginlicensedialog.py
>+%%GUI%%%%DATADIR/ui4/pluginlicensedialog_base.py
>+%%GUI%%%%DATADIR/ui4/pqdiagdialog.py
>+%%GUI%%%%DATADIR/ui4/pqdiagdialog_base.py
>+%%GUI%%%%DATADIR/ui4/printdialog.py
>+%%GUI%%%%DATADIR/ui4/printdialog_base.py
>+%%GUI%%%%DATADIR/ui4/printernamecombobox.py
>+%%GUI%%%%DATADIR/ui4/printsettingsdialog.py
>+%%GUI%%%%DATADIR/ui4/printsettingsdialog_base.py
>+%%GUI%%%%DATADIR/ui4/printsettingstoolbox.py
>+%%GUI%%%%DATADIR/ui4/printtestpagedialog.py
>+%%GUI%%%%DATADIR/ui4/printtestpagedialog_base.py
>+%%GUI%%%%DATADIR/ui4/readonlyradiobutton.py
>+%%GUI%%%%DATADIR/ui4/sendfaxdialog.py
>+%%GUI%%%%DATADIR/ui4/sendfaxdialog_base.py
>+%%GUI%%%%DATADIR/ui4/settingsdialog.py
>+%%GUI%%%%DATADIR/ui4/settingsdialog_base.py
>+%%GUI%%%%DATADIR/ui4/setupdialog.py
>+%%GUI%%%%DATADIR/ui4/setupdialog_base.py
>+%%GUI%%%%DATADIR/ui4/systemtray.py
>+%%GUI%%%%DATADIR/ui4/systrayframe.py
>+%%GUI%%%%DATADIR/ui4/systrayframe_base.py
>+%%GUI%%%%DATADIR/ui4/ui_utils.py
>+%%GUI%%%%DATADIR/ui4/wifisetupdialog.py
>+%%GUI%%%%DATADIR/ui4/wifisetupdialog_base.py
> %%DATADIR%%/unload.py
> %%DATADIR%%/wificonfig.py
> %%FAX%%share/ppd/HP/HP-Fax-hpcups.ppd.gz
>@@ -1399,7 +1399,7 @@
> @dirrmtry share/applications
> @dirrm %%DATADIR%%/ui4/plugins
> @dirrm %%DATADIR%%/ui4
>-@dirrm %%DATADIR%%/scan
>+%%SCN%%@dirrm %%DATADIR%%/scan
> @dirrm %%DATADIR%%/prnt
> @dirrm %%DATADIR%%/pcard
> @dirrm %%DATADIR%%/installer
>@@ -1411,12 +1411,12 @@
> @dirrm %%DATADIR%%/data/ldl
> @dirrm %%DATADIR%%/data/images/other
> @dirrm %%DATADIR%%/data/images/devices
>-@dirrm %%DATADIR%%/data/images/64x64
>-@dirrm %%DATADIR%%/data/images/32x32
>-@dirrm %%DATADIR%%/data/images/256x256
>-@dirrm %%DATADIR%%/data/images/24x24
>-@dirrm %%DATADIR%%/data/images/16x16
>-@dirrm %%DATADIR%%/data/images/128x128
>+%%SCN%%@dirrm %%DATADIR%%/data/images/64x64
>+%%SCN%%@dirrm %%DATADIR%%/data/images/32x32
>+%%SCN%%@dirrm %%DATADIR%%/data/images/256x256
>+%%SCN%%@dirrm %%DATADIR%%/data/images/24x24
>+%%SCN%%@dirrm %%DATADIR%%/data/images/16x16
>+%%SCN%%@dirrm %%DATADIR%%/data/images/128x128
> @dirrm %%DATADIR%%/data/images
> @dirrm %%DATADIR%%/data
> @dirrm %%DATADIR%%/copier
>@@ -1436,6 +1436,6 @@
> @dirrmtry etc/xdg/autostart
> @dirrmtry etc/xdg
> @dirrmtry etc/cups
>-@exec mkdir -p %D/%%DATADIR%%/ui4/plugins
>+%%GUI%%@exec mkdir -p %D/%%DATADIR%%/ui4/plugins
> @exec echo hpaio >> %D/etc/sane.d/dll.conf
> @unexec sed -i "" -e '/^hpaio$/d' %D/etc/sane.d/dll.conf
>Index: science/peekabot/Makefile
>===================================================================
>RCS file: /usr/local/freebsdcvs/ports/science/peekabot/Makefile,v
>retrieving revision 1.17
>diff -u -r1.17 Makefile
>--- science/peekabot/Makefile	4 May 2010 11:43:33 -0000	1.17
>+++ science/peekabot/Makefile	13 Jun 2010 18:46:17 -0000
>@@ -12,7 +12,7 @@
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/0.7.x/ \
> 		http://distfiles.officialunix.com/
> 
>-MAINTAINER=	chris@officialunix.com
>+MAINTAINER=	ports@freebsd.org
> COMMENT=	Distributed real-time 3D visualization tool for robotics researchers
> 
> LIB_DEPENDS=	boost_regex.4:${PORTSDIR}/devel/boost-libs \

Actions: View | Diff

Attachments on bug 147838: 107128