[Pkg-utopia-commits] r3178 - in /packages/experimental/hal/debian/patches: 10-no-polkit-policy-file-validate-check.patch 50_kfreebsd.patch

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Tue Jul 28 02:54:30 UTC 2009 

Author: biebl
Date: Tue Jul 28 02:54:28 2009
New Revision: 3178

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3178
Log:
- Forgot to add 50_kfreebsd.patch in r3176, so doing it now
- Refresh 10-no-polkit-policy-file-validate-check.patch

Added:
    packages/experimental/hal/debian/patches/50_kfreebsd.patch
Modified:
    packages/experimental/hal/debian/patches/10-no-polkit-policy-file-validate-check.patch

Modified: packages/experimental/hal/debian/patches/10-no-polkit-policy-file-validate-check.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/hal/debian/patches/10-no-polkit-policy-file-validate-check.patch?rev=3178&op=diff
==============================================================================
--- packages/experimental/hal/debian/patches/10-no-polkit-policy-file-validate-check.patch (original)
+++ packages/experimental/hal/debian/patches/10-no-polkit-policy-file-validate-check.patch Tue Jul 28 02:54:28 2009
@@ -1,8 +1,8 @@
-Index: hal-0.5.12/configure.in
+Index: hal-0.5.13/configure.in
 ===================================================================
---- hal-0.5.12.orig/configure.in	2009-03-16 04:22:46.000000000 +0100
-+++ hal-0.5.12/configure.in	2009-03-16 04:23:02.000000000 +0100
-@@ -589,7 +589,7 @@
+--- hal-0.5.13.orig/configure.in	2009-07-15 08:52:51.000000000 +0200
++++ hal-0.5.13/configure.in	2009-07-17 01:40:33.000000000 +0200
+@@ -590,7 +590,7 @@
     AC_CHECK_PROG([POLKIT_POLICY_FILE_VALIDATE],
  		 [polkit-policy-file-validate], [polkit-policy-file-validate])
     if test -z "$POLKIT_POLICY_FILE_VALIDATE"; then
@@ -11,11 +11,11 @@
     fi
  fi
  
-Index: hal-0.5.12/configure
+Index: hal-0.5.13/configure
 ===================================================================
---- hal-0.5.12.orig/configure	2009-03-16 04:22:46.000000000 +0100
-+++ hal-0.5.12/configure	2009-03-16 04:23:12.000000000 +0100
-@@ -19507,9 +19507,8 @@
+--- hal-0.5.13.orig/configure	2009-07-15 09:03:05.000000000 +0200
++++ hal-0.5.13/configure	2009-07-17 01:40:33.000000000 +0200
+@@ -19511,9 +19511,8 @@
  
  
     if test -z "$POLKIT_POLICY_FILE_VALIDATE"; then

Added: packages/experimental/hal/debian/patches/50_kfreebsd.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/hal/debian/patches/50_kfreebsd.patch?rev=3178&op=file
==============================================================================
--- packages/experimental/hal/debian/patches/50_kfreebsd.patch (added)
+++ packages/experimental/hal/debian/patches/50_kfreebsd.patch Tue Jul 28 02:54:28 2009
@@ -1,0 +1,145 @@
+diff --git a/hald/freebsd/libprobe/Makefile.am b/hald/freebsd/libprobe/Makefile.am
+index 20f8788..f0a8211 100644
+--- a/hald/freebsd/libprobe/Makefile.am
++++ b/hald/freebsd/libprobe/Makefile.am
+@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
+ 	@DBUS_CFLAGS@
+ 
+ if HALD_COMPILE_FREEBSD
+-lib_LTLIBRARIES = libhald_freebsd_probe.la
++noinst_LTLIBRARIES = libhald_freebsd_probe.la
+ endif
+ 
+ libhald_freebsd_probe_la_SOURCES = \
+diff --git a/hald/freebsd/libprobe/Makefile.in b/hald/freebsd/libprobe/Makefile.in
+index 1e04a3c..04b0a83 100644
+--- 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) \
+ mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+-    *) f=$$p;; \
+-  esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
++LTLIBRARIES = $(noinst_LTLIBRARIES)
+ 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 =  \
+ libhald_freebsd_probe_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(libhald_freebsd_probe_la_LDFLAGS) $(LDFLAGS) -o $@
+- at HALD_COMPILE_FREEBSD_TRUE@am_libhald_freebsd_probe_la_rpath = -rpath \
+- at HALD_COMPILE_FREEBSD_TRUE@	$(libdir)
++ at HALD_COMPILE_FREEBSD_TRUE@am_libhald_freebsd_probe_la_rpath =
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -244,7 +235,7 @@ AM_CPPFLAGS = \
+ 	-I$(top_srcdir) -I.. \
+ 	@DBUS_CFLAGS@
+ 
+- at HALD_COMPILE_FREEBSD_TRUE@lib_LTLIBRARIES = libhald_freebsd_probe.la
++ at HALD_COMPILE_FREEBSD_TRUE@noinst_LTLIBRARIES = libhald_freebsd_probe.la
+ libhald_freebsd_probe_la_SOURCES = \
+ 	hfp.c		\
+ 	hfp.h		\
+@@ -285,28 +276,10 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	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
+-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+-	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+-	  if test -f $$p; then \
+-	    f=$(am__strip_dir) \
+-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+-	  else :; fi; \
+-	done
+-
+-uninstall-libLTLIBRARIES:
+-	@$(NORMAL_UNINSTALL)
+-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+-	  p=$(am__strip_dir) \
+-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+-	done
+ 
+-clean-libLTLIBRARIES:
+-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++clean-noinstLTLIBRARIES:
++	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
++	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ 	  test "$$dir" != "$$p" || dir=.; \
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+@@ -428,9 +401,6 @@ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES)
+ installdirs:
+-	for dir in "$(DESTDIR)$(libdir)"; do \
+-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+-	done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -457,7 +427,7 @@ maintainer-clean-generic:
+ 	@echo "it deletes files that may require special tools to rebuild."
+ clean: clean-am
+ 
+-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
++clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ 	mostlyclean-am
+ 
+ distclean: distclean-am
+@@ -480,7 +450,7 @@ install-data-am:
+ 
+ install-dvi: install-dvi-am
+ 
+-install-exec-am: install-libLTLIBRARIES
++install-exec-am:
+ 
+ install-html: install-html-am
+ 
+@@ -512,23 +482,22 @@ ps: ps-am
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-libLTLIBRARIES
++uninstall-am:
+ 
+ .MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+-	clean-libLTLIBRARIES clean-libtool ctags distclean \
++	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+ 	install install-am install-data install-data-am install-dvi \
+ 	install-dvi-am install-exec install-exec-am install-html \
+-	install-html-am install-info install-info-am \
+-	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+-	install-ps install-ps-am install-strip installcheck \
+-	installcheck-am installdirs maintainer-clean \
+-	maintainer-clean-generic mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-libLTLIBRARIES
++	install-html-am install-info install-info-am install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
++	install-strip installcheck installcheck-am installdirs \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++	pdf pdf-am ps ps-am tags uninstall uninstall-am
+ 
+ # 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.

More information about the Pkg-utopia-commits mailing list