[Pkg-octave-commit] [SCM] octave-communications branch, master, updated. 3fd14ea7d8a9cccd091017243df39f7929c7e719

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit 3fd14ea7d8a9cccd091017243df39f7929c7e719
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Fri May 22 19:01:14 2009 +0200

    Put the architecture independent files into the separate package

diff --git a/debian/changelog b/debian/changelog
index bb93891..12c11c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 octave-communications (1.0.9-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * Put the architecture independent files *.m into the separate
+    octave-communications-common package.  This is required by Policy.
   * debian/patches/call-mlock-with-arg.diff: Add patch for making the
     package compile against Octave 3.0.5
   * debian/rules:
diff --git a/debian/control b/debian/control
index d8c76f8..d7b914e 100644
--- a/debian/control
+++ b/debian/control
@@ -15,11 +15,26 @@ Vcs-Browser: http://git.debian.org/?p=pkg-octave/octave-communications.git
 
 Package: octave-communications
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, ${octave:Depends}, octave-signal
-Description: communications package from octave-forge
+Depends: ${misc:Depends}, ${shlibs:Depends}, ${octave:Depends},
+ octave-signal, octave-communications-common
+Description: communications package for Octave
  This package provides functions for Octave, a numerical computation
  software, to perform error analysis on communication signals,
  convert between analog and digital signals, and many more functions
  pertaining to signal analysis.
  .
  This Octave add-on package is part of the Octave-Forge project.
+
+Package: octave-communications-common
+Architecture: all
+Depends: ${misc:Depends}
+Description: communications package for Octave (arch-indep files)
+ This package provides functions for Octave, a numerical computation
+ software, to perform error analysis on communication signals,
+ convert between analog and digital signals, and many more functions
+ pertaining to signal analysis.
+ .
+ This Octave add-on package is part of the Octave-Forge project.
+ .
+ This package contians the architecture-independent files for the
+ octave-communications package.
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 547a5b2..6cfe420 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,9 +6,19 @@ include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 wrongperm = prbs_generator.m prbs_iterator.m prbs_sequence.m
 pkg = communications
-pkgdir = $(CURDIR)/debian/octave-$(pkg)/usr/share/octave/packages/*/$(pkg)-*
+archshr = $(CURDIR)/debian/octave-$(pkg)/usr/share
+indepshr = $(CURDIR)/debian/octave-$(pkg)-common/usr/share
+pkgdir = $(indepshr)/octave/packages/*/$(pkg)-*
 
-install/octave-$(pkg)::
+DEB_DH_INSTALL_SOURCEDIR = debian/octave-$(pkg)
+
+build/octave-$(pkg)-common:: install/octave-$(pkg)
+
+install/octave-$(pkg)-common::
+	# Move the architecture independent files into the appropriate
+	# 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.

-- 
octave-communications