[Pkg-utopia-commits] r1033 - in packages/unstable/hal/debian: .
patches
Sjoerd Simons
sjoerd at costa.debian.org
Tue Sep 26 19:27:09 UTC 2006
Author: sjoerd
Date: 2006-09-26 19:27:09 +0000 (Tue, 26 Sep 2006)
New Revision: 1033
Added:
packages/unstable/hal/debian/patches/03_macbookpro_configure.patch
Removed:
packages/unstable/hal/debian/patches/03_use_kernel_headers.patch
packages/unstable/hal/debian/patches/04_runner_return_overflow.patch
Modified:
packages/unstable/hal/debian/changelog
packages/unstable/hal/debian/rules
Log:
* Update to build hal 0.5.8.1
Modified: packages/unstable/hal/debian/changelog
===================================================================
--- packages/unstable/hal/debian/changelog 2006-09-25 20:57:31 UTC (rev 1032)
+++ packages/unstable/hal/debian/changelog 2006-09-26 19:27:09 UTC (rev 1033)
@@ -1,7 +1,7 @@
-hal (0.5.8-1) UNRELEASED; urgency=low
+hal (0.5.8.1-1) UNRELEASED; urgency=low
* New upstream release
- * debian/patches/01_hal_debian_dbuspolicy.patch
+ u debian/patches/01_hal_debian_dbuspolicy.patch
- Updated.
* debian/patches/05_pmu_nohibernate.patch
- Removed. Recent kernels don't crash my machine anymore
@@ -31,18 +31,16 @@
* debian/control: Add build-depend on libvolume-id-dev
* debian/patches/23_addon_acpi.patch
- Updated.
- * debian/patches/03_use_kernel_headers.patch
- - Use kernel headers for ARPHRD_IEEE80211_RADIOTAP definition and the
- like. (From upstream git)
* debian/control: Add linux-kernel-headers (>= 2.6.17) to the build-depends
for the definition of ARPHRD_IEEE80211_RADIOTAP
* debian/hal.install: Scripts are no longer in /usr/share/hal but in
/usr/lib/hal
- * debian/patches/04_runner_return_overflow.patch
- - Added. Don't try to push a 64 bit value in 32 bit. Fixes a crash when a
- probe/addon failes. (From upstream git)
+ * debian/patches/03_macbookpro_configure.patch
+ - Added. Change configure so the macbook pro utils can actually be
+ disabled.
+ * debian/rules: Disable the macbook pro backlight addon.
- -- Sjoerd Simons <sjoerd at debian.org> Sun, 17 Sep 2006 19:35:31 +0200
+ -- Sjoerd Simons <sjoerd at debian.org> Tue, 26 Sep 2006 21:11:18 +0200
hal (0.5.7.1-2) unstable; urgency=low
Added: packages/unstable/hal/debian/patches/03_macbookpro_configure.patch
===================================================================
--- packages/unstable/hal/debian/patches/03_macbookpro_configure.patch (rev 0)
+++ packages/unstable/hal/debian/patches/03_macbookpro_configure.patch 2006-09-26 19:27:09 UTC (rev 1033)
@@ -0,0 +1,14 @@
+--- hal-0.5.8.1.vanilla/configure 2006-09-19 22:24:41.000000000 +0200
++++ hal-0.5.8.1/configure 2006-09-26 21:09:20.000000000 +0200
+@@ -22383,9 +22383,9 @@
+
+ fi;
+ BUILD_MACBOOKPRO=no
+-if test "x$use_macbookpro" = "xyes" ; then
++if test "x$with_macbookpro" = "xyes" ; then
+ BUILD_MACBOOKPRO=yes
+-elif test "x$use_macbookpro" = "x" ; then
++elif test "x$with_macbookpro" = "x" ; then
+ if test "$HAVE_LIBPCI" != "false" ; then
+ case "${host}" in
+ i[3456]86-*-linux*)
Deleted: packages/unstable/hal/debian/patches/03_use_kernel_headers.patch
===================================================================
--- packages/unstable/hal/debian/patches/03_use_kernel_headers.patch 2006-09-25 20:57:31 UTC (rev 1032)
+++ packages/unstable/hal/debian/patches/03_use_kernel_headers.patch 2006-09-26 19:27:09 UTC (rev 1033)
@@ -1,21 +0,0 @@
-commit 025d3781e2c8fd0133934fd4c94e55d0178940c7
-Author: S.Çağlar Onur <caglar at pardus.org.tr>
-Date: Wed Sep 13 17:25:31 2006 -0400
-
- get ARPHRD_IEEE80211_RADIOTAP and similar from kernel, not glibc headers
-
-diff --git a/hald/linux/classdev.c b/hald/linux/classdev.c
-index 4e6d2c2..e29a61b 100644
---- a/hald/linux/classdev.c
-+++ b/hald/linux/classdev.c
-@@ -31,8 +31,9 @@ #endif
-
- #include <ctype.h>
- #include <limits.h>
-+#include <sys/socket.h> /* for ifru_* has incomplete type */
- #include <linux/types.h>
--#include <net/if_arp.h> /* for ARPHRD_... */
-+#include <linux/if_arp.h> /* for ARPHRD_... */
- #include <stdlib.h>
- #include <string.h>
- #include <stdint.h>
Deleted: packages/unstable/hal/debian/patches/04_runner_return_overflow.patch
===================================================================
--- packages/unstable/hal/debian/patches/04_runner_return_overflow.patch 2006-09-25 20:57:31 UTC (rev 1032)
+++ packages/unstable/hal/debian/patches/04_runner_return_overflow.patch 2006-09-26 19:27:09 UTC (rev 1033)
@@ -1,37 +0,0 @@
-commit 482a82f7f06303467b86f18cc9db793514660a78
-Author: David Zeuthen <davidz at redhat.com>
-Date: Wed Sep 13 20:04:52 2006 -0400
-
- fix up overflow of 32-bit variable when getting 64-bit value
-
-diff --git a/hald/hald_runner.c b/hald/hald_runner.c
-index 4fa7b44..0d80683 100644
---- a/hald/hald_runner.c
-+++ b/hald/hald_runner.c
-@@ -104,20 +104,21 @@ runner_server_message_handler (DBusConne
- dbus_message_get_path (message),
- dbus_message_get_interface (message),
- dbus_message_get_member (message)));*/
--
- if (dbus_message_is_signal (message,
- "org.freedesktop.HalRunner",
- "StartedProcessExited")) {
-- GPid pid;
-+ dbus_uint64_t dpid;
- DBusError error;
- dbus_error_init (&error);
- if (dbus_message_get_args (message, &error,
-- DBUS_TYPE_INT64, &pid,
-- DBUS_TYPE_INVALID)) {
-+ DBUS_TYPE_INT64, &dpid,
-+ DBUS_TYPE_INVALID)) {
- RunningProcess *rp;
-+ GPid pid;
-
-- /*HAL_INFO (("Previously started process with pid %d exited", pid));*/
-+ pid = (GPid) dpid;
-
-+ /*HAL_INFO (("Previously started process with pid %d exited", pid));*/
- rp = g_hash_table_lookup (running_processes, (gpointer) pid);
- if (rp != NULL) {
- rp->cb (rp->device, 0, 0, NULL, rp->data1, rp->data2);
Modified: packages/unstable/hal/debian/rules
===================================================================
--- packages/unstable/hal/debian/rules 2006-09-25 20:57:31 UTC (rev 1032)
+++ packages/unstable/hal/debian/rules 2006-09-26 19:27:09 UTC (rev 1033)
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-DEB_TAR_SRCDIR=hal-0.5.8
+DEB_TAR_SRCDIR=hal-0.5.8.1
include /usr/share/cdbs/1/rules/tarball.mk
include /usr/share/cdbs/1/rules/debhelper.mk
@@ -13,6 +13,7 @@
--with-pid-file=/var/run/hal/hald.pid \
--enable-pcmcia-support \
--with-hwdata=/usr/share/misc \
+ --without-macbookpro \
--disable-policy-kit
binary-predeb/hal-device-manager::
More information about the Pkg-utopia-commits
mailing list