FreeBSD Bugzilla – Attachment 104887 Details for
Bug 145146
[PATCH] update print/hplip3 to 3.10.2
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch-hplip.txt
patch-hplip.txt (text/plain), 15.48 KB, created by
Chris Petrik
on 2010-04-01 06:51:51 UTC
(
hide
)
Description:
patch-hplip.txt
Filename:
MIME Type:
Creator:
Chris Petrik
Created:
2010-04-01 06:51:51 UTC
Size:
15.48 KB
patch
obsolete
>Index: hplip3/Makefile >=================================================================== >RCS file: /usr/local/freebsdncvs/ports/print/hplip3/Makefile,v >retrieving revision 1.36 >diff -u -r1.36 Makefile >--- hplip3/Makefile 28 Mar 2010 06:42:33 -0000 1.36 >+++ hplip3/Makefile 1 Apr 2010 05:23:50 -0000 >@@ -6,8 +6,7 @@ > # > > PORTNAME= hplip >-PORTVERSION= 3.9.8 >-PORTREVISION= 4 >+PORTVERSION= 3.10.2 > CATEGORIES= print > MASTER_SITES= SF > >@@ -37,7 +36,8 @@ > --with-cupsbackenddir=${LOCALBASE}/libexec/cups/backend \ > --with-cupsfilterdir=${LOCALBASE}/libexec/cups/filter \ > --with-drvdir=${LOCALBASE}/libexec/cups/driver \ >- --with-hppddir=${LOCALBASE}/share/ppd/HP >+ --with-hpppddir=${LOCALBASE}/share/ppd/HP \ >+ --with-mimedir=${LOCALBASE}/etc/cups > > USE_LDCONFIG= yes > USE_GHOSTSCRIPT_RUN= yes >@@ -45,9 +45,10 @@ > USE_RC_SUBR= hpssd > MAKE_JOBS_SAFE= yes > SUB_FILES= pkg-message >+PLIST_SUB= VER=${PORTVERSION} > > CPPFLAGS+= -I${LOCALBASE}/include >-LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} >+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lcompat > > CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" > >Index: hplip3/distinfo >=================================================================== >RCS file: /usr/local/freebsdncvs/ports/print/hplip3/distinfo,v >retrieving revision 1.13 >diff -u -r1.13 distinfo >--- hplip3/distinfo 6 Sep 2009 18:43:42 -0000 1.13 >+++ hplip3/distinfo 31 Mar 2010 00:53:09 -0000 >@@ -1,3 +1,3 @@ >-MD5 (hplip-3.9.8.tar.gz) = cb1cf49c5f062993b78fc2768f531ed8 >-SHA256 (hplip-3.9.8.tar.gz) = 6471d99bde2b1182f45082c50dbd9e424a3ec2c0e98c48c934a1cd0d4ccb4e36 >-SIZE (hplip-3.9.8.tar.gz) = 15715640 >+MD5 (hplip-3.10.2.tar.gz) = 4df6f16c47ae7edd015bf2cf5155f26f >+SHA256 (hplip-3.10.2.tar.gz) = bb9a3aeda9a8d31f0cc790e629f14d2122f9bff111b0d3cc97ac19a8607d7956 >+SIZE (hplip-3.10.2.tar.gz) = 21446275 >Index: hplip3/pkg-plist >=================================================================== >RCS file: /usr/local/freebsdncvs/ports/print/hplip3/pkg-plist,v >retrieving revision 1.15 >diff -u -r1.15 pkg-plist >--- hplip3/pkg-plist 11 Feb 2010 15:54:30 -0000 1.15 >+++ hplip3/pkg-plist 1 Apr 2010 05:24:58 -0000 >@@ -34,6 +34,8 @@ > etc/hp/hplip.conf.sample > @exec if [ ! -f %B/hplip.conf ]; then cp -p %D/%F %B/hplip.conf; fi > etc/xdg/autostart/hplip-systray.desktop >+etc/cups/pstotiff.convs >+etc/cups/pstotiff.types > lib/libhpip.la > lib/libhpip.so > lib/libhpip.so.0 >@@ -55,44 +57,45 @@ > libexec/cups/filter/hpcups > libexec/cups/filter/hpcupsfax > libexec/cups/filter/hplipjs >+libexec/cups/filter/pstotiff > libexec/cups/backend/hp > libexec/cups/backend/hpfax > libexec/cups/driver/hpcups.drv > libexec/cups/filter/foomatic-rip-hplip >-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/COPYING >-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/README_LIBJPG >-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/commandline.html >-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/copying.html >-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/copyright >-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/devicemanager.html >-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/faxtrouble.html >-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/gettinghelp.html >-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/hpscan.html >-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/favicon.ico >-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/print.png >-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/toolbox_actions.png >-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/toolbox_fax.png >-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/toolbox_print_control.png >-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/toolbox_print_settings.png >-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/toolbox_status.png >-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/toolbox_supplies.png >-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/xsane.png >-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/index.html >-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/mainttask.html >-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/plugins.html >-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/print.html >-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/printing.html >-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/printoptions.html >-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/printtroubleshooting.html >-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/scanning.html >-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/scantrouble.html >-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/sendfax.html >-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/setup.html >-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/styles/css.css >-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/systray.html >-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/troubleshooting.html >-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/uninstalling.html >-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/upgrading.html >+%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/COPYING >+%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/README_LIBJPG >+%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/commandline.html >+%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/copying.html >+%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/copyright >+%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/devicemanager.html >+%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/faxtrouble.html >+%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/gettinghelp.html >+%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/hpscan.html >+%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/images/favicon.ico >+%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/images/print.png >+%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/images/toolbox_actions.png >+%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/images/toolbox_fax.png >+%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/images/toolbox_print_control.png >+%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/images/toolbox_print_settings.png >+%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/images/toolbox_status.png >+%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/images/toolbox_supplies.png >+%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/images/xsane.png >+%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/index.html >+%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/mainttask.html >+%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/plugins.html >+%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/print.html >+%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/printing.html >+%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/printoptions.html >+%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/printtroubleshooting.html >+%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/scanning.html >+%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/scantrouble.html >+%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/sendfax.html >+%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/setup.html >+%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/styles/css.css >+%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/systray.html >+%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/troubleshooting.html >+%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/uninstalling.html >+%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/upgrading.html > %%DATADIR%%/__init__.py > %%DATADIR%%/align.py > %%DATADIR%%/base/__init__.py >@@ -233,6 +236,7 @@ > %%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 >@@ -480,6 +484,10 @@ > %%DATADIR%%/fax/faxdevice.py > %%DATADIR%%/fax/pmlfax.py > %%DATADIR%%/fax/soapfax.py >+%%DATADIR%%/fax/marvellfax.py >+%%DATADIR%%/fax/pstotiff >+%%DATADIR%%/fax/pstotiff.convs >+%%DATADIR%%/fax/pstotiff.types > %%DATADIR%%/faxsetup.py > %%DATADIR%%/firmware.py > %%DATADIR%%/hpdio.py >@@ -940,13 +948,8 @@ > share/ppd/HP/hp-laserjet_3055-hpijs.ppd.gz > share/ppd/HP/hp-laserjet_3100-hpijs.ppd.gz > share/ppd/HP/hp-laserjet_3150-hpijs.ppd.gz >-share/ppd/HP/hp-laserjet_3200-hpijs-pcl3.ppd.gz >-share/ppd/HP/hp-laserjet_3200-ps.ppd.gz >-share/ppd/HP/hp-laserjet_3200_series-ps.ppd.gz >-share/ppd/HP/hp-laserjet_3200m-hpijs.ppd.gz > share/ppd/HP/hp-laserjet_3200m-ps.ppd.gz > share/ppd/HP/hp-laserjet_3200se-hpijs.ppd.gz >-share/ppd/HP/hp-laserjet_3200se-ps.ppd.gz > share/ppd/HP/hp-laserjet_3300_3310_3320-hpijs-pcl3.ppd.gz > share/ppd/HP/hp-laserjet_3300_3310_3320-ps.ppd.gz > share/ppd/HP/hp-laserjet_3330-hpijs.ppd.gz >@@ -1171,7 +1174,6 @@ > share/ppd/HP/hp-officejet_g85xi-hpijs.ppd.gz > share/ppd/HP/hp-officejet_g95-hpijs.ppd.gz > share/ppd/HP/hp-officejet_h470-hpijs.ppd.gz >-share/ppd/HP/hp-officejet_j3500_series-hpijs.ppd.gz > share/ppd/HP/hp-officejet_j3600_series-hpijs.ppd.gz > share/ppd/HP/hp-officejet_j4500_series-hpijs.ppd.gz > share/ppd/HP/hp-officejet_j4660_series-hpijs.ppd.gz >@@ -1356,6 +1358,32 @@ > share/ppd/HP/hp-deskjet_670c-hpijs.ppd.gz > share/ppd/HP/hp-deskjet_d1600_series-hpijs.ppd.gz > share/ppd/HP/hp-deskjet_d5500_series-hpijs.ppd.gz >+share/ppd/HP/HP-Fax3-hpcups.ppd.gz >+share/ppd/HP/HP-Fax3-hpijs.ppd.gz >+share/ppd/HP/hp-color_laserjet_cp5225-ps.ppd.gz >+share/ppd/HP/hp-color_laserjet_cm6040_mfp-ps.ppd.gz >+share/ppd/HP/hp-color_laserjet_cp5225n-ps.ppd.gz >+share/ppd/HP/hp-color_laserjet_cp4020_series-ps.ppd.gz >+share/ppd/HP/hp-designjet_t770_postscript-ps.ppd.gz >+share/ppd/HP/hp-designjet_t1120ps_24in-ps.ppd.gz >+share/ppd/HP/hp-color_laserjet_cp5225dn-ps.ppd.gz >+share/ppd/HP/hp-designjet_t770ps_24in-ps.ppd.gz >+share/ppd/HP/hp-color_laserjet_cp4520_series-ps.ppd.gz >+share/ppd/HP/hp-designjet_t1120ps_44in-ps.ppd.gz >+share/ppd/HP/hp-designjet_t1200_postscript-ps.ppd.gz >+share/ppd/HP/hp-color_laserjet_cp4520_series-hpijs-pcl3.ppd.gz >+share/ppd/HP/hp-photosmart_b109a_series-hpijs.ppd.gz >+share/ppd/HP/hp-color_laserjet_cp4020_series-hpijs-pcl3.ppd.gz >+share/ppd/HP/hp-deskjet_f4500_series-hpijs.ppd.gz >+share/ppd/HP/hp-deskjet_f2400_series-hpijs.ppd.gz >+share/ppd/HP/hp-officejet_4500_g510g-m-hpijs.ppd.gz >+share/ppd/HP/hp-photosmart_premium_c309g-m-hpijs.ppd.gz >+share/ppd/HP/hp-laserjet_3200-hpijs.ppd.gz >+share/ppd/HP/hp-photosmart_wireless_b109n-z-hpijs.ppd.gz >+share/ppd/HP/hp-officejet_4500_g510a-f-hpijs.ppd.gz >+share/ppd/HP/hp-laserjet_3200m-hpijs-pcl3.ppd.gz >+share/ppd/HP/hp-photosmart_prem-web_c309n-s-hpijs.ppd.gz >+share/ppd/HP/hp-photosmart_a640_series-hpijs.ppd.gz > share/applications/hplip.desktop > @dirrmtry share/ppd/HP > @dirrmtry share/ppd >@@ -1385,9 +1413,9 @@ > @dirrm %%DATADIR%%/copier > @dirrm %%DATADIR%%/base > @dirrm %%DATADIR%% >-%%PORTDOCS%%@dirrm %%DOCSDIR%%-3.9.8/styles >-%%PORTDOCS%%@dirrm %%DOCSDIR%%-3.9.8/images >-%%PORTDOCS%%@dirrm %%DOCSDIR%%-3.9.8 >+%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%VER%%/styles >+%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%VER%%/images >+%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%VER%% > @dirrmtry share/applications > @dirrmtry lib/sane > @dirrmtry lib/python2.5/site-packages >@@ -1398,6 +1426,7 @@ > @dirrmtry etc/hp > @dirrmtry etc/xdg/autostart > @dirrmtry etc/xdg >+@dirrmtry etc/cups > @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: hplip3/files/patch-Makefile.am >=================================================================== >RCS file: /usr/local/freebsdncvs/ports/print/hplip3/files/patch-Makefile.am,v >retrieving revision 1.4 >diff -u -r1.4 patch-Makefile.am >--- hplip3/files/patch-Makefile.am 6 Sep 2009 18:43:43 -0000 1.4 >+++ hplip3/files/patch-Makefile.am 31 Mar 2010 00:53:09 -0000 >@@ -1,22 +1,7 @@ >---- Makefile.am.orig 2009-06-18 01:00:23.000000000 +0400 >-+++ Makefile.am 2009-06-29 02:25:37.000000000 +0400 >-@@ -24,11 +24,11 @@ >- if DOC_BUILD >- wwwsrc = doc >- www0dir = $(docdir) >--dist_www0_DATA = $(wwwsrc)/index.html $(wwwsrc)/commandline.html $(wwwsrc)/copying.html $(wwwsrc)/devicemanager.html $(wwwsrc)/faxtrouble.html $(wwwsrc)/gettinghelp.html $(wwwsrc)/hpscan.html $(wwwsrc)/mainttask.html $(wwwsrc)/plugins.html $(wwwsrc)/print.html $(wwwsrc)/printing.html $(wwwsrc)/printoptions.html $(wwwsrc)/printtroubleshooting.html $(wwwsrc)/scanning.html $(wwwsrc)/scantrouble.html $(wwwsrc)/sendfax.html $(wwwsrc)/setup.html $(wwwsrc)/systray.html $(wwwsrc)/troubleshooting.html $(wwwsrc)/uninstalling.html $(wwwsrc)/upgrading.html >-+dist_www0_DATA = $(wwwsrc)/*.html >- www3dir = $(docdir)/styles >--dist_www3_DATA = $(wwwsrc)/styles/* >-+dist_www3_DATA = $(wwwsrc)/styles/*.css >- www4dir = $(docdir)/images >--dist_www4_DATA = $(wwwsrc)/images/* >-+dist_www4_DATA = $(wwwsrc)/images/*.png $(wwwsrc)/images/*.ico >- endif >- >- if HPLIP_BUILD >-@@ -89,15 +89,16 @@ >- hp_mkuri_LDADD = -ldl libhpmud.la >+--- Makefile.am.old 2010-03-28 15:08:50.000000000 -0600 >++++ Makefile.am 2010-03-28 15:09:28.000000000 -0600 >+@@ -90,15 +90,15 @@ >+ hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\" > > # hpmud.rules > -rulesdir = /etc/udev/rules.d >@@ -28,7 +13,6 @@ > -endif > -halpredir = /usr/share/hal/fdi/preprobe/10osvendor > -dist_halpre_DATA = data/rules/20-hplip-devices.fdi >-+# FreeBSD doesn't use udev so why install the rules? > +#rulesdir = /etc/udev/rules.d > +#dist_rules_DATA = data/rules/56-hpmud_support.rules > +#if UDEV_ACL_RULES >Index: hplip3/files/patch-Makefile.in >=================================================================== >RCS file: /usr/local/freebsdncvs/ports/print/hplip3/files/patch-Makefile.in,v >retrieving revision 1.11 >diff -u -r1.11 patch-Makefile.in >--- hplip3/files/patch-Makefile.in 6 Sep 2009 18:43:43 -0000 1.11 >+++ hplip3/files/patch-Makefile.in 31 Mar 2010 00:53:09 -0000 >@@ -1,33 +1,29 @@ >---- Makefile.in.old 2009-06-22 23:34:25.000000000 -0500 >-+++ Makefile.in 2009-06-22 23:41:26.000000000 -0500 >-@@ -2006,22 +2006,11 @@ >- data/rules/40-hplip.rules data/rules/55-hpmud.rules >- dist_rulesDATA_INSTALL = $(INSTALL_DATA) >- dist_unrelDATA_INSTALL = $(INSTALL_DATA) >--am__dist_www0_DATA_DIST = $(wwwsrc)/index.html \ >-- $(wwwsrc)/commandline.html $(wwwsrc)/copying.html \ >-- $(wwwsrc)/devicemanager.html $(wwwsrc)/faxtrouble.html \ >-- $(wwwsrc)/gettinghelp.html $(wwwsrc)/hpscan.html \ >-- $(wwwsrc)/mainttask.html $(wwwsrc)/plugins.html \ >-- $(wwwsrc)/print.html $(wwwsrc)/printing.html \ >-- $(wwwsrc)/printoptions.html \ >-- $(wwwsrc)/printtroubleshooting.html $(wwwsrc)/scanning.html \ >-- $(wwwsrc)/scantrouble.html $(wwwsrc)/sendfax.html \ >-- $(wwwsrc)/setup.html $(wwwsrc)/systray.html \ >-- $(wwwsrc)/troubleshooting.html $(wwwsrc)/uninstalling.html \ >-- $(wwwsrc)/upgrading.html >-+am__dist_www0_DATA_DIST = $(wwwsrc)/*.html >- dist_www0DATA_INSTALL = $(INSTALL_DATA) >--am__dist_www3_DATA_DIST = $(wwwsrc)/styles/* >-+am__dist_www3_DATA_DIST = $(wwwsrc)/styles/*.css >- dist_www3DATA_INSTALL = $(INSTALL_DATA) >--am__dist_www4_DATA_DIST = $(wwwsrc)/images/* >-+am__dist_www4_DATA_DIST = $(wwwsrc)/images/*.png $(wwwsrc)/images/*.ico >- dist_www4DATA_INSTALL = $(INSTALL_DATA) >- docDATA_INSTALL = $(INSTALL_DATA) >- hplip_confDATA_INSTALL = $(INSTALL_DATA) >-@@ -3679,11 +3668,12 @@ >- @HPLIP_BUILD_TRUE@hp_mkuri_LDADD = -ldl libhpmud.la >+--- Makefile.in.old 2010-03-28 15:07:10.000000000 -0600 >++++ Makefile.in 2010-03-28 15:08:01.000000000 -0600 >+@@ -89,8 +89,8 @@ >+ # ip library >+ @HPLIP_BUILD_TRUE@am__append_1 = libhpmud.la libhpip.la >+ @HPLIP_BUILD_TRUE@hp_mkuri_PROGRAMS = hp-mkuri$(EXEEXT) >+-@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_TRUE@am__append_2 = data/rules/40-hplip.rules >+-@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_FALSE@am__append_3 = data/rules/55-hpmud.rules >++#@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_TRUE@am__append_2 = data/rules/40-hplip.rules >++#@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_FALSE@am__append_3 = data/rules/55-hpmud.rules >+ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_4 = \ >+ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ scan/sane/hpaio.desc \ >+ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ prnt/drv/hpijs.drv.in.template \ >+@@ -2041,8 +2041,8 @@ >+ ppd/hpcups/hp-psc_950vr.ppd.gz ppd/hpcups/hp-psc_950xi.ppd.gz >+ am__dist_prnt_DATA_DIST = prnt/cups.py prnt/__init__.py prnt/ldl.py \ >+ prnt/pcl.py prnt/colorcal.py >+-am__dist_rules_DATA_DIST = data/rules/56-hpmud_support.rules \ >+- data/rules/40-hplip.rules data/rules/55-hpmud.rules >++#am__dist_rules_DATA_DIST = data/rules/56-hpmud_support.rules \ >++# data/rules/40-hplip.rules data/rules/55-hpmud.rules >+ am__dist_scan_DATA_DIST = scan/__init__.py scan/sane.py >+ am__dist_ui_DATA_DIST = ui/alignform.py ui/colorcalform_base.py \ >+ ui/colorcalform.py ui/coloradjform_base.py ui/coloradjform.py \ >+@@ -3777,11 +3777,11 @@ >+ @HPLIP_BUILD_TRUE@hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\" > > # hpmud.rules > -@HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d >@@ -35,7 +31,6 @@ > -@HPLIP_BUILD_TRUE@ $(am__append_2) $(am__append_3) > -@HPLIP_BUILD_TRUE@halpredir = /usr/share/hal/fdi/preprobe/10osvendor > -@HPLIP_BUILD_TRUE@dist_halpre_DATA = data/rules/20-hplip-devices.fdi >-+# same applys here. > +#@HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d > +#@HPLIP_BUILD_TRUE@dist_rules_DATA = data/rules/56-hpmud_support.rules \ > +#@HPLIP_BUILD_TRUE@ $(am__append_2) $(am__append_3)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 145146
:
104886
| 104887