[SCM] csound packaging branch, master, updated. debian/5.12.1.dfsg-2-5-g9960171

[fsateler at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9960171083219320166d72b3f3df7ca854fd233f
Author: Felipe Sateler <fsateler at debian.org>
Date:   Tue Jul 13 19:38:02 2010 -0400

    Do not specify list for java, as it is available on all archs now.

diff --git a/debian/control.in b/debian/control.in
index d6518dc..ce100a5 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -55,7 +55,7 @@ Description: main library for Csound
  For more information on Csound, see the csound package.
 
 Package: libcsnd-java
-Architecture: @java_archs@
+Architecture: any
 Section: java
 Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre-headless | java2-runtime
 Recommends: csound
diff --git a/debian/pkgarchs.sh b/debian/pkgarchs.sh
deleted file mode 100644
index 33f2758..0000000
--- a/debian/pkgarchs.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-#
-# Copyright © 2008 Jonas Smedegaard <dr at jones.dk>
-# Description: Resolves supported archs of a Debian package
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-#
-# Depends: devscripts
-
-set -e
-
-defaultsuite="unstable"
-currentsuite="`dpkg-parsechangelog | grep ^Distribution: | awk '{print $2}'`"
-
-pkg="$1"
-suite="${2:-$currentsuite}"
-
-case "$suite" in
-    UNRELEASED|"")
-	echo >&2 "WARNING: bad suite \"$suite\", using \"$defaultsuite\" instead."
-	suite="$defaultsuite"
-	;;
-esac
-
-echo >&2 "INFO: Resolving architectures for package \"$pkg\" through rmadison Internet request."
-rmadison -s "$suite" "$pkg" \
-	| awk -F'|' '{ print $4 }' \
-	| sed 's/ //g;s/,/\n/g' \
-	| LANG=C sort \
-	| tr '\n' ' ' \
-	| sed 's/ $/\n/'
diff --git a/debian/rules b/debian/rules
index 4f64031..726227e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -313,12 +313,6 @@ fail-missing: binary-arch binary-indep list-missing
 	fi
 
 
-ifneq (,$(DEB_MAINTAINER_MODE))
-JAVA_ARCHS := $(shell sh debian/pkgarchs.sh default-jre-headless)
-debian/control::
-	sed -i -e 's/@java_archs@/$(JAVA_ARCHS)/g' debian/control
-endif
-
 # Needed by upstream build process
 # First, the core dependencies
 CDBS_BUILD_DEPENDS += , \
@@ -339,12 +333,8 @@ CDBS_BUILD_DEPENDS += , \
 	tk-dev, \
 	tcl-dev, \
 	python-all-dev (>= 2.3.5-11), \
-	puredata
-#  * Only build-depend on Java JDK for supported archs
-#  * JAVA_ARCHS is empty during normal builds, but that is ok, since
-#    CDBS_BUILD_DEPENDS is only ever used when in DEB_MAINTAINER_MODE
-CDBS_BUILD_DEPENDS += , \
-	default-jdk [$(JAVA_ARCHS)]
+	puredata, \
+	default-jdk
 
 # Opcodes and other features
 CDBS_BUILD_DEPENDS += , \

-- 
csound packaging