[PD-cvs] SF.net SVN: pure-data: [9757] trunk/packages/linux_make

eighthave at users.sourceforge.net eighthave at users.sourceforge.net
Sun May 4 02:03:01 CEST 2008


Revision: 9757
          http://pure-data.svn.sourceforge.net/pure-data/?rev=9757&view=rev
Author:   eighthave
Date:     2008-05-03 17:03:00 -0700 (Sat, 03 May 2008)

Log Message:
-----------
fixed depends and starting fixing package to that it installs into /usr instead of /usr/local, therefore conflicts with the exists pd packgess

Modified Paths:
--------------
    trunk/packages/linux_make/Makefile
    trunk/packages/linux_make/debian/control

Modified: trunk/packages/linux_make/Makefile
===================================================================
--- trunk/packages/linux_make/Makefile	2008-05-03 23:19:51 UTC (rev 9756)
+++ trunk/packages/linux_make/Makefile	2008-05-04 00:03:00 UTC (rev 9757)
@@ -14,10 +14,8 @@
 prefix = /usr/local
 
 # generates the dependencies for all externals and pd itself
-PACKAGE_BINARIES := $(shell find $(DESTDIR) \( -name "*.pd_linux" -o -name pd \) )
-PACKAGE_DEPENDS := $(shell dpkg-shlibdeps -O $(PACKAGE_BINARIES) | cut -b0-15 --complement )
+PACKAGE_DEPENDS := $(shell find $(DESTDIR) \( -name "*.pd_linux" -or -name pd-gui -or -wholename \*bin/pd \) -print0 | xargs -0 dpkg-shlibdeps -O | cut -b0-15 --complement )
 
-
 include $(BUILDLAYOUT_DIR)/Makefile.buildlayout
 
 TARGET_PLATFORM := $(shell uname -m)
@@ -111,15 +109,11 @@
 		$(packages_src)/linux_make/debian/control
 	sed -i 's|^Architecture:.*|Architecture: $(DEB_BUILD_ARCH)|' \
 		$(packages_src)/linux_make/debian/control
-# add auto-generated dependencies
-	sed -i 's!^Depends:.*!Depends: $(PACKAGE_DEPENDS)!' \
-		$(packages_src)/linux_make/debian/control
-ifeq ($(DEB_BUILD_ARCH),powerpc)
-	sed -i 's|, libavifile-0.7c2||' $(packages_src)/linux_make/debian/control
-endif
 # debian packaging
 	test -d $(DESTDIR)/DEBIAN || mkdir -p $(DESTDIR)/DEBIAN
 	cp $(packages_src)/linux_make/debian/control $(DESTDIR)/DEBIAN
+# add auto-generated dependencies
+	sed -i 's!^\(Depends:.*\)!\1 $(PACKAGE_DEPENDS)!' $(DESTDIR)/DEBIAN/control
 	fakeroot dpkg-deb --build $(DESTDIR) $(packages_src)/linux_make/$(PACKAGE_NAME).deb
 
 tarbz2: installer_makefile installer_readme
@@ -203,6 +197,8 @@
 	@echo "MANUALSDIR  $(manualsdir)"
 	@echo "EXAMPLESDIR  $(examplesdir)"
 	@echo --------------------------------------------------
+	@echo "PACKAGE_DEPENDS 	$(PACKAGE_DEPENDS)"
+	@echo --------------------------------------------------
 	autoconf --version
 	@echo --------------------------------------------------
 	make --version

Modified: trunk/packages/linux_make/debian/control
===================================================================
--- trunk/packages/linux_make/debian/control	2008-05-03 23:19:51 UTC (rev 9756)
+++ trunk/packages/linux_make/debian/control	2008-05-04 00:03:00 UTC (rev 9757)
@@ -1,9 +1,9 @@
 Package: pd-extended
-Version: 
+Version: 0.40.3cvs20080503-1
 Section: sound
 Priority: optional
-Architecture: any
-Depends: xterm | x-terminal-emulator, ttf-bitstream-vera, x-ttcidfont-conf, ${shlibs:Depends}
+Architecture: i386
+Depends: xterm | x-terminal-emulator, ttf-bitstream-vera, x-ttcidfont-conf,
 Replaces: puredata, pd-externals, gem, pd-pdp, pd-zexy
 Conflicts: puredata, pd-externals, gem, pd-pdp, pd-zexy
 Provides: pd


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Pd-cvs mailing list