[Pkg-utopia-commits] r3212 - /packages/unstable/hal/debian/patches/50_kfreebsd.patch

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Fri Aug 14 12:13:35 UTC 2009 

Author: biebl
Date: Fri Aug 14 12:13:35 2009
New Revision: 3212

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3212
Log:
Refresh patch to apply cleanly

Modified:
    packages/unstable/hal/debian/patches/50_kfreebsd.patch

Modified: packages/unstable/hal/debian/patches/50_kfreebsd.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/patches/50_kfreebsd.patch?rev=3212&op=diff
==============================================================================
--- packages/unstable/hal/debian/patches/50_kfreebsd.patch (original)
+++ packages/unstable/hal/debian/patches/50_kfreebsd.patch Fri Aug 14 12:13:35 2009
@@ -1,6 +1,8 @@
---- a/hald/freebsd/libprobe/Makefile.am
-+++ b/hald/freebsd/libprobe/Makefile.am
-@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
+Index: hal-0.5.13/hald/freebsd/libprobe/Makefile.am
+===================================================================
+--- hal-0.5.13.orig/hald/freebsd/libprobe/Makefile.am	2008-08-10 15:50:10.000000000 +0200
++++ hal-0.5.13/hald/freebsd/libprobe/Makefile.am	2009-08-14 14:12:32.000000000 +0200
+@@ -8,7 +8,7 @@
  	@DBUS_CFLAGS@
  
  if HALD_COMPILE_FREEBSD
@@ -9,9 +11,11 @@
  endif
  
  libhald_freebsd_probe_la_SOURCES = \
---- a/hald/freebsd/libprobe/Makefile.in
-+++ b/hald/freebsd/libprobe/Makefile.in
-@@ -42,15 +42,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+Index: hal-0.5.13/hald/freebsd/libprobe/Makefile.in
+===================================================================
+--- hal-0.5.13.orig/hald/freebsd/libprobe/Makefile.in	2009-07-15 09:03:12.000000000 +0200
++++ hal-0.5.13/hald/freebsd/libprobe/Makefile.in	2009-08-14 14:12:32.000000000 +0200
+@@ -42,15 +42,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -28,7 +32,7 @@
  libhald_freebsd_probe_la_LIBADD =
  am_libhald_freebsd_probe_la_OBJECTS = hfp.lo hfp-cdrom.lo
  libhald_freebsd_probe_la_OBJECTS =  \
-@@ -58,8 +50,7 @@ libhald_freebsd_probe_la_OBJECTS =  \
+@@ -58,8 +50,7 @@
  libhald_freebsd_probe_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
  	$(libhald_freebsd_probe_la_LDFLAGS) $(LDFLAGS) -o $@
@@ -38,7 +42,7 @@
  DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
-@@ -244,7 +235,7 @@ AM_CPPFLAGS = \
+@@ -244,7 +235,7 @@
  	-I$(top_srcdir) -I.. \
  	@DBUS_CFLAGS@
  
@@ -47,7 +51,7 @@
  libhald_freebsd_probe_la_SOURCES = \
  	hfp.c		\
  	hfp.h		\
-@@ -285,28 +276,10 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+@@ -285,28 +276,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -79,7 +83,7 @@
  	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
  	  test "$$dir" != "$$p" || dir=.; \
  	  echo "rm -f \"$${dir}/so_locations\""; \
-@@ -428,9 +401,6 @@ check-am: all-am
+@@ -428,9 +401,6 @@
  check: check-am
  all-am: Makefile $(LTLIBRARIES)
  installdirs:
@@ -89,7 +93,7 @@
  install: install-am
  install-exec: install-exec-am
  install-data: install-data-am
-@@ -457,7 +427,7 @@ maintainer-clean-generic:
+@@ -457,7 +427,7 @@
  	@echo "it deletes files that may require special tools to rebuild."
  clean: clean-am
  
@@ -98,7 +102,7 @@
  	mostlyclean-am
  
  distclean: distclean-am
-@@ -480,7 +450,7 @@ install-data-am:
+@@ -480,7 +450,7 @@
  
  install-dvi: install-dvi-am
  
@@ -107,7 +111,7 @@
  
  install-html: install-html-am
  
-@@ -512,23 +482,22 @@ ps: ps-am
+@@ -512,23 +482,22 @@
  
  ps-am:
  
@@ -139,9 +143,11 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
---- a/hald/freebsd/probing/Makefile.am
-+++ b/hald/freebsd/probing/Makefile.am
-@@ -30,15 +30,15 @@ hald_probe_scsi_LDADD = \
+Index: hal-0.5.13/hald/freebsd/probing/Makefile.am
+===================================================================
+--- hal-0.5.13.orig/hald/freebsd/probing/Makefile.am	2008-08-10 15:50:10.000000000 +0200
++++ hal-0.5.13/hald/freebsd/probing/Makefile.am	2009-08-14 14:12:32.000000000 +0200
+@@ -30,15 +30,15 @@
  	$(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
  
  hald_probe_storage_SOURCES = freebsd_dvd_rw_utils.c freebsd_dvd_rw_utils.h probe-storage.c
@@ -161,8 +167,10 @@
 -	@VOLUME_ID_LIBS@						\
 +	@BLKID_LIBS@						\
  	$(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
---- a/hald/freebsd/probing/Makefile.in
-+++ b/hald/freebsd/probing/Makefile.in
+Index: hal-0.5.13/hald/freebsd/probing/Makefile.in
+===================================================================
+--- hal-0.5.13.orig/hald/freebsd/probing/Makefile.in	2009-07-15 09:03:12.000000000 +0200
++++ hal-0.5.13/hald/freebsd/probing/Makefile.in	2009-08-14 14:12:32.000000000 +0200
 @@ -272,17 +272,17 @@
  	$(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
  
@@ -185,9 +193,10 @@
  	$(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
  
  all: all-am
-
---- a/hald/freebsd/addons/addon-storage.c
-+++ b/hald/freebsd/addons/addon-storage.c
+Index: hal-0.5.13/hald/freebsd/addons/addon-storage.c
+===================================================================
+--- hal-0.5.13.orig/hald/freebsd/addons/addon-storage.c	2008-08-10 15:50:10.000000000 +0200
++++ hal-0.5.13/hald/freebsd/addons/addon-storage.c	2009-08-14 14:12:32.000000000 +0200
 @@ -181,10 +181,12 @@
  static void
  update_proc_title (const char *device, boolean polling_enabled)
@@ -201,8 +210,10 @@
  }
  
  static DBusHandlerResult
---- a/hald/freebsd/probing/probe-storage.c
-+++ b/hald/freebsd/probing/probe-storage.c
+Index: hal-0.5.13/hald/freebsd/probing/probe-storage.c
+===================================================================
+--- hal-0.5.13.orig/hald/freebsd/probing/probe-storage.c	2008-08-10 15:50:10.000000000 +0200
++++ hal-0.5.13/hald/freebsd/probing/probe-storage.c	2009-08-14 14:12:32.000000000 +0200
 @@ -33,7 +33,7 @@
  #include <sys/types.h>
  #include <netinet/in.h>
@@ -269,8 +280,10 @@
      }
  
   end:
---- a/hald/freebsd/probing/probe-hiddev.c
-+++ b/hald/freebsd/probing/probe-hiddev.c
+Index: hal-0.5.13/hald/freebsd/probing/probe-hiddev.c
+===================================================================
+--- hal-0.5.13.orig/hald/freebsd/probing/probe-hiddev.c	2008-08-10 15:50:10.000000000 +0200
++++ hal-0.5.13/hald/freebsd/probing/probe-hiddev.c	2009-08-14 14:12:32.000000000 +0200
 @@ -62,8 +62,10 @@
    if (fd < 0)
      goto end;
@@ -282,7 +295,7 @@
  
    if (ioctl(fd, USB_GET_REPORT_ID, &report_id) < 0)
      goto end;
-@@ -120,30 +120,22 @@
+@@ -118,30 +120,22 @@
  
    hid_dispose_report_desc(report_desc);
  
@@ -315,8 +328,10 @@
  
   end:
    return 0;
---- a/hald/freebsd/probing/probe-scsi.c
-+++ b/hald/freebsd/probing/probe-scsi.c
+Index: hal-0.5.13/hald/freebsd/probing/probe-scsi.c
+===================================================================
+--- hal-0.5.13.orig/hald/freebsd/probing/probe-scsi.c	2008-08-10 15:50:10.000000000 +0200
++++ hal-0.5.13/hald/freebsd/probing/probe-scsi.c	2009-08-14 14:12:32.000000000 +0200
 @@ -47,8 +47,10 @@
    if (! device_file)
      goto end;
@@ -328,8 +343,10 @@
  
    /* cam_open_device() fails unless we use O_RDWR */
    cam = cam_open_device(device_file, O_RDWR);
---- a/hald/freebsd/probing/probe-volume.c
-+++ b/hald/freebsd/probing/probe-volume.c
+Index: hal-0.5.13/hald/freebsd/probing/probe-volume.c
+===================================================================
+--- hal-0.5.13.orig/hald/freebsd/probing/probe-volume.c	2008-08-10 15:50:10.000000000 +0200
++++ hal-0.5.13/hald/freebsd/probing/probe-volume.c	2009-08-14 14:12:32.000000000 +0200
 @@ -39,7 +39,7 @@
  #include <sys/types.h>
  #include <isofs/cd9660/iso.h>
@@ -500,9 +517,10 @@
   end:
    return ret;
  }
-
---- a/hald/freebsd/hf-computer.c
-+++ b/hald/freebsd/hf-computer.c
+Index: hal-0.5.13/hald/freebsd/hf-computer.c
+===================================================================
+--- hal-0.5.13.orig/hald/freebsd/hf-computer.c	2009-05-27 22:26:03.000000000 +0200
++++ hal-0.5.13/hald/freebsd/hf-computer.c	2009-08-14 14:12:32.000000000 +0200
 @@ -133,11 +133,11 @@
    if (PACKAGE_VERSION) {
        int major, minor, micro;
@@ -518,9 +536,11 @@
 +        hal_device_property_set_int (device, "org.freedesktop.Hal.version.micro", micro);
        }
    }
-
---- a/hald/freebsd/hf-util.c
-+++ b/hald/freebsd/hf-util.c
+ 
+Index: hal-0.5.13/hald/freebsd/hf-util.c
+===================================================================
+--- hal-0.5.13.orig/hald/freebsd/hf-util.c	2008-08-10 15:50:10.000000000 +0200
++++ hal-0.5.13/hald/freebsd/hf-util.c	2009-08-14 14:12:32.000000000 +0200
 @@ -326,24 +326,31 @@
  
  void
@@ -562,8 +582,10 @@
  
    if (devname)
      hf_device_property_set_string_printf(device, "input.device", "/dev/%s", devname);
---- a/hald/freebsd/hf-usb.c
-+++ b/hald/freebsd/hf-usb.c
+Index: hal-0.5.13/hald/freebsd/hf-usb.c
+===================================================================
+--- hal-0.5.13.orig/hald/freebsd/hf-usb.c	2008-08-10 15:50:10.000000000 +0200
++++ hal-0.5.13/hald/freebsd/hf-usb.c	2009-08-14 14:12:32.000000000 +0200
 @@ -424,9 +424,9 @@
      hf_devtree_device_set_name(device, di->udi_devnames[0]);
  
@@ -576,8 +598,10 @@
    else if ((devname = hf_usb_get_devname(di, "uhid")))	/* UHID device */
      {
        hal_device_property_set_string(device, "info.category", "hiddev");
---- a/hald/freebsd/hf-util.h
-+++ b/hald/freebsd/hf-util.h
+Index: hal-0.5.13/hald/freebsd/hf-util.h
+===================================================================
+--- hal-0.5.13.orig/hald/freebsd/hf-util.h	2008-08-10 15:50:10.000000000 +0200
++++ hal-0.5.13/hald/freebsd/hf-util.h	2009-08-14 14:12:32.000000000 +0200
 @@ -87,7 +87,8 @@
  					   ...) G_GNUC_PRINTF(3, 4);
  
@@ -588,8 +612,10 @@
  			  const char *devname);
  
  HalDevice *hf_device_store_get_parent (HalDeviceStore *store,
---- a/hald/freebsd/hf-devtree.c
-+++ b/hald/freebsd/hf-devtree.c
+Index: hal-0.5.13/hald/freebsd/hf-devtree.c
+===================================================================
+--- hal-0.5.13.orig/hald/freebsd/hf-devtree.c	2008-08-10 15:50:10.000000000 +0200
++++ hal-0.5.13/hald/freebsd/hf-devtree.c	2009-08-14 14:12:32.000000000 +0200
 @@ -186,7 +186,7 @@
  static void
  hf_devtree_atkbd_set_properties (HalDevice *device)

More information about the Pkg-utopia-commits mailing list