[Pkg-octave-commit] [SCM] octave-communications branch, master, updated. 30d4a2224772692ac2458190bae6c8519b957e15

[Ólafur Jens Śigurðsson]

The following commit has been merged in the master branch:
commit 30d4a2224772692ac2458190bae6c8519b957e15
Author: Ólafur Jens Śigurðsson <ojsbug at gmail.com>
Date:   Sat Jun 6 15:14:07 2009 +0000

    Revert "Added some fail checks to the rules file"
    
    This reverts commit 70ca29bea376fbc1971653436a83293c72f9ed96.

diff --git a/debian/changelog b/debian/changelog
index 52ff02c..43accc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-octave-communications (1.0.9-2) UNRELEASED; urgency=low
-
-  * Added some fail check to the rules file.
-
- -- Ólafur Jens Sigurðsson <ojsbug at gmail.com>  Fri, 05 Jun 2009 01:05:31 +0000
-
 octave-communications (1.0.9-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/rules b/debian/rules
index 7f7fb12..dc0cd91 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,12 +21,12 @@ install/octave-$(pkg)-common:: install/octave-$(pkg)
 	# This will allow us to remove the code below if/when the package
 	# gets fixed upstream.
 	for f in $(wrongperm) ; do					\
-		set -e && [ -x $(pkgdir)/$$f ] && chmod -x $(pkgdir)/$$f ;	\
+		[ -x $(pkgdir)/$$f ] && chmod -x $(pkgdir)/$$f ;	\
 	done
 
 install/octave-$(pkg)::
 	# Remove unneeded doc sources
-	( cd $(archshr)/doc/octave-$(pkg) &&		\
+	( cd $(archshr)/doc/octave-$(pkg) ;		\
 	  for e in txi texi ; do  			\
-		set -e [ -f comms.$$e ] && rm comms.$$e ;	\
+		[ -f comms.$$e ] && rm comms.$$e ;	\
 	  done )

-- 
octave-communications