Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0672e861921f6ac8ec40e37fb868d83886830bfd
commit 0672e861921f6ac8ec40e37fb868d83886830bfd
Author: Michel Hermier <herm...@frugalware.org>
Date: Fri Jul 30 22:29:29 2010 +0200
hpoj-0.91-7-i686
* Dead package, replaced by hplip.
diff --git a/source/lib-extra/hpoj/FrugalBuild
b/source/lib-extra/hpoj/FrugalBuild
deleted file mode 100644
index 856dd5f..0000000
--- a/source/lib-extra/hpoj/FrugalBuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Compiling Time: 0.18 SBU
-# Maintainer: BMH1980 <bmh1...@frugalware.org>
-
-pkgname=hpoj
-pkgver=0.91
-pkgrel=7
-pkgdesc="HP OfficeJet Linux driver"
-license="GPL"
-_F_sourceforge_prefix="$pkgname-"
-_F_sourceforge_ext=".tgz"
-Finclude sourceforge
-source=(${sour...@]} $pkgname-$pkgver-gcc4.patch
$pkgname-$pkgver-kernel26.patch $pkgname-$pkgver-fw1.diff rc.ptal{,-{de,fr}.po})
-sha1sums=('36785cf1a925f569ed3983b8c068620e2c9b4456' \
- 'cd2d37c2620e29b92b96fe779d10a6635c7f31b7' \
- 'fe3328fd7a43ec83d76d0d7fb7be6c41027cddb3' \
- '9f8fee70fe30b1ddc5c3a241f3ed0bc08928a476' \
- '2e6624c1f59bce576a94aa12b42ae98c18815212' \
- '136f5640fa9ee5886a4e496d7119b0c8c201ef1b' \
- 'ae94c2c3fd0c4a804e857a9031f4f1322040f7c9')
-groups=('lib-extra')
-archs=('i686' 'x86_64')
-depends=('libusb')
-makedepends=('qt')
-
-subpkgs=("xojpanel")
-subdescs=("Graphical application that displays the contents of the LCD on the
device")
-sublicense=("GPL2")
-subgroups=("xapps-extra")
-subdepends=('qt hpoj')
-subarchs=('i686 x86_64')
-
-build()
-{
- Fmkdir /usr/lib/{cups/backend,sane}
- Fbuild
- Fln /usr/sbin/ptal-cups /usr/lib/cups/backend/ptal
- Fln /usr/lib/libsane-hpoj.so /usr/lib/sane/libsane-hpoj.so.1
- Fmv /usr/share/doc/$pkgname /usr/share/doc/$pkgname-$pkgver
- Frcd2 ptal
- Fln $pkgname-$pkgver /usr/share/doc/xojpanel-$pkgver
- Fsplit xojpanel usr/bin/xojpanel usr/share/doc/xojpanel-$pkgver
- Fsplit xojpanel usr/share/doc/$pkgname-$pkgver/xojpanel.html
-}
-
-# optimization OK
diff --git a/source/lib-extra/hpoj/hpoj-0.91-fw1.diff
b/source/lib-extra/hpoj/hpoj-0.91-fw1.diff
deleted file mode 100644
index 179cd8c..0000000
--- a/source/lib-extra/hpoj/hpoj-0.91-fw1.diff
+++ /dev/null
@@ -1,108 +0,0 @@
-diff -Naur hpoj-0.91.orig/apps/cmdline/Makefile.in
hpoj-0.91/apps/cmdline/Makefile.in
---- hpoj-0.91.orig/apps/cmdline/Makefile.in 2002-06-14 03:49:49.000000000
+0200
-+++ hpoj-0.91/apps/cmdline/Makefile.in 2005-08-20 19:30:40.000000000 +0200
-@@ -5,7 +5,7 @@
- DISTCLEANS=Makefile
- INCLUDES=Makefile ../../include/ptal.h ../../include/hpojip.h
-
--CFLAGS=-O -Wall -g @DEFINES_CMDLINE@ @INCLUDE_CMDLINE@ @LIBRARY_CMDLINE@
@VAR_RUN_PREFIX_CFLAGS@
-+CFLAGS += @DEFINES_CMDLINE@ @INCLUDE_CMDLINE@ @LIBRARY_CMDLINE@
@VAR_RUN_PREFIX_CFLAGS@
-
- all: $(GOALS)
-
-diff -Naur hpoj-0.91.orig/apps/xojpanel/Makefile.in
hpoj-0.91/apps/xojpanel/Makefile.in
---- hpoj-0.91.orig/apps/xojpanel/Makefile.in 2002-06-13 02:40:44.000000000
+0200
-+++ hpoj-0.91/apps/xojpanel/Makefile.in 2005-08-20 19:30:40.000000000
+0200
-@@ -3,7 +3,7 @@
- m...@qt_moc@
-
- LFLAGS = @LIBRARY_CMDLINE@ @LIBQT_CMDLINE@ -lptal
--CFLAGS = -O -Wall -g -I/usr/X11R6/include @INCLUDE_CMDLINE@
-+CFLAGS += -I/usr/X11R6/include @INCLUDE_CMDLINE@
-
- PIXMAPS = hpojlcd.xpm hpoj_lcdmon.xpm hpoj_mini.xpm
- COMMON_HEADERS = Makefile xojpanel.h
-diff -Naur hpoj-0.91.orig/lib/hpojip/Makefile.in
hpoj-0.91/lib/hpojip/Makefile.in
---- hpoj-0.91.orig/lib/hpojip/Makefile.in 2002-01-08 02:24:19.000000000
+0100
-+++ hpoj-0.91/lib/hpojip/Makefile.in 2005-08-20 19:30:40.000000000 +0200
-@@ -26,7 +26,7 @@
- # TODO: Detect system endianness in configure script!
- # For now, little-endian (Intel LSB-first) is assumed.
-
--CFLAGS=-O -Wall -g @DEFINES_CMDLINE@ @INCLUDE_CMDLINE@ @LIBRARY_CMDLINE@
-+CFLAGS += @DEFINES_CMDLINE@ @INCLUDE_CMDLINE@ @LIBRARY_CMDLINE@
-
- %.shared.o: %.c $(INCLUDES)
- $(CC) $(CFLAGS) -DHPOJIP_INTERNAL -fPIC -c -o $@ $<
-diff -Naur hpoj-0.91.orig/lib/ptal/Makefile.in hpoj-0.91/lib/ptal/Makefile.in
---- hpoj-0.91.orig/lib/ptal/Makefile.in 2002-10-16 01:34:28.000000000
+0200
-+++ hpoj-0.91/lib/ptal/Makefile.in 2005-08-20 19:30:40.000000000 +0200
-@@ -17,7 +17,7 @@
- MLCDDIR=../../mlcd
- INCLUDES=Makefile $(INCLUDEDIR)/ptal.h ptal-internal.h $(MLCDDIR)/mlcd.h
-
--CFLAGS=-O -Wall -g @DEFINES_CMDLINE@ @INCLUDE_CMDLINE@ @LIBRARY_CMDLINE@
@VAR_RUN_PREFIX_CFLAGS@ -DUCD_COMPATIBLE
-+CFLAGS += @DEFINES_CMDLINE@ @INCLUDE_CMDLINE@ @LIBRARY_CMDLINE@
@VAR_RUN_PREFIX_CFLAGS@ -DUCD_COMPATIBLE
-
- %.shared.o: %.c $(INCLUDES)
- $(CC) $(CFLAGS) -fPIC -c -o $@ $<
-diff -Naur hpoj-0.91.orig/lib/sane/Makefile.in hpoj-0.91/lib/sane/Makefile.in
---- hpoj-0.91.orig/lib/sane/Makefile.in 2002-07-10 03:13:39.000000000
+0200
-+++ hpoj-0.91/lib/sane/Makefile.in 2005-08-20 19:30:40.000000000 +0200
-@@ -16,7 +16,7 @@
- INCLUDEDIR=../../include
- INCLUDES=Makefile $(INCLUDEDIR)/ptal.h hpoj.h hpoj-tables.h sane.h saneopts.h
-
--CFLAGS=-O -Wall -g @DEFINES_CMDLINE@ @INCLUDE_CMDLINE@ @LIBRARY_CMDLINE@
-+CFLAGS += @DEFINES_CMDLINE@ @INCLUDE_CMDLINE@ @LIBRARY_CMDLINE@
-
- %.shared.o: %.c $(INCLUDES)
- $(CC) $(CFLAGS) -fPIC -c -o $@ $<
-diff -Naur hpoj-0.91.orig/Makefile.in hpoj-0.91/Makefile.in
---- hpoj-0.91.orig/Makefile.in 2003-09-23 03:16:41.000000000 +0200
-+++ hpoj-0.91/Makefile.in 2005-08-20 20:01:56.000000000 +0200
-@@ -118,14 +118,6 @@
- @ echo
- @ export PATH=/sbin:/usr/sbin:$$PATH:/usr/local/bin ; \
- if test `id -u` -eq 0 ; then \
-- if test -d /etc/profile.d ; then \
-- echo "export PATH=$(bindir):$(sbindir):\$$PATH"
>/etc/profile.d/hpoj.sh ; \
-- echo "setenv PATH $(bindir):$(sbindir):\$$PATH"
>/etc/profile.d/hpoj.csh ; \
-- chmod +x /etc/profile.d/hpoj.sh /etc/profile.d/hpoj.csh
; \
-- else \
-- echo "You may need to add $(bindir) and $(sbindir) to
your PATH." ; \
-- fi ; \
-- echo ; \
- for dir in /etc/init.d /etc/rc.d/init.d /sbin/init.d XXXX ; do \
- if test $$dir = XXXX ; then \
- if ! test -d /usr/local/etc/rc.d ; then \
-@@ -158,17 +150,7 @@
- echo "Setting libsane-hpoj.so symlink." ; \
- $(LN_S) -f $(libdir)/libsane-hpoj.so
$(SANE_BACKEND_DIR)/libsane-hpoj.so.1 ; \
- fi ; \
-- if ! grep ^hpoj $(SANE_ETC_DIR)/dll.conf >/dev/null
2>/dev/null ; then \
-- echo "Adding hpoj entry to
$(SANE_ETC_DIR)/dll.conf." ; \
-- echo hpoj >>$(SANE_ETC_DIR)/dll.conf ; \
-- fi ; \
-- fi ; \
-- echo ; \
-- if ! grep $(libdir) /etc/ld.so.conf >/dev/null 2>/dev/null ;
then \
-- echo "Adding $(libdir) to /etc/ld.so.conf." ; \
-- echo $(libdir) >>/etc/ld.so.conf ; \
- fi ; \
-- ldconfig ; \
- else \
- if ! test -d /etc/profile.d || ! test -f /etc/profile.d/hpoj.sh
|| ! test -f /etc/profile.d/hpoj.csh ; then \
- echo "You may need to add $(bindir) and $(sbindir) to
your PATH." ; \
-diff -Naur hpoj-0.91.orig/mlcd/Makefile.in hpoj-0.91/mlcd/Makefile.in
---- hpoj-0.91.orig/mlcd/Makefile.in 2003-04-30 04:39:31.000000000 +0200
-+++ hpoj-0.91/mlcd/Makefile.in 2005-08-20 19:30:40.000000000 +0200
-@@ -19,7 +19,7 @@
- transport/ExMlcTransport.h \
-
- PWD=$(shell pwd)
--CFLAGS=-I$(PWD) -I$(PWD)/transport -O -g -Wall -DEX_TRANSPORT_UNIX_PORT
-dpar_platfo...@par_platform@ -dusb_platfo...@usb_platform@ -DJD_DEBUGLITE
@MLCD_CFLAGS@ @VAR_RUN_PREFIX_CFLAGS@
-+CFLAGS += -I$(PWD) -I$(PWD)/transport -DEX_TRANSPORT_UNIX_PORT
-dpar_platfo...@par_platform@ -dusb_platfo...@usb_platform@ -DJD_DEBUGLITE
@MLCD_CFLAGS@ @VAR_RUN_PREFIX_CFLAGS@
- lfla...@mlcd_lflags@
-
- %.o : %.cpp $(INCLUDES)
diff --git a/source/lib-extra/hpoj/hpoj-0.91-gcc4.patch
b/source/lib-extra/hpoj/hpoj-0.91-gcc4.patch
deleted file mode 100644
index ab1c125..0000000
--- a/source/lib-extra/hpoj/hpoj-0.91-gcc4.patch
+++ /dev/null
@@ -1,194 +0,0 @@
---- hpoj-0.91/lib/hpojip/xjpg_fix.c.gcc4 2002-07-25 11:01:24.000000000
+0200
-+++ hpoj-0.91/lib/hpojip/xjpg_fix.c 2005-03-01 23:05:52.905482223 +0100
-@@ -389,7 +389,7 @@
-
\*****************************************************************************/
-
-
--#define MYLOCATE(p) (void *)(p)=(g->headerBuffer+lenAddedHeader)
-+#define MYLOCATE(p) (p)=(typeof(p))(g->headerBuffer+lenAddedHeader)
- #define MYWRITE(p) lenAddedHeader+=sizeof(*(p))
- #define MYWRITEBUF(data,datalen) \
- do { \
---- hpoj-0.91/mlcd/ExMgr.h.gcc4 2003-11-04 02:03:18.000000000 +0100
-+++ hpoj-0.91/mlcd/ExMgr.h 2005-03-01 23:38:34.297977986 +0100
-@@ -127,8 +127,8 @@
- QueueEntry(): prev(0),next(0) { }
- #ifdef JD_DEBUGLITE
- void dump(void) {
-- printf("QueueEntry(0x%8.8X): prev=0x%8.8X, next=0x%8.8X\n",
-- (int)this,(int)prev,(int)next);
-+ printf("QueueEntry(%p): prev=%p, next=%p\n",
-+ this,prev,next);
- }
- #endif
- int isEnqueued(void) { return (prev || next); }
---- hpoj-0.91/mlcd/ExMgr.cpp.gcc4 2003-11-04 02:03:18.000000000 +0100
-+++ hpoj-0.91/mlcd/ExMgr.cpp 2005-03-01 23:41:49.408864110 +0100
-@@ -248,8 +248,8 @@
-
- #ifdef JD_DEBUGLITE
- void ExWatchdogTimer::dump(void) {
-- printf("pMsgHandler=0x%8.8X\n",(int)pMsgHandler);
-- printf("pMsg=0x%8.8X\n",(int)pMsg);
-+ printf("pMsgHandler=%p\n",pMsgHandler);
-+ printf("pMsg=%p\n",pMsg);
- printf("delay=%d seconds, %d usec\n",
- (int)delay.tv_sec,(int)delay.tv_usec);
- printf("cancelled=%d\n",cancelled);
-@@ -1307,13 +1307,13 @@
- printf("\tstate=%d\n",session[scd].state);
- printf("\tfd=%d\n",session[scd].fd);
- printf("\tscdlink=%d\n",session[scd].scdlink);
-- printf("\tpLookup=0x%8.8X\n",(int)session[scd].pLookup);
-+ printf("\tpLookup=%p\n",session[scd].pLookup);
- printf("\toutstandingForwardBdrCount=%d\n",
- session[scd].outstandingForwardBdrCount);
- printf("\tpReverseBdrQueue: depth=%d\n",
- session[scd].pReverseBdrQueue->depth());
-- printf("\ttcd=0x%8.8X\n",(int)session[scd].tcd);
-- printf("\tpCommandBdr=0x%8.8X\n",(int)session[scd].pCommandBdr);
-+ printf("\ttcd=%p\n",session[scd].tcd);
-+ printf("\tpCommandBdr=%p\n",session[scd].pCommandBdr);
- printf("\tpmlTrapsRegistered=%d\n",session[scd].pmlTrapsRegistered);
- printf("\tbitbucketSocket=%d\n",session[scd].bitbucketSocket);
-
-@@ -2407,8 +2407,8 @@
- }
- printf("llioPossibleNameCount=%d\n",llioPossibleNameCount);
- printf("llioName=<%s>\n",SAFE_STRING(llioName));
-- printf("llioGlobBuffer.gl_pathc=%d\n",llioGlobBuffer.gl_pathc);
-- printf("llioGlobBuffer.gl_offs=%d\n",llioGlobBuffer.gl_offs);
-+ printf("llioGlobBuffer.gl_pathc=%lu\n",(unsigned
long)llioGlobBuffer.gl_pathc);
-+ printf("llioGlobBuffer.gl_offs=%lu\n",(unsigned
long)llioGlobBuffer.gl_offs);
- printf("llioGlobFlags=%d\n",llioGlobFlags);
- for (i=0;i<llioMatchDeviceIDCount;i++) {
- printf("llioMatchDeviceID[%d]=<%s>\n",i,
---- hpoj-0.91/mlcd/transport/ExTransport.cpp.gcc4 2005-03-04
14:00:57.000000000 +0000
-+++ hpoj-0.91/mlcd/transport/ExTransport.cpp 2005-03-04 14:03:37.000000000
+0000
-@@ -70,6 +70,7 @@
-
- #ifdef JD_DEBUGLITE
- void ExLookup::dump(void) {
-+#if 0
- printf("sizeof(ExLookup)=%d, this=0x%8.8X\n",
- sizeof(ExLookup),(int)this);
- printf("pService=0x%8.8X\n",
-@@ -82,6 +83,7 @@
- lastSet);
- printf("status=%d\n",
- status);
-+#endif
- }
- void ExLookup__dump(ExLookup *_this) {
- return _this->dump();
-@@ -316,6 +318,7 @@
-
- #ifdef JD_DEBUGLITE
- void ExTransportChannel::dump(void) {
-+#if 0
- printf("this=0x%8.8X\n",
- (int)this);
- printf("port=%d\n",
-@@ -378,6 +381,7 @@
- currentGrabbedCredit);
- printf("currentGrabbedTransaction=%d\n",
- currentGrabbedTransaction);
-+#endif
- }
- #endif
-
-@@ -922,6 +926,7 @@
- #ifdef JD_DEBUGLITE
-
- void ExTransport::dump(void) {
-+#if 0
- int channel;
-
- printf("this=0x%8.8X\n",
-@@ -971,6 +976,7 @@
- if (pLookupRequest) {
- pLookupRequest->dump();
- }
-+#endif
- }
-
- void ExTransport::dumpall(void) {
-@@ -1101,7 +1107,7 @@
- ExMsg *pMsg=pMgr->getFreeMsg();
-
- pMsg->setType(eEXMSG_ACTIVATE_WAIT);
-- pMsg->setParams(eEXCLASS_TRANSPORT,(int)this);
-+ pMsg->setParams(eEXCLASS_TRANSPORT,(int)(long)this); // HACK
- pMsg->send(pMgr);
- }
-
-@@ -1248,7 +1254,7 @@
- ExMsg *pMsg=pMgr->getFreeMsg();
-
- pMsg->setType(eEXMSG_ACTIVATE_RESPONSE);
-- pMsg->setParams(eEXCLASS_TRANSPORT,(int)this,status);
-+ pMsg->setParams(eEXCLASS_TRANSPORT,(int)(long)this,status); // HACK
- pMsg->send(pMgr);
- }
-
-@@ -1282,7 +1288,7 @@
- ExMsg *pMsg=pMgr->getFreeMsg();
-
- pMsg->setType(eEXMSG_DEACTIVATE_RESPONSE);
-- pMsg->setParams(eEXCLASS_TRANSPORT,(int)this,status);
-+ pMsg->setParams(eEXCLASS_TRANSPORT,(int)(long)this,status); // HACK
- pMsg->send(pMgr);
- }
-
---- hpoj-0.91/mlcd/transport/ExMlcTransport.cpp.gcc4 2005-03-04
14:28:28.000000000 +0000
-+++ hpoj-0.91/mlcd/transport/ExMlcTransport.cpp 2005-03-04
14:29:40.000000000 +0000
-@@ -409,6 +409,7 @@
-
- #ifdef JD_DEBUGLITE
- void ExMlcTransportChannel::dump(void) {
-+#if 0
- ExTransportChannel::dump();
- printf("----------------\n");
- printf("pMlcTransport=0x%8.8X\n",
-@@ -487,6 +488,7 @@
- countHandleEmptyCreditRequestReply.get());
- printf("isGusher=%d\n",
- isGusher());
-+#endif
- }
- #endif
-
-@@ -1597,6 +1599,7 @@
-
- #ifdef JD_DEBUGLITE
- void ExMlcTransport::dump(void) {
-+#if 0
- int i;
-
- ExTransport::dump();
-@@ -1631,6 +1634,7 @@
- remoteSocketArray[i].maxForwardPacketSize,
- remoteSocketArray[i].maxReversePacketSize);
- }
-+#endif
- }
- #endif
-
---- hpoj-0.91/mlcd/transport/ExMlcCommandChannel.cpp.gcc4 2005-03-04
14:37:19.000000000 +0000
-+++ hpoj-0.91/mlcd/transport/ExMlcCommandChannel.cpp 2005-03-04
14:37:46.000000000 +0000
-@@ -214,6 +214,7 @@
-
- #ifdef JD_DEBUGLITE
- void ExMlcCommandChannel::dump(void) {
-+#if 0
- ExMlcTransportChannel::dump();
- printf("----------------\n");
- printf("pForwardCommandPool=0x%8.8X\n",
-@@ -238,6 +239,7 @@
- lastPsid);
- printf("lastSsid=%d\n",
- lastSsid);
-+#endif
- }
- #endif
-
diff --git a/source/lib-extra/hpoj/hpoj-0.91-kernel26.patch
b/source/lib-extra/hpoj/hpoj-0.91-kernel26.patch
deleted file mode 100644
index 38b8d04..0000000
--- a/source/lib-extra/hpoj/hpoj-0.91-kernel26.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- hpoj-0.91/scripts/ptal-init.in.kernel26 2004-03-03 17:30:47.000000000
+0000
-+++ hpoj-0.91/scripts/ptal-init.in 2004-03-03 17:30:59.000000000 +0000
-@@ -90,6 +90,11 @@
- my $varLock="/var/lock";
- my $varLockSubsys="$varLock/subsys";
- my $osPlatform=`uname -s 2>/dev/null`;
-+chomp $osPlatform;
-+my $linuxVersion=($osPlatform eq 'Linux' ? `uname -r 2>/dev/null` : '');
-+$linuxVersion=~s/^(\s*)(\d+\.\d+)(\..*)$/$2/;
-+chomp $linuxVersion;
-+my $usbprintermodule = ($linuxVersion eq '2.6' ? "usblp" : "printer");
- my %devnames;
- my %obsoleteDevnames;
- my %configInfo;
-@@ -1222,12 +1227,12 @@
- # undef -- skip USB probe
- # 0 -- do nothing, proceed with USB probe
- # >0 -- load printer.o
--# <0 -- disable and unload printer.o
-+# <0 -- disable and unload printer.o/usblp.o
- sub linuxWhatShouldWeDoAboutUsbPrinterModule {
- my $isSmp=&linuxIsSmp;
- my $libusbSupported=&ptalMlcdSupportsLibusb;
- my $usblpIsLoaded=&linuxUsblpIsLoaded;
-- my $printerIsLoaded=&linuxModuleIsLoaded("printer");
-+ my $printerIsLoaded=&linuxModuleIsLoaded($usbprintermodule);
-
- # non-SMP:
- if (!$isSmp) {
-@@ -1261,9 +1266,10 @@
- }
- goto allowInsmodPrinter;
-
-- # SMP, libusb support, some sort of printer.c functionality loaded:
-+ # SMP, libusb support, some sort of printer.c/usblp.c
-+ # functionality loaded:
- } elsif ($usblpIsLoaded) {
-- # printer.c compiled into the kernel:
-+ # printer.c/usblp.c compiled into the kernel:
- if (!$printerIsLoaded) {
- if (!&askYN(
- "\n".
-@@ -1280,7 +1286,7 @@
- return undef;
- }
-
-- # printer.c compiled and loaded as a module:
-+ # printer.c/usblp.c compiled and loaded as a module:
- } else {
- promptDisableRmmodPrinter:
- my $r=&askYN(
-@@ -1301,8 +1307,9 @@
- }
- }
-
-- # SMP, libusb support, printer.c enabled although not loaded:
-- } elsif (!&linuxModuleIsDisabled("printer")) {
-+ # SMP, libusb support, printer.c/usblp.c enabled although not
-+ # loaded:
-+ } elsif (!&linuxModuleIsDisabled($usbprintermodule)) {
- goto promptDisableRmmodPrinter;
- }
-
-@@ -1326,11 +1333,11 @@
- return 1;
- }
- if ($r<0) {
-- $r=&linuxDisableAndUnloadModule("printer",
-+ $r=&linuxDisableAndUnloadModule($usbprintermodule,
- "to prevent possible system instability due to SMP+USB");
- } else {
- linuxJustLoad:
-- $r=&linuxInsmod("printer",$quiet);
-+ $r=&linuxInsmod($usbprintermodule,$quiet);
- }
- if (!$r && !$quiet &&
- &askYN("\n*** Continue with the USB probe anyway".$msg,0)) {
-@@ -1601,7 +1608,7 @@
-
- } else {
- my $parModulesLoaded=0;
-- # Don't "modprobe printer" on SMP Linux with libusb support:
-+ # Don't "modprobe printer/usblp" on SMP Linux with libusb support:
- my $usbModulesLoaded=
- (&ptalMlcdSupportsLibusb &&
- $osPlatform=~/Linux/ && &linuxIsSmp);
diff --git a/source/lib-extra/hpoj/hpoj.install
b/source/lib-extra/hpoj/hpoj.install
deleted file mode 100644
index 665b27e..0000000
--- a/source/lib-extra/hpoj/hpoj.install
+++ /dev/null
@@ -1,25 +0,0 @@
-post_install()
-{
- /usr/sbin/chkconfig --add rc.ptal
- sed -i 's|^#hpoj|hpoj|' /etc/sane.d/dll.conf
- echo 'Please run as root "ptal-init setup" to setup your HP OJ device.'
-}
-
-post_upgrade()
-{
- pre_remove
- post_install
-}
-
-pre_remove()
-{
- /usr/sbin/chkconfig --del rc.ptal
- sed -i 's|^hpoj|#hpoj|' /etc/sane.d/dll.conf
-}
-
-op=$1
-shift
-
-$op $*
-
-# vim: ft=sh
diff --git a/source/lib-extra/hpoj/rc.ptal b/source/lib-extra/hpoj/rc.ptal
deleted file mode 100644
index 078e113..0000000
--- a/source/lib-extra/hpoj/rc.ptal
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/bash
-
-# (c) 2005 Marcus Habermehl <bmh198...@yahoo.de>
-# rc.ptal for Frugalware
-# distributed under GPL License
-
-# chkconfig: 2345 59 61
-# description: ptal-init is the init script and device setup utility \
-# for the HP OfficeJet Linux driver.
-
-source /lib/initscripts/functions
-TEXTDOMAIN=ptal
-
-actions=(restart start status stop)
-daemon=$"HP OfficeJet Linux driver"
-
-pid="pidof ptal-printd 2> /dev/null"
-
-rc_start()
-{
- start_msg
- if [ -z "$(eval ${pid})" ] ; then
- /usr/sbin/ptal-init start > /dev/null
- ok $?
- else
- ok 999
- fi
-}
-
-rc_stop()
-{
- stop_msg
- if [ -n "$(eval ${pid})" ] ; then
- /usr/sbin/ptal-init stop > /dev/null
- ok $?
- else
- ok 999
- fi
-}
-
-rc_exec $1
-
-# vim: ft=sh
diff --git a/source/lib-extra/hpoj/rc.ptal-de.po
b/source/lib-extra/hpoj/rc.ptal-de.po
deleted file mode 100644
index ced2c10..0000000
--- a/source/lib-extra/hpoj/rc.ptal-de.po
+++ /dev/null
@@ -1,21 +0,0 @@
-# German translations for bmh package
-# German messages for bmh.
-# Copyright (C) 2006 THE bmh'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the bmh package.
-# Marcus Habermehl <bmh1...@frugalware.org>, 2006.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: bmh 1980\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-15 23:39+0100\n"
-"PO-Revision-Date: 2006-03-15 23:42+0100\n"
-"Last-Translator: Marcus Habermehl <bmh1...@frugalware.org>\n"
-"Language-Team: German <translation-team...@lists.sourceforge.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgid "HP OfficeJet Linux driver"
-msgstr "HP OfficeJet Linux Treiber"
diff --git a/source/lib-extra/hpoj/rc.ptal-fr.po
b/source/lib-extra/hpoj/rc.ptal-fr.po
deleted file mode 100644
index 455d4f7..0000000
--- a/source/lib-extra/hpoj/rc.ptal-fr.po
+++ /dev/null
@@ -1,21 +0,0 @@
-# French translations for bmh package
-# Traduction anglaise du package bmh.
-# Copyright (C) 2006 THE bmh'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the bmh package.
-# Marcus Habermehl <bmh1...@frugalware.org>, 2006.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: bmh 1980\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-15 23:39+0100\n"
-"PO-Revision-Date: 2006-03-15 23:42+0100\n"
-"Last-Translator: Marcus Habermehl <bmh1...@frugalware.org>\n"
-"Language-Team: French <tra...@traduc.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-msgid "HP OfficeJet Linux driver"
-msgstr "du pilote HP Officejet"
diff --git a/source/lib-extra/hpoj/rc.ptal.pot
b/source/lib-extra/hpoj/rc.ptal.pot
deleted file mode 100644
index 2c560fe..0000000
--- a/source/lib-extra/hpoj/rc.ptal.pot
+++ /dev/null
@@ -1,20 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <em...@address>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-15 23:39+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <em...@address>\n"
-"Language-Team: LANGUAGE <l...@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-msgid "HP OfficeJet Linux driver"
-msgstr ""
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
