Version bump dropbox-1.1.31

atratsevskiy
Alexander Tratsevskiy 13 years ago
parent 2b3d4731d3
commit 22b2b182e8

@ -1,3 +1,3 @@
DIST dropbox-lnx.x86-1.1.28.tar.gz 16502818 RMD160 2627dfcee6fa1b80d56969f579d33cc4c4ddb290 SHA1 158450e3e7635504563acba2bf7c7ffeabb9990e SHA256 3398ee955e06594d32cebe173aefaa93c7e4f26adbb28a221b2db16c8c04b66b
DIST dropbox-lnx.x86_64-1.1.28.tar.gz 17281635 RMD160 b524cad42b540b92b6fea1c6b056b9fd7a250c15 SHA1 68226df021ade3308a285d653f1aefc6bc5e9248 SHA256 b7e6774068a8bad75c3f48ff0e23aefb7d931f90163012580ff2a4aaa69577f0
EBUILD dropbox-1.1.28.ebuild 1200 RMD160 f40e0fc1fa74192ca75ad8d80276a166e7ca66e0 SHA1 545cd852a2e41375953cf99890813f99846b6202 SHA256 1beae3874959b619572bab8311c41c4de18c72b2ad00e748c237646f1b4dc40b
DIST dropbox-lnx.x86-1.1.31.tar.gz 16524036 RMD160 6641c1bcc947e05b06decf9175b316a5442ec487 SHA1 99aa1a16b92442aeb2f5731517b646fb4b5c7c1a SHA256 3ecc603e59fa3eef9edfcbb1bd5f3659a509c565bb1a71959e7f2e2e3abdd47b
DIST dropbox-lnx.x86_64-1.1.31.tar.gz 17296898 RMD160 0d1b4ed3fe5f83349c3241a7a3fbad51935f2bc9 SHA1 2caefb56cefeb988195657f6e41cd35050ba6343 SHA256 541cf47cd4ad12ece251bdba0c04a6da143d39748ba05254b8ea9d500ce8e06e
EBUILD dropbox-1.1.31.ebuild 1200 RMD160 f40e0fc1fa74192ca75ad8d80276a166e7ca66e0 SHA1 545cd852a2e41375953cf99890813f99846b6202 SHA256 1beae3874959b619572bab8311c41c4de18c72b2ad00e748c237646f1b4dc40b

@ -1,10 +0,0 @@
# ChangeLog for net-print/hplip
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header$
*hplip-3.9.12-r2 (09 Apr 2010)
09 Apr 2010; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+hplip-3.9.12-r2.ebuild:
Revison for new use.

@ -1,11 +0,0 @@
AUX hplip-3.10.2-plugin.patch 358 RMD160 a76e1bee114cc26a9af0d031414aed7f7c453712 SHA1 957a10944194c52fbd1346e201bbad9f06bd97bf SHA256 5f85766990d74a1c26685abfe95b46dc87d7ebc52c9b595f994a81af89284494
AUX hplip-3.10.2-systray-segfault.patch 469 RMD160 df64dea9bcec386a6fe4263377e8f85daa06898f SHA1 3d3d88e1f7b7a2af194e3c33164ce41e6f1f6f05 SHA256 a92efb69afa908875775a501d7b723e3e0d315c81fa52cea25f32b994046598f
AUX hplip-3.10.2-udev-attrs.patch 13229 RMD160 66993f5103689e136e2d13d28d95f6e4fb1617d3 SHA1 917aa0e1f1569d8235a1b6aed91cad2ff2974f00 SHA256 89ab7c0816b9cd49dd4dd64f2d335e71c1370d96fc2a3c77dadd4702b168934a
AUX hplip-3.9.10-browser.patch 1447 RMD160 0276eacae608821b6b900c9fb27dbd20fb207d04 SHA1 67eec05d9b29445a98a16d496e671cd0f29e1471 SHA256 0e3b3b251ff4cf73032f4c78b6c0495b2d95fefd53d9fd8897faf6528ddd2875
AUX hplip-3.9.10-desktop.patch 492 RMD160 52a8bcf1544d0073920e00a383aeb22a9caf5487 SHA1 9394a73448b7b1b3ab1a014ab63b9edc731def66 SHA256 04bb5ef5ee4145eadc5f9e6498ca8a2d3d2277569b179263cb86f0f56231e462
AUX hplip-3.9.10-htmldir.patch 4444 RMD160 7c960a3049f0b27b761c0f05c4fa9b1484dcd323 SHA1 a9e4af023f23a8990c769158eca08eabd62a5566 SHA256 2ef20d6d8636e22789f48705d9ca219b88cf111d12c54ff0354b18f3b5e20476
AUX hplip-3.9.12-cupsddk.patch 1265 RMD160 4f4cea73c0cfc6e830b27f4945e123e3cd490114 SHA1 01ce069ab67277aab9205ea59537ec55362ef1aa SHA256 3050221f497c14ae3a7a093043018d55f4deb2b2ebd81840a8285cec4eb7759d
AUX hplip-3.9.12-systray.patch 795 RMD160 23a37fb76a05aa9f835dfef7ee00cf70366f95dc SHA1 11d85332f0200f14bb4492c1528cebb2af72d6f0 SHA256 a2eee24cefe2f40b81bc735fb528dec932864b083bb0cf1305d5d7a8cc5bd719
DIST hplip-3.9.12.tar.gz 21371447 RMD160 f1717e8bad043b54497489fa1a2764b3ac548094 SHA1 d4d659ae52f01055bfc7060e0d4e3c7354c1dee3 SHA256 1c53febe3101b3718d43c9176c08826a1a46c49a79c9f6445cd16981fbf2a12a
EBUILD hplip-3.9.12-r2.ebuild 8273 RMD160 8574eb70cddf9e2674eafa502eb7b789fb5b0f7c SHA1 d388576e5511bef896d1fb124aa956b8ab1eefec SHA256 4674b6fa5e1d53e2bac0af0f935cb67adf55d337127f4858dcb6f8f3adb2dc5a
MISC ChangeLog 257 RMD160 c8618cbe725d415d50efc3d647b12cdcb2f0db76 SHA1 688e07b7558d1c10f9dca65f61532621a5960e05 SHA256 0fe6f343fb9f558081ffd60c471cc6e4bfe11495039979db4068328b107e6db4

@ -1,11 +0,0 @@
--- setup.py.old 2010-03-20 17:38:16.061877304 +0100
+++ setup.py 2010-03-20 17:40:27.328531289 +0100
@@ -370,7 +370,7 @@
if hp_plugin:
if prop.gui_build:
- os.system("hp-plugin -i")
+ os.system("hp-plugin --required")
else:
os.system("hp-plugin")

@ -1,11 +0,0 @@
diff -up hplip-3.9.8/ui4/systemtray.py.tray-icon-crash hplip-3.9.8/ui4/systemtray.py
--- hplip-3.9.8/ui4/systemtray.py.tray-icon-crash 2010-03-23 16:36:55.545632224 +0000
+++ hplip-3.9.8/ui4/systemtray.py 2010-03-23 16:37:51.944509885 +0000
@@ -489,6 +489,7 @@ class SystemTrayApp(QApplication):
log.debug("Exiting")
self.sendMessage('', '', EVENT_SYSTEMTRAY_EXIT)
self.quit()
+ del self.tray_icon
def toolboxTriggered(self):

@ -1,201 +0,0 @@
diff -Naur hplip-3.10.2-old/data/rules/55-hpmud.rules hplip-3.10.2/data/rules/55-hpmud.rules
--- hplip-3.10.2-old/data/rules/55-hpmud.rules 2010-02-25 00:06:35.000000000 +0100
+++ hplip-3.10.2/data/rules/55-hpmud.rules 2010-03-29 01:43:25.191669512 +0200
@@ -21,124 +21,124 @@
LABEL="hplip_pid_test"
# Check for AiO products (0x03f0xx11).
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??11", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??11", OWNER="root", GROUP="lp", MODE="660"
# Check for Photosmart products without wildcard since cameras and scanners also used (0x03f0xx02).
# The xx02 pid has been retired so this explicit list should not change.
# photosmart_d2300_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c302", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c302", OWNER="root", GROUP="lp", MODE="660"
# photosmart_100
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3802", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3802", OWNER="root", GROUP="lp", MODE="660"
# photosmart_1115
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3402", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3402", OWNER="root", GROUP="lp", MODE="660"
# photosmart_1215
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3202", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3202", OWNER="root", GROUP="lp", MODE="660"
# photosmart_1218
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3302", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3302", OWNER="root", GROUP="lp", MODE="660"
# photosmart_130
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3902", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3902", OWNER="root", GROUP="lp", MODE="660"
# photosmart_1315
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3602", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3602", OWNER="root", GROUP="lp", MODE="660"
# photosmart_140_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1002", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1002", OWNER="root", GROUP="lp", MODE="660"
# photosmart_230
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3502", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3502", OWNER="root", GROUP="lp", MODE="660"
# photosmart_240_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1102", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1102", OWNER="root", GROUP="lp", MODE="660"
# photosmart_320_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1202", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1202", OWNER="root", GROUP="lp", MODE="660"
# photosmart_330_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1602", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1602", OWNER="root", GROUP="lp", MODE="660"
# photosmart_370_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1302", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1302", OWNER="root", GROUP="lp", MODE="660"
# photosmart_380_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1702", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1702", OWNER="root", GROUP="lp", MODE="660"
# photosmart_420_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1502", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1502", OWNER="root", GROUP="lp", MODE="660"
# photosmart_470_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1802", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1802", OWNER="root", GROUP="lp", MODE="660"
# photosmart_7150
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3a02", OWNER="root", GROUP="lp", MODE="660"
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3b02", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3a02", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3b02", OWNER="root", GROUP="lp", MODE="660"
# photosmart_7200_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b002", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b002", OWNER="root", GROUP="lp", MODE="660"
# photosmart_7345
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2002", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2002", OWNER="root", GROUP="lp", MODE="660"
# photosmart_7350
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3c02", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3c02", OWNER="root", GROUP="lp", MODE="660"
# photosmart_7400_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b802", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b802", OWNER="root", GROUP="lp", MODE="660"
# photosmart_7550
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3e02", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3e02", OWNER="root", GROUP="lp", MODE="660"
# photosmart_7600_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b202", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b202", OWNER="root", GROUP="lp", MODE="660"
# photosmart_7700_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b402", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b402", OWNER="root", GROUP="lp", MODE="660"
# photosmart_7800_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c002", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c002", OWNER="root", GROUP="lp", MODE="660"
# photosmart_7900_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b602", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b602", OWNER="root", GROUP="lp", MODE="660"
# photosmart_8000_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c102", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c102", OWNER="root", GROUP="lp", MODE="660"
# photosmart_8100_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="ba02", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="ba02", OWNER="root", GROUP="lp", MODE="660"
# photosmart_8200_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c202", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c202", OWNER="root", GROUP="lp", MODE="660"
# photosmart_8400_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="bb02", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="bb02", OWNER="root", GROUP="lp", MODE="660"
# photosmart_8700_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="bc02", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="bc02", OWNER="root", GROUP="lp", MODE="660"
# photosmart_a310_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1d02", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1d02", OWNER="root", GROUP="lp", MODE="660"
# photosmart_a320_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1e02", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1e02", OWNER="root", GROUP="lp", MODE="660"
# photosmart_a430_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1902", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1902", OWNER="root", GROUP="lp", MODE="660"
# photosmart_a440_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1f02", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1f02", OWNER="root", GROUP="lp", MODE="660"
# photosmart_a510_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1a02", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1a02", OWNER="root", GROUP="lp", MODE="660"
# photosmart_a520_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2602", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2602", OWNER="root", GROUP="lp", MODE="660"
# photosmart_a530_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2b02", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2b02", OWNER="root", GROUP="lp", MODE="660"
# photosmart_a610_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1b02", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1b02", OWNER="root", GROUP="lp", MODE="660"
# photosmart_a620_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2702", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2702", OWNER="root", GROUP="lp", MODE="660"
# photosmart_a630_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2c02", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2c02", OWNER="root", GROUP="lp", MODE="660"
# photosmart_a710_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1c02", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1c02", OWNER="root", GROUP="lp", MODE="660"
# photosmart_a820_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2902", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2902", OWNER="root", GROUP="lp", MODE="660"
# photosmart_d5060_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c802", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c802", OWNER="root", GROUP="lp", MODE="660"
# photosmart_d5100_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c402", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c402", OWNER="root", GROUP="lp", MODE="660"
# photosmart_d6100_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c502", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c502", OWNER="root", GROUP="lp", MODE="660"
# photosmart_d7100_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c602", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c602", OWNER="root", GROUP="lp", MODE="660"
# photosmart_d7300_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c702", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c702", OWNER="root", GROUP="lp", MODE="660"
# photosmart_pro_b8300_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="be02", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="be02", OWNER="root", GROUP="lp", MODE="660"
# photosmart_b8800_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="d002", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="d002", OWNER="root", GROUP="lp", MODE="660"
# photosmart_pro_b9100_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="bd02", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="bd02", OWNER="root", GROUP="lp", MODE="660"
# Photosmart_B8500_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="d102", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="d102", OWNER="root", GROUP="lp", MODE="660"
# Photosmart_A640_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="7902", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="7902", OWNER="root", GROUP="lp", MODE="660"
# Check for Business Inkjet products (0x03f0xx12).
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??12", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??12", OWNER="root", GROUP="lp", MODE="660"
# Check for Deskjet products (0x03f0xx04).
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??04", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??04", OWNER="root", GROUP="lp", MODE="660"
# Check for LaserJet products (0x03f0xx17).
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", OWNER="root", GROUP="lp", MODE="660"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", OWNER="root", GROUP="lp", MODE="660"
# Removed the following rule because FHS states that /etc should be reserved for static files only. This
# functionality should be done in a deb/rpm post install script. 2/11/2009, D Suffield
diff -Naur hplip-3.10.2-old/data/rules/56-hpmud_support.rules hplip-3.10.2/data/rules/56-hpmud_support.rules
--- hplip-3.10.2-old/data/rules/56-hpmud_support.rules 2010-02-25 00:06:35.000000000 +0100
+++ hplip-3.10.2/data/rules/56-hpmud_support.rules 2010-03-29 01:45:12.941658101 +0200
@@ -7,8 +7,8 @@
LABEL="pid_test"
# Check for LaserJet products (0x03f0xx17).
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", RUN+="/bin/sh -c 'hp_model=%E{ID_MODEL} /usr/bin/hp-mkuri -c &'"
ENV{hp_test}=="yes", RUN+="bin/sh -c '/usr/bin/hp-mkuri -c &'"
-LABEL="hpmud_rules_end"
\ No newline at end of file
+LABEL="hpmud_rules_end"

@ -1,38 +0,0 @@
--- base/utils.py.old 2009-11-14 15:23:29.000000000 +0100
+++ base/utils.py 2009-11-14 15:37:53.000000000 +0100
@@ -812,13 +812,15 @@
return True
-BROWSERS = ['firefox', 'mozilla', 'konqueror', 'galeon', 'skipstone'] # in preferred order
-BROWSER_OPTS = {'firefox': '-new-window', 'mozilla' : '', 'konqueror': '', 'galeon': '-w', 'skipstone': ''}
+BROWSERS = ['firefox', 'mozilla', 'konqueror', 'epiphany', 'skipstone'] # in preferred order
+BROWSER_OPTS = {'firefox': '-new-tab', 'mozilla': '', 'konqueror': '', 'epiphany': '--new-tab', 'skipstone': ''}
def find_browser():
if platform_avail and platform.system() == 'Darwin':
return "open"
+ if platform_avail and platform.system() == 'Linux' and which("xdg-open"):
+ return "xdg-open"
else:
for b in BROWSERS:
if which(b):
@@ -832,11 +834,14 @@
cmd = 'open "%s"' % url
log.debug(cmd)
os.system(cmd)
+ if platform_avail and platform.system() == 'Linux' and which("xdg-open"):
+ cmd = 'xdg-open "%s"' % url
+ log.debug(cmd)
+ os.system(cmd)
else:
for b in BROWSERS:
- bb = which(b)
- if bb:
- bb = os.path.join(bb, b)
+ if b:
+ bb = which(b, return_full_path='True')
if use_browser_opts:
cmd = """%s %s "%s" &""" % (bb, BROWSER_OPTS[b], url)
else:

@ -1,18 +0,0 @@
--- Makefile.am.old 2009-11-06 22:56:26.000000000 +0100
+++ Makefile.am 2009-11-14 16:50:39.000000000 +0100
@@ -325,6 +325,7 @@
hppgsz_CFLAGS = $(libapdk_la_CFLAGS)
hppgsz_LDADD = libapdk.la -ljpeg -ldl
+if GUI_BUILD
# hplip.desktop
hplip_desktopdir = $(icondir)
hplip_desktop_DATA = hplip.desktop
@@ -332,6 +333,7 @@
# hplip-systray.desktop
hplip_systraydir = $(systraydir)
hplip_systray_DATA = hplip-systray.desktop
+endif
# hpipjs (CUPS filter)
hplipjsdir = $(cupsfilterdir)

@ -1,109 +0,0 @@
diff -Naur hplip-3.9.10-old/configure.in hplip-3.9.10/configure.in
--- hplip-3.9.10-old/configure.in 2009-11-15 18:24:03.000000000 +0100
+++ hplip-3.9.10/configure.in 2009-11-15 18:30:14.000000000 +0100
@@ -319,6 +319,9 @@
AC_ARG_WITH(docdir, AC_HELP_STRING([--with-docdir=DIR], [set hplip documentation directory [default=datadir/doc]]),
hpdocdir=$withval, hpdocdir="$datadir/doc/hplip-$VERSION")
+AC_ARG_WITH(htmldir, AC_HELP_STRING([--with-htmldir=DIR], [set hplip html documentation directory [default=datadir/doc]]),
+ hphtmldir=$withval, hphtmldir="$datadir/doc/hplip-$VERSION")
+
AC_MSG_CHECKING([for foomatic ppd install])
AC_ARG_ENABLE(foomatic_ppd_install,
[ --enable-foomatic-ppd-install enable foomatic static ppd install (default=no), uses hpppddir],
@@ -543,6 +546,7 @@
AC_DEFINE_DIR([abs_sbindir], [sbindir])
AC_DEFINE_DIR([abs_hpppddir], [hpppddir])
AC_DEFINE_DIR([abs_docdir], [hpdocdir])
+AC_DEFINE_DIR([abs_htmldir], [hphtmldir])
abs_ppddir=${abs_hpppddir%/*}
AC_DEFINE_DIR([abs_drvdir], [drvdir])
@@ -550,6 +554,7 @@
AC_SUBST(abs_sbindir)
AC_SUBST(abs_hpppddir)
AC_SUBST(abs_docdir)
+AC_SUBST(abs_htmldir)
AC_SUBST(abs_ppddir)
AC_SUBST(abs_drvdir)
AC_SUBST(icondir)
@@ -558,6 +563,7 @@
AC_SUBST(cupsfilterdir)
AC_SUBST(hpppddir)
AC_SUBST(hpdocdir)
+AC_SUBST(hphtmldir)
AC_SUBST(drvdir)
AC_SUBST(network_build)
AC_SUBST(pp_build)
diff -Naur hplip-3.9.10-old/hplip.conf.in hplip-3.9.10/hplip.conf.in
--- hplip-3.9.10-old/hplip.conf.in 2009-11-15 18:24:03.000000000 +0100
+++ hplip-3.9.10/hplip.conf.in 2009-11-15 18:25:01.000000000 +0100
@@ -9,6 +9,7 @@
ppd=@abs_hpppddir@
ppdbase=@abs_ppddir@
doc=@abs_docdir@
+html=@abs_htmldir@
icon=@icondir@
cupsbackend=@cupsbackenddir@
cupsfilter=@cupsfilterdir@
@@ -42,4 +43,4 @@
lite-build=@lite_build@
udev-acl-rules=@udev_acl_rules@
hpcups-only-build=@hpcups_only_build@
-hpijs-only-build=@hpijs_only_build@
\ Kein Zeilenumbruch am Dateiende.
+hpijs-only-build=@hpijs_only_build@
diff -Naur hplip-3.9.10-old/hplip.list.in hplip-3.9.10/hplip.list.in
--- hplip-3.9.10-old/hplip.list.in 2009-11-15 18:24:03.000000000 +0100
+++ hplip-3.9.10/hplip.list.in 2009-11-15 18:25:01.000000000 +0100
@@ -49,6 +49,7 @@
$icondir=@icondir@
$systraydir=@systraydir@
$docdir=@hpdocdir@
+$htmldir=@hphtmldirdir@
$version=@VERSION@
$internal_tag=@PACKAGE_BUGREPORT@
@@ -252,11 +253,11 @@
@epm_full@f 644 root root $home/pcard/photocard.py pcard/photocard.py
@epm_full@f 755 root root $home/info.py info.py
# docs
-@epm_full@f 644 root root $docdir doc/*
-@epm_full@d 775 root root $docdir/images -
-@epm_full@f 644 root root $docdir/images doc/images/*
-@epm_full@d 775 root root $docdir/styles -
-@epm_full@f 644 root root $docdir/styles doc/styles/*
+@epm_full@f 644 root root $htmldir doc/*
+@epm_full@d 775 root root $htmldir/images -
+@epm_full@f 644 root root $htmldir/images doc/images/*
+@epm_full@d 775 root root $htmldir/styles -
+@epm_full@f 644 root root $htmldir/styles doc/styles/*
# python commands
@epm_full@l 755 root root $bindir/hp-toolbox ../share/hplip/toolbox.py
@epm_full@l 755 root root $bindir/hp-colorcal ../share/hplip/colorcal.py
diff -Naur hplip-3.9.10-old/Makefile.am hplip-3.9.10/Makefile.am
--- hplip-3.9.10-old/Makefile.am 2009-11-15 18:24:03.000000000 +0100
+++ hplip-3.9.10/Makefile.am 2009-11-15 18:27:20.000000000 +0100
@@ -9,6 +9,7 @@
hplipdir = $(datadir)/hplip
docdir = $(hpdocdir)
+htmldir = $(hphtmldir)
doc_DATA = COPYING copyright prnt/hpijs/README_LIBJPG
EXTRA_DIST = prnt/hpijs/gdevijs-krgb-1.5-gs8.61.patch prnt/hpijs/README_LIBJPG copyright
@@ -23,11 +24,11 @@
if DOC_BUILD
wwwsrc = doc
-www0dir = $(docdir)
+www0dir = $(htmldir)
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
-www3dir = $(docdir)/styles
+www3dir = $(htmldir)/styles
dist_www3_DATA = $(wwwsrc)/styles/*
-www4dir = $(docdir)/images
+www4dir = $(htmldir)/images
dist_www4_DATA = $(wwwsrc)/images/*
endif

@ -1,23 +0,0 @@
diff -Naur hplip-3.9.12-old/installer/core_install.py hplip-3.9.12/installer/core_install.py
--- hplip-3.9.12-old/installer/core_install.py 2009-12-15 22:22:13.000000000 +0100
+++ hplip-3.9.12/installer/core_install.py 2009-12-20 02:11:47.000000000 +0100
@@ -29,6 +29,7 @@
import grp
import pwd
import tarfile
+import commands # TODO: Replace with subprocess (commands is deprecated in Python 3.0)
try:
import hashlib # new in 2.5
@@ -1036,9 +1037,8 @@
def check_cupsddk(self):
log.debug("Checking for cups-ddk...")
# TODO: Compute these paths some way or another...
- #return check_tool("/usr/lib/cups/driver/drv list") and os.path.exists("/usr/share/cupsddk/include/media.defs")
- return (check_file('drv', "/usr/lib/cups/driver") or check_file('drv', "/usr/lib64/cups/driver")) and \
- check_file('media.defs', "/usr/share/cupsddk/include")
+ #return check_tool(commands.getoutput("cups-config --serverbin") + "/driver/drv list") and os.path.exists("/usr/share/cupsddk/include/media.defs")
+ return check_file('drv', commands.getoutput("cups-config --serverbin") + "/driver") and check_file('media.defs', "/usr/share/cupsddk/include")
def check_policykit(self):

@ -1,22 +0,0 @@
++ hplip-3.9.10/debian/patches/hplip-systray-longer-timeout-for-system-tray-start.dpatch
#! /bin/sh /usr/share/dpatch/dpatch-run
## hplip-systray-longer-timeout-for-system-tray-start.dpatch by <till.kamppeter@gmail.com>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
@DPATCH@
diff -urNad hplip-3.9.10~/ui4/systemtray.py hplip-3.9.10/ui4/systemtray.py
--- hplip-3.9.10~/ui4/systemtray.py 2009-11-17 21:23:42.000000000 +0100
+++ hplip-3.9.10/ui4/systemtray.py 2009-11-29 21:34:01.399929476 +0100
@@ -706,7 +706,7 @@
app.setQuitOnLastWindowClosed(False) # If not set, settings dlg closes app
i = 0
- while i < 10:
+ while i < 180:
if QSystemTrayIcon.isSystemTrayAvailable():
break
time.sleep(1.0)

@ -1,271 +0,0 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.12-r1.ebuild,v 1.6 2010/03/04 22:15:35 billie Exp $
EAPI=2
inherit fdo-mime linux-info python autotools
DESCRIPTION="HP Linux Imaging and Printing System. Includes printer, scanner, fax drivers and service tools."
HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc ppc64 x86"
# zeroconf does not work properly with >=cups-1.4. thus support for it is also disabled in hplip.
IUSE="doc fax gtk +hpcups hpijs libnotify minimal -new-hpcups parport policykit qt4 scanner snmp static-ppds -udev-acl"
COMMON_DEPEND="
media-libs/jpeg
hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
udev-acl? ( >=sys-fs/udev-145[extras] )
snmp? (
net-analyzer/net-snmp
dev-libs/openssl
)
!minimal? (
net-print/cups
virtual/libusb:0
>=dev-lang/python-2.4.4[threads,xml]
scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
fax? ( sys-apps/dbus )
)"
DEPEND="${COMMON_DEPEND}
dev-util/pkgconfig"
RDEPEND="${COMMON_DEPEND}
app-text/ghostscript-gpl
!static-ppds? ( || ( >=net-print/cups-1.4.0 net-print/cupsddk ) )
!minimal? (
dev-python/pygobject
kernel_linux? ( >=sys-fs/udev-114 )
scanner? (
gtk? ( media-gfx/xsane )
!gtk? ( || ( media-gfx/sane-frontends dev-python/imaging ) )
)
fax? (
dev-python/reportlab
dev-python/dbus-python
)
qt4? (
dev-python/PyQt4[dbus,X]
libnotify? (
dev-python/notify-python
)
policykit? (
sys-auth/policykit
)
)
)"
CONFIG_CHECK="~PARPORT ~PPDEV"
ERROR_PARPORT="Please make sure parallel port support is enabled in your kernel (PARPORT and PPDEV)."
pkg_setup() {
! use qt4 && ewarn "You need USE=qt4 for the hplip GUI."
use scanner && ! use gtk && ewarn "You need USE=gtk for the scanner GUI."
if ! use hpcups && ! use hpijs ; then
ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
ewarn "which is probably not what you want."
ewarn "You will almost certainly not be able to print."
ewarn "Recommended USE flags: USE=\"hpcups -hpijs\")."
fi
if use minimal ; then
ewarn "Installing driver portions only, make sure you know what you are doing."
ewarn "Depending on the USE flags set for hpcups and/or hpijs the appropiate"
ewarn "drivers are installed."
else
use parport && linux-info_pkg_setup
fi
}
src_prepare() {
# Do not install desktop files if there is no gui
# Upstream bug: https://bugs.launchpad.net/hplip/+bug/452113
epatch "${FILESDIR}"/${PN}-3.9.10-desktop.patch
# Browser detection through xdg-open
# Upstream bug: https://bugs.launchpad.net/hplip/+bug/482674
epatch "${FILESDIR}"/${PN}-3.9.10-browser.patch
# Use cups-config when checking for cupsddk
# Upstream bug: https://bugs.launchpad.net/hplip/+bug/483136
epatch "${FILESDIR}"/${P}-cupsddk.patch
# htmldocs are not installed under docdir/html so enable htmldir configure switch
# Upstream bug: https://bugs.launchpad.net/hplip/+bug/483217
epatch "${FILESDIR}"/${PN}-3.9.10-htmldir.patch
# Increase systray check timeout for slower machines
# Upstream bug: https://bugs.launchpad.net/hplip/+bug/335662
epatch "${FILESDIR}"/${PN}-3.9.12-systray.patch
# SYSFS deprecated but kept upstream for compatibility reasons
# Upstream bug: https://bugs.launchpad.net/hplip/+bug/346390
sed -i -e "s/SYSFS/ATTRS/g" -e "s/sysfs/attrs/g" data/rules/56-hpmud_support.rules \
data/rules/55-hpmud.rules || die
# Force recognition of Gentoo distro by hp-check
sed -i \
-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
installer/core_install.py || die
# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
# The hpcups driver does not use foomatic-rip
local i
for i in ppd/hpijs/*.ppd.gz
do
rm -f ${i}.temp
gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | gzip > ${i}.temp || die
mv ${i}.temp ${i}
done
local qt_ver
if use qt4 ; then
qt_ver="4"
sed -i \
-e "s/%s --force-startup/%s --force-startup --qt${qt_ver}/" \
-e "s/'--force-startup'/'--force-startup', '--qt${qt_ver}'/" \
base/device.py || die
sed -i \
-e "s/Exec=hp-systray/Exec=hp-systray --qt${qt_ver}/" \
hplip-systray.desktop.in || die
fi
eautoreconf
}
src_configure() {
local gui_build myconf drv_build minimal_build
if use qt4 ; then
gui_build="--enable-gui-build --enable-qt4 --disable-qt3"
if use policykit ; then
myconf="--enable-policykit"
else
myconf="--disable-policykit"
fi
else
gui_build="--disable-gui-build --disable-qt3 --disable-qt4"
fi
if use fax || use qt4 ; then
myconf="${myconf} --enable-dbus-build"
else
myconf="${myconf} --disable-dbus-build"
fi
if use hpcups ; then
drv_build="$(use_enable hpcups hpcups-install)"
if use static-ppds ; then
drv_build="${drv_build} --enable-cups-ppd-install"
drv_build="${drv_build} --disable-cups-drv-install"
else
drv_build="${drv_build} --enable-cups-drv-install"
drv_build="${drv_build} --disable-cups-ppd-install"
fi
else
drv_build="--disable-hpcups-install --disable-cups-drv-install"
drv_build="${drv_build} --disable-cups-ppd-install"
fi
if use hpijs ; then
drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
if use static-ppds ; then
drv_build="${drv_build} --enable-foomatic-ppd-install"
drv_build="${drv_build} --disable-foomatic-drv-install"
else
drv_build="${drv_build} --enable-foomatic-drv-install"
drv_build="${drv_build} --disable-foomatic-ppd-install"
fi
else
drv_build="${drv_build} --disable-hpijs-install"
drv_build="${drv_build} --disable-foomatic-drv-install"
drv_build="${drv_build} --disable-foomatic-ppd-install"
fi
if use minimal ; then
if use hpijs ; then
minimal_build="--enable-hpijs-only-build"
else
minimal_build="--disable-hpijs-only-build"
fi
if use hpcups ; then
minimal_build="${minimal_build} --enable-hpcups-only-build"
else
minimal_build="${minimal_build} --disable-hpcups-only-build"
fi
fi
econf \
--disable-dependency-tracking \
--disable-cups11-build \
--disable-lite-build \
--disable-foomatic-rip-hplip-install \
--disable-shadow-build \
--with-cupsbackenddir=$(cups-config --serverbin)/backend \
--with-cupsfilterdir=$(cups-config --serverbin)/filter \
--with-htmldir=/usr/share/doc/${P}/html \
${gui_build} \
${myconf} \
${drv_build} \
${minimal_build} \
$(use_enable new-hpcups new-hpcups) \
$(use_enable doc doc-build) \
$(use_enable fax fax-build) \
$(use_enable parport pp-build) \
$(use_enable scanner scan-build) \
$(use_enable snmp network-build) \
$(use_enable udev-acl udev-acl-rules)
}
src_install() {
emake DESTDIR="${D}" install || die
# Installed by sane-backends
# Gentoo Bug: #201023
rm -f "${D}"/etc/sane.d/dll.conf || die
# kde3 autostart hack
if [[ -d /usr/kde/3.5/share/autostart ]] && use !minimal ; then
insinto /usr/kde/3.5/share/autostart
doins hplip-systray.desktop || die
fi
}
pkg_preinst() {
# avoid collisions with cups-1.2 compat symlinks
if [ -e "${ROOT}"/usr/lib/cups/backend/hp ] && [ -e "${ROOT}"/usr/libexec/cups/backend/hp ] ; then
rm "${ROOT}"/usr/libexec/cups/backend/hp{,fax} || die
fi
}
pkg_postinst() {
use !minimal && python_mod_optimize /usr/share/${PN}
fdo-mime_desktop_database_update
elog "You should run hp-setup as root if you are installing hplip for the first time,"
elog "and may also need to run it if you are upgrading from an earlier version."
elog
elog "If your device is connected using USB, users will need to be in the lp group to"
elog "access it."
elog
elog "This release doesn't use an init script anymore, so you should probably do a"
elog "'rc-update del hplip' if you are updating from an old version."
elog
elog "Starting with versions of hplip >=3.9.8 mDNS is the default network search"
elog "mechanism. To make use of it you need to activate the zeroconf flag on cups."
elog "If you prefer the SLP method you have to choose this when configuring the"
elog "device."
}
pkg_postrm() {
use !minimal && python_mod_cleanup /usr/share/${PN}
fdo-mime_desktop_database_update
}
Loading…
Cancel
Save