Source: gem
Followup-For: Bug #655048

unfortunately my last patch contained a small error that would still prevent it
from succeeding when building only architecture-dependent packages.

hopefully this new and updated patch really fixes the issue!

fgmasdr
IOhannes

-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 3.1.0-1-686-pae (SMP w/4 CPU cores)
Locale: LANG=de_AT.UTF-8, LC_CTYPE=de_AT.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

-- no debconf information
>From 0de66305925cfb86813c465bf9756799f3de4eaf Mon Sep 17 00:00:00 2001
From: IOhannes m zmoelnig <zmoel...@umlauto.umlaeute.mur.at>
Date: Sun, 8 Jan 2012 19:48:01 +0100
Subject: [PATCH] Only remove assets from gem-doc if it's there (Closes:
 #655048)

on the buildbots, binary:all packages are not built, so there is no debian/gem-doc directory
---
 debian/rules |   32 +++++++++++++++++---------------
 1 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/debian/rules b/debian/rules
index 61fb45a..67576bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 #export DH_VERBOSE=1
 
 archconfflags := \
-        --prefix=/usr \
+	--prefix=/usr \
 	--with-pd=/usr/include/pd \
 	--enable-mmx \
 	--without-ALL \
@@ -41,37 +41,39 @@ override_dh_auto_test:
 override_dh_install:
 	dh_install
 	# remove libtool files, they are not needed
-	find $(CURDIR)/debian/gem-extra/usr/lib/ -name '*.la'  -delete
+	find debian/gem-extra/usr/lib/ -name '*.la'  -delete
 	# remove some assets
-	find $(CURDIR)/debian/gem-doc/usr/share/ -name '*.ttf' -delete
-	find $(CURDIR)/debian/gem-doc/usr/share/ -name '*.avi' -delete
-	find $(CURDIR)/debian/gem-doc/usr/share/ -name '*.mov' -delete
-	find $(CURDIR)/debian/gem-doc/usr/share/ -name '*.mpg' -delete
+	if [ -d debian/gem-doc ]; then \
+	 find debian/gem-doc/usr/share/ -name '*.ttf' -delete; \
+	 find debian/gem-doc/usr/share/ -name '*.avi' -delete; \
+	 find debian/gem-doc/usr/share/ -name '*.mov' -delete; \
+	 find debian/gem-doc/usr/share/ -name '*.mpg' -delete; \
+	fi
 	# the following COPYING only contains license information for vera.ttf
 	# which is not included in the Debian package
-	rm $(CURDIR)/debian/gem-doc/usr/share/gem/examples/data/COPYING.txt
+	if [ -d debian/gem-doc ]; then rm debian/gem-doc/usr/share/gem/examples/data/COPYING.txt; fi
 	# remove extra LICENSE files for gem-extra
-	rm $(CURDIR)/debian/gem-extra/usr/lib/pd/extra/pix_mano/LICENSE.txt
-	rm $(CURDIR)/debian/gem-extra/usr/lib/pd/extra/pix_drum/LICENSE.txt
+	rm debian/gem-extra/usr/lib/pd/extra/pix_mano/LICENSE.txt
+	rm debian/gem-extra/usr/lib/pd/extra/pix_drum/LICENSE.txt
 
 # calculate proper dependencies (for .pd_linux files) 
 override_dh_shlibdeps:
 	dh_shlibdeps
-	find $(CURDIR)/debian/gem -name "*.pd_linux" -exec \
+	find debian/gem -name "*.pd_linux" -exec \
 		dpkg-shlibdeps -Tdebian/gem.substvars {} +
-	find $(CURDIR)/debian/gem-extra -name "*.pd_linux" -exec \
+	find debian/gem-extra -name "*.pd_linux" -exec \
 		dpkg-shlibdeps -Tdebian/gem-extra.substvars {} +
 
 override_dh_strip:
 	dh_strip
-	find $(CURDIR)/debian -name "*.pd_linux" -exec \
-	        strip --remove-section=.comment --remove-section=.note --strip-unneeded {} +
+	find debian -name "*.pd_linux" -exec \
+		strip --remove-section=.comment --remove-section=.note --strip-unneeded {} +
 
 
 override_dh_fixperms:
 	dh_fixperms -Xpd-gem
-	chmod 0755 $(CURDIR)/debian/gem/usr/bin/pd-gem
-	find $(CURDIR)/debian -name '*.pd_linux' -exec \
+	chmod 0755 debian/gem/usr/bin/pd-gem
+	find debian -name '*.pd_linux' -exec \
 		chmod 0644 {} +
 
 override_dh_compress:
-- 
1.7.7.3

Reply via email to