This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via b15f209f2c10203c1891d3e9c577efb7eb71149d (commit) via ab78971e7fc0fb4bed168ccc3d8bf120900f192e (commit) via 89c275d0304a887419cc86d8cfb6f1c642023812 (commit) via 65e800c690e57b8c18f383bd9a626a3eb76ee7d7 (commit) via 667846e015ceeb9951b561a2cd1c9f7321dad8ca (commit) from 46c1fa3666c37d41325c9f57ff9c95fc2b547d5e (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit b15f209f2c10203c1891d3e9c577efb7eb71149d Merge: ab78971e7fc0fb4bed168ccc3d8bf120900f192e 89c275d0304a887419cc86d8cfb6f1c642023812 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Apr 20 14:08:04 2010 +0200
Merge remote branch 'stevee/hplip'
commit ab78971e7fc0fb4bed168ccc3d8bf120900f192e Merge: 46c1fa3666c37d41325c9f57ff9c95fc2b547d5e 65e800c690e57b8c18f383bd9a626a3eb76ee7d7 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Apr 20 14:06:24 2010 +0200
Merge remote branch 'stevee/fuse'
commit 89c275d0304a887419cc86d8cfb6f1c642023812 Author: Schantl Stefan Stevee@ipfire.org Date: Sun Apr 18 17:03:48 2010 +0200
hplip: Add patch to fix udev rules issue.
commit 65e800c690e57b8c18f383bd9a626a3eb76ee7d7 Author: Schantl Stefan Stevee@ipfire.org Date: Sun Apr 18 16:41:35 2010 +0200
fuse: Create devel-package.
commit 667846e015ceeb9951b561a2cd1c9f7321dad8ca Author: Schantl Stefan Stevee@ipfire.org Date: Sun Apr 18 16:41:07 2010 +0200
fuse: Update to version 2.8.3.
-----------------------------------------------------------------------
Summary of changes: pkgs/core/fuse/fuse.nm | 7 +++++-- .../hplip/patches/hplip-3.10.2-udev-rules.patch | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 pkgs/core/hplip/patches/hplip-3.10.2-udev-rules.patch
Difference in files: diff --git a/pkgs/core/fuse/fuse.nm b/pkgs/core/fuse/fuse.nm index 22f5b7f..57b95c9 100644 --- a/pkgs/core/fuse/fuse.nm +++ b/pkgs/core/fuse/fuse.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include
PKG_NAME = fuse -PKG_VER = 2.7.4 +PKG_VER = 2.8.3 PKG_REL = 0
PKG_MAINTAINER = @@ -34,6 +34,8 @@ PKG_URL = http://fuse.sf.net/ PKG_LICENSE = GPL+ PKG_SUMMARY = File System in Userspace (FUSE) utilities.
+PKG_PACKAGES += $(PKG_NAME_REAL)-devel + define PKG_DESCRIPTION With FUSE it is possible to implement a fully functional \ filesystem in a userspace program. This package contains the \ @@ -43,7 +45,8 @@ endef PKG_TARBALL = $(THISAPP).tar.gz
CONFIGURE_OPTIONS += \ - --disable-kernel-module + --disable-static \ + --disable-rpath
define STAGE_INSTALL_CMDS rm -vrf $(BUILDROOT)/etc/init.d diff --git a/pkgs/core/hplip/patches/hplip-3.10.2-udev-rules.patch b/pkgs/core/hplip/patches/hplip-3.10.2-udev-rules.patch new file mode 100644 index 0000000..49cb808 --- /dev/null +++ b/pkgs/core/hplip/patches/hplip-3.10.2-udev-rules.patch @@ -0,0 +1,17 @@ +diff -up hplip-3.10.2/data/rules/56-hpmud_support.rules.udev-rules hplip-3.10.2/data/rules/56-hpmud_support.rules +--- hplip-3.10.2/data/rules/56-hpmud_support.rules.udev-rules 2010-03-01 11:21:01.049740484 +0000 ++++ hplip-3.10.2/data/rules/56-hpmud_support.rules 2010-03-01 11:21:07.288609454 +0000 +@@ -7,8 +7,9 @@ SUBSYSTEM!="usb_device", GOTO="hpmud_rul + LABEL="pid_test" + + # Check for LaserJet products (0x03f0xx17). +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes" ++ENV{ID_USB_INTERFACES}=="", IMPORT{program}="usb_id --export %p" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", ENV{hp_model}="$attr{product}", ENV{hp_test}="yes" + +-ENV{hp_test}=="yes", RUN+="bin/sh -c '/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"
hooks/post-receive -- IPFire 3.x development tree