SOURCES: polypaudio-libdir.patch, polypaudio-suid.patch - updated ...

qboosh qboosh at pld-linux.org
Sun Apr 23 15:01:17 CEST 2006


Author: qboosh                       Date: Sun Apr 23 13:01:16 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 0.8

---- Files affected:
SOURCES:
   polypaudio-libdir.patch (1.1 -> 1.2) , polypaudio-suid.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/polypaudio-libdir.patch
diff -u SOURCES/polypaudio-libdir.patch:1.1 SOURCES/polypaudio-libdir.patch:1.2
--- SOURCES/polypaudio-libdir.patch:1.1	Mon Mar 20 01:27:39 2006
+++ SOURCES/polypaudio-libdir.patch	Sun Apr 23 15:01:11 2006
@@ -1,14 +1,3 @@
-diff -uNr polypaudio-0.7.orig/polyplib-error.pc.in polypaudio-0.7/polyplib-error.pc.in
---- polypaudio-0.7.orig/polyplib-error.pc.in	2004-09-11 01:23:03.000000000 +0200
-+++ polypaudio-0.7/polyplib-error.pc.in	2006-03-20 01:18:33.000000000 +0100
-@@ -1,6 +1,5 @@
- prefix=@prefix@
--exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
-+libdir=@libdir@
- includedir=${prefix}/include
- 
- Name: polyplib-error
 diff -uNr polypaudio-0.7.orig/polyplib-glib12-mainloop.pc.in polypaudio-0.7/polyplib-glib12-mainloop.pc.in
 --- polypaudio-0.7.orig/polyplib-glib12-mainloop.pc.in	2004-09-11 01:23:03.000000000 +0200
 +++ polypaudio-0.7/polyplib-glib12-mainloop.pc.in	2006-03-20 01:19:01.000000000 +0100
@@ -31,17 +20,6 @@
  includedir=${prefix}/include
  
  Name: polyplib-glib-mainloop
-diff -uNr polypaudio-0.7.orig/polyplib-mainloop.pc.in polypaudio-0.7/polyplib-mainloop.pc.in
---- polypaudio-0.7.orig/polyplib-mainloop.pc.in	2004-09-11 01:23:03.000000000 +0200
-+++ polypaudio-0.7/polyplib-mainloop.pc.in	2006-03-20 01:19:10.000000000 +0100
-@@ -1,6 +1,5 @@
- prefix=@prefix@
--exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
-+libdir=@libdir@
- includedir=${prefix}/include
- 
- Name: polyplib-mainloop
 diff -uNr polypaudio-0.7.orig/polyplib.pc.in polypaudio-0.7/polyplib.pc.in
 --- polypaudio-0.7.orig/polyplib.pc.in	2004-09-11 01:23:14.000000000 +0200
 +++ polypaudio-0.7/polyplib.pc.in	2006-03-20 01:19:25.000000000 +0100
@@ -64,3 +42,13 @@
  includedir=${prefix}/include
  
  Name: polyplib-simple
+--- polypaudio-0.8/polyplib-browse.pc.in.orig	2006-02-22 21:12:18.000000000 +0100
++++ polypaudio-0.8/polyplib-browse.pc.in	2006-04-22 09:50:25.820553250 +0200
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=@libdir@
+ includedir=${prefix}/include
+ 
+ Name: polyplib-browse

================================================================
Index: SOURCES/polypaudio-suid.patch
diff -u SOURCES/polypaudio-suid.patch:1.1 SOURCES/polypaudio-suid.patch:1.2
--- SOURCES/polypaudio-suid.patch:1.1	Fri Dec 17 10:20:25 2004
+++ SOURCES/polypaudio-suid.patch	Sun Apr 23 15:01:11 2006
@@ -1,23 +1,20 @@
-diff -ur o-polypaudio-0.7/polyp/Makefile.am polypaudio-0.7/polyp/Makefile.am
---- o-polypaudio-0.7/polyp/Makefile.am	2004-11-21 15:25:28.000000000 -0700
-+++ polypaudio-0.7/polyp/Makefile.am	2004-12-17 01:46:01.577604443 -0700
-@@ -709,10 +709,6 @@
- 
- ### Some minor stuff
+--- polypaudio-0.8/src/Makefile.am.orig	2006-04-18 21:13:11.000000000 +0200
++++ polypaudio-0.8/src/Makefile.am	2006-04-22 09:35:12.915500250 +0200
+@@ -1097,10 +1097,6 @@
+ #        Some minor stuff         #
+ ###################################
  
 -suid: polypaudio
 -	chown root $<
 -	chmod u+s $<
 -
- esdcompat.sh: esdcompat.sh.in Makefile
- 	sed -e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
- 		-e 's, at PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
-@@ -729,8 +725,6 @@
- 		-e 's, at DEFAULT_CONFIG_FILE\@,$(polypconfdir)/daemon.conf,g' < $< > $@
+ CLEANFILES=esdcompat.sh client.conf default.pa daemon.conf
+ 
+ esdcompat.sh: daemon/esdcompat.sh.in Makefile
+@@ -1124,6 +1120,4 @@
+ 		-e 's, at DEFAULT_CONFIG_FILE\@,$(DEFAULT_CONFIG_DIR),g' < $< > $@
  
  install-exec-hook:
--	chown root $(DESTDIR)$(bindir)/polypaudio
+-	chown root $(DESTDIR)$(bindir)/polypaudio ; true
 -	chmod u+s $(DESTDIR)$(bindir)/polypaudio
- 	ln -s pacat $(DESTDIR)$(bindir)/parec
- 
- $(SYMDEF_FILES): module-defs.h.m4
+ 	ln -sf pacat $(DESTDIR)$(bindir)/parec
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/polypaudio-libdir.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/polypaudio-suid.patch?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list