From b1bf1a56fd463a047d96b0230048f4ab9a5d0f56 Mon Sep 17 00:00:00 2001 From: Sojourner Truth <jon.w.wilkes@gmail.com> Date: Sun, 19 Jun 2016 22:58:39 -0400 Subject: [PATCH] port agraef's commit from Pd-l2ork: Adjust debuild so that it uses 'tar_em_up.sh -B -n' to do the staging. commit 835fa21ca36b5987a4bde01c7595293ff4c09abd --- debuild/debian/install | 8 -------- debuild/debian/rules | 6 ++---- 2 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 debuild/debian/install diff --git a/debuild/debian/install b/debuild/debian/install deleted file mode 100644 index 75f2cdb64..000000000 --- a/debuild/debian/install +++ /dev/null @@ -1,8 +0,0 @@ -scripts/bash_completion/pd-l2ork etc/bash_completion.d -l2ork_addons/K12 usr/lib/pd-l2ork/extra -externals/hardware/arduino usr/lib/pd-l2ork/extra -packages/linux_make/default.settings usr/lib/pd-l2ork -packages/linux_make/pd-l2ork.gif usr/lib/pd-l2ork -packages/linux_make/pd-l2ork*.png usr/share/icons/hicolor/128x128/apps -packages/linux_make/text-x-pd-l2ork.png usr/share/icons/hicolor/128x128/mimetypes -packages/linux_make/pd-l2ork*.desktop usr/share/applications diff --git a/debuild/debian/rules b/debuild/debian/rules index c1f58ed5c..5f9f94712 100755 --- a/debuild/debian/rules +++ b/debuild/debian/rules @@ -10,10 +10,10 @@ override_dh_auto_configure: override_dh_auto_build: - cd l2ork_addons && inst_dir=/usr ./tar_em_up.sh -F -n + cd l2ork_addons && ./tar_em_up.sh -B -n override_dh_auto_install: - mkdir -p debian/pd-l2ork && mv packages/linux_make/build/usr debian/pd-l2ork + mkdir -p debian/pd-l2ork && mv packages/linux_make/build/* debian/pd-l2ork # Remove some unneeded files. cd debian/pd-l2ork/ && rm -f Makefile README.txt cd debian/pd-l2ork/usr/lib/pd-l2ork/extra && rm -rf */*.pd_linux_o */*.la @@ -27,8 +27,6 @@ override_dh_auto_install: cd debian/pd-l2ork/usr && mv include/Gem include/pd-l2ork # Edit the Gem pkgconfig file accordingly and rename it. cd debian/pd-l2ork/usr/lib/pkgconfig && sed -e 's?/include?/include/pd-l2ork?g' -e 's?/lib/pd/extra?/lib/pd-l2ork/extra?g' < Gem.pc > pd-l2ork-Gem.pc && rm -f Gem.pc -# Default preferences file. - install -d debian/pd-l2ork/etc/pd-l2ork && ln -s -f /usr/lib/pd-l2ork/default.settings debian/pd-l2ork/etc/pd-l2ork/default.settings # NOTE: Older systems use dh_pysupport instead of dh_python2. See # http://deb.li/dhs2p. -- GitLab