[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (634fac94a047bdfc3f07f6d3a76db633e8568ecd)

Treeve Jelbert scm at mail.sourcemage.org
Mon Nov 27 09:26:51 EST 2006


GIT changes to master grimoire by Treeve Jelbert <treeve at scarlet.be>:

 printer/hplip/DEPENDS |    5 ++++-
 printer/hplip/DETAILS |    4 ++--
 printer/hplip/HISTORY |    5 +++++
 printer/hplip/INSTALL |    9 +++++++++
 4 files changed, 20 insertions(+), 3 deletions(-)

New commits:
commit 634fac94a047bdfc3f07f6d3a76db633e8568ecd
Author: Treeve Jelbert <treeve at scarlet.be>
Commit: Treeve Jelbert <treeve at scarlet.be>

    hplip-1.6.10

diff --git a/printer/hplip/DEPENDS b/printer/hplip/DEPENDS
index f2fa8ba..7cf4483 100755
--- a/printer/hplip/DEPENDS
+++ b/printer/hplip/DEPENDS
@@ -1,6 +1,9 @@
 depends  CUPS      &&
-depends  pyqt      &&
 depends  net-snmp  &&
 depends  foomatic  &&
 depends  jpeg
 
+optional_depends	pyqt				\
+			""				\
+			""				\
+			"To build graphical tools"
diff --git a/printer/hplip/DETAILS b/printer/hplip/DETAILS
index bd607e2..bee0538 100755
--- a/printer/hplip/DETAILS
+++ b/printer/hplip/DETAILS
@@ -1,7 +1,7 @@
            SPELL=hplip
-         VERSION=1.6.9
+         VERSION=1.6.10
           SOURCE=$SPELL-$VERSION.tar.gz
-     SOURCE_HASH=sha512:4df72e93d7c69552ff72632c0f77e3bde05c6ea72adcbe9286a763bba88dd3dafffa32c4daf1ab1e212cdf6aa58fd4254f373617f04a9a0e376ea8d1b028775b
+     SOURCE_HASH=sha512:af2de186534c3c459adba1e92d68f31a63afaa5726afda7f000599184b5199a3b0b710d14dfe79cb945d649aabff2765c97371f785734bd349c91533443b9565
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
         WEB_SITE=http://hplip.sourceforge.net
diff --git a/printer/hplip/HISTORY b/printer/hplip/HISTORY
index e91f185..2a63751 100644
--- a/printer/hplip/HISTORY
+++ b/printer/hplip/HISTORY
@@ -1,3 +1,8 @@
+2006-11-27 Treeve Jelbert <treeve at pi.be>
+	* DETAILS: version 1.6.10
+	* DEPENDS, INSTALL: pyqt is optional at build time
+	  fixes bug #13289 
+
 2006-09-16 Treeve Jelbert <treeve at pi.be>
 	* DETAILS: version 1.6.9
 
diff --git a/printer/hplip/INSTALL b/printer/hplip/INSTALL
index c9040e0..f340cbf 100755
--- a/printer/hplip/INSTALL
+++ b/printer/hplip/INSTALL
@@ -1,2 +1,11 @@
 # Pass in DESTDIR to remove need for chkconfig or install_initd
 make install DESTDIR=${INSTALL_ROOT}/
+
+if ! is_depends_enabled pyqt $SPELL; then
+        rm -f "/usr/bin/hp-print"
+        rm -f "/usr/bin/hp-toolbox"
+        rm -f "/usr/share/hplip/print"
+        rm -f "/usr/share/hplip/toolbox"
+        rm -f "/usr/share/applications/hplip.desktop"
+        rm -f "/usr/lib/menu/hplip"
+fi



More information about the SM-Commit mailing list