[Pkg-octave-commit] [SCM] octave-communications branch, master, updated. 7bf41716574c87c551c1f9ef7f3556248d72a5a4

Thomas Weber thomas.weber.mail at gmail.com
Sun Dec 27 23:46:03 UTC 2009


The following commit has been merged in the master branch:
commit 1e62a50b16260f4f8a9a44994797915342e7b0d8
Author: Thomas Weber <thomas.weber.mail at gmail.com>
Date:   Sun Dec 27 22:03:27 2009 +0100

    Drop code for changing permissions of files - fixed upstream

diff --git a/debian/changelog b/debian/changelog
index a080b19..3f55884 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ octave-communications (1.0.9-3) UNRELEASED; urgency=low
     Octave 3.2
   * Remove patch: call-mlock-with-arg.diff, it was only necessary for
     octave3.0
+  * debian/rules: Drop code for changing permissions of files (applied
+    upstream)
 
  -- Rafael Laboissiere <rafael at debian.org>  Sun, 07 Jun 2009 21:07:42 +0200
 
diff --git a/debian/rules b/debian/rules
index 0d58985..84d85e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,11 +4,9 @@
 include /usr/share/cdbs/1/class/octave-pkg.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-wrongperm = prbs_generator.m prbs_iterator.m prbs_sequence.m
 pkg = communications
 archshr = $(CURDIR)/debian/octave-$(pkg)/usr/share
 indepshr = $(CURDIR)/debian/octave-$(pkg)-common/usr/share
-pkgdir = $(indepshr)/octave/packages/*/$(pkg)-*
 
 DEB_DH_INSTALL_SOURCEDIR = debian/octave-$(pkg)
 
@@ -19,12 +17,6 @@ install/octave-$(pkg)::
 	# package
 	mkdir -p $(indepshr)
 	mv $(archshr)/octave $(indepshr)
-	# Be sure that the file to be fixed has the wrong permissions.
-	# This will allow us to remove the code below if/when the package
-	# gets fixed upstream.
-	for f in $(wrongperm) ; do					\
-		[ -x $(pkgdir)/$$f ] && chmod -x $(pkgdir)/$$f ;	\
-	done
 	# Remove unneeded doc sources
 	( cd $(archshr)/doc/octave-$(pkg) ;		\
 	  for e in txi texi ; do  			\

-- 
octave-communications



More information about the Pkg-octave-commit mailing list