diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2008-05-04 00:03:00 +0000 |
|---|---|---|
| committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2008-05-04 00:03:00 +0000 |
| commit | 3421554cada17602c80586199572c1bac106d489 (patch) | |
| tree | 9eb964f6185e7c17604d5ad5c8ddc8e49f11faef /packages | |
| parent | c92cae07c5940fba25d9f1feadbafa789e6416da (diff) | |
fixed depends and starting fixing package to that it installs into /usr instead of /usr/local, therefore conflicts with the exists pd packgess
svn path=/trunk/; revision=9757
Diffstat (limited to 'packages')
| -rwxr-xr-x | packages/linux_make/Makefile | 14 | ||||
| -rw-r--r-- | packages/linux_make/debian/control | 6 |
2 files changed, 8 insertions, 12 deletions
diff --git a/packages/linux_make/Makefile b/packages/linux_make/Makefile index 9c431575..809d88dc 100755 --- a/packages/linux_make/Makefile +++ b/packages/linux_make/Makefile @@ -14,9 +14,7 @@ BUILDLAYOUT_DIR = $(cvs_root_dir)/packages 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 @@ -111,15 +109,11 @@ deb: $(bindir) $(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 @@ test_locations: @echo "MANUALSDIR $(manualsdir)" @echo "EXAMPLESDIR $(examplesdir)" @echo -------------------------------------------------- + @echo "PACKAGE_DEPENDS $(PACKAGE_DEPENDS)" + @echo -------------------------------------------------- autoconf --version @echo -------------------------------------------------- make --version diff --git a/packages/linux_make/debian/control b/packages/linux_make/debian/control index 09530113..74fc3b1e 100644 --- a/packages/linux_make/debian/control +++ b/packages/linux_make/debian/control @@ -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 |