Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (578bfb484966d97865df2822d1b1910d2d47103d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (578bfb484966d97865df2822d1b1910d2d47103d)
  • Date: Sun, 15 Nov 2009 13:59:27 -0600

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

disk/udev/DETAILS | 2 +-
disk/udev/HISTORY | 5 +++++
disk/udev/PRE_BUILD | 2 --
disk/udev/libusb.diff | 14 --------------
gnome2-libs/devicekit-disks/DEPENDS | 2 +-
gnome2-libs/devicekit-disks/HISTORY | 3 +++
6 files changed, 10 insertions(+), 18 deletions(-)

New commits:
commit e95e715a1e65d1ec76b93546814ee6fe82018f58
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

udev: => 147

commit a8baeecf5891aa5f1adb38ead2407b6343e69ff1
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

devicekit-disks - adjust depends

diff --git a/disk/udev/DETAILS b/disk/udev/DETAILS
index c3ae472..ad0da37 100755
--- a/disk/udev/DETAILS
+++ b/disk/udev/DETAILS
@@ -1,5 +1,5 @@
SPELL=udev
- VERSION=146
+ VERSION=147
PATCHLEVEL=2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index 0e50f35..fe2e0a7 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,8 @@
+2009-11-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 147
+ * libusb.diff: deleted
+ * PRE_BUILD: don't applu libusb.diff
+
2009-10-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
* SUB_DEPENDS: remove --disable-extras from UDEV_OPTS if
EXTRAS sub_depends is requested, otherwise fails to actually build
diff --git a/disk/udev/PRE_BUILD b/disk/udev/PRE_BUILD
index a8f2fa9..7a4278e 100755
--- a/disk/udev/PRE_BUILD
+++ b/disk/udev/PRE_BUILD
@@ -15,7 +15,5 @@ else
default_pre_build &&
cd "$SOURCE_DIRECTORY"
fi &&
-# temporary patch for lib/usb/cups
-patch -p1 < $SPELL_DIRECTORY/libusb.diff &&

sed -i "s:install-dist_udevconfDATA::g" Makefile.in
diff --git a/disk/udev/libusb.diff b/disk/udev/libusb.diff
deleted file mode 100644
index 4d671cd..0000000
--- a/disk/udev/libusb.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur udev-146/rules/rules.d/50-udev-default.rules
udev-146.cp/rules/rules.d/50-udev-default.rules
---- udev-146/rules/rules.d/50-udev-default.rules 2009-08-08
15:42:05.000000000 +0200
-+++ udev-146.cp/rules/rules.d/50-udev-default.rules 2009-10-11
15:06:54.000000000 +0200
-@@ -60,6 +60,10 @@
- SUBSYSTEM=="usb", KERNEL=="lp*", NAME="usb/%k",
SYMLINK+="usb%k", GROUP="lp"
- KERNEL=="lp[0-9]*", GROUP="lp"
- KERNEL=="irlpt[0-9]*", GROUP="lp"
-+# hplip and cups 1.4+ use raw USB devices, so permissions should be similar
to
-+# the ones from the old usblp kernel module
-+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="",
IMPORT{program}="usb_id --export %p"
-+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device",
ENV{ID_USB_INTERFACES}==":0701*:", GROUP="lp", MODE="660"
-
- # block
- SUBSYSTEM=="block", GROUP="disk"
diff --git a/gnome2-libs/devicekit-disks/DEPENDS
b/gnome2-libs/devicekit-disks/DEPENDS
index 251b5f9..a2d9d13 100755
--- a/gnome2-libs/devicekit-disks/DEPENDS
+++ b/gnome2-libs/devicekit-disks/DEPENDS
@@ -3,7 +3,7 @@ depends lvm &&
depends libatasmart &&
depends parted &&
depends sg3_utils &&
-depends policykit-gnome &&
+depends policykit &&
optional_depends man \
"--enable-man-pages" \
"--disable-man-pages" \
diff --git a/gnome2-libs/devicekit-disks/HISTORY
b/gnome2-libs/devicekit-disks/HISTORY
index f2cf843..c409c7a 100644
--- a/gnome2-libs/devicekit-disks/HISTORY
+++ b/gnome2-libs/devicekit-disks/HISTORY
@@ -1,3 +1,6 @@
+2009-11-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: policykit-gnome -> policykit
+
2009-11-11 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: add sg3_utils, policykit-gnome




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (578bfb484966d97865df2822d1b1910d2d47103d), Treeve Jelbert, 11/15/2009

Archive powered by MHonArc 2.6.24.

Top of Page