Author: barryh-guest
Date: 2006-02-09 05:25:33 +0000 (Thu, 09 Feb 2006)
New Revision: 1884
Modified:
trunk/java-package/debian/changelog
trunk/java-package/lib/blackdown-j2re.sh
trunk/java-package/lib/blackdown-j2sdk.sh
trunk/java-package/lib/common.sh
trunk/java-package/lib/ibm-j2re.sh
trunk/java-package/lib/ibm-j2sdk.sh
trunk/java-package/lib/sun-j2re.sh
trunk/java-package/lib/sun-j2sdk.sh
Log:
Refactor architecture evaluation to eliminate repetition and suppress spurious
warnings per Bug #281766
Modified: trunk/java-package/debian/changelog
===================================================================
--- trunk/java-package/debian/changelog 2006-02-09 05:17:41 UTC (rev 1883)
+++ trunk/java-package/debian/changelog 2006-02-09 05:25:33 UTC (rev 1884)
@@ -6,10 +6,15 @@
* Repaired alternatives handling for IBM JREs and JDKs (Closes: #338569)
* Corrected pathing for alternatives installation for Mozilla and
Firefox plugins (Closes: #341751)
+ * Added plugin installation for the new packaging of Firefox 1.5 and
+ later (Closes: #341749)
* Modified warning suppression for dh_shlibdeps to accommodate
changes in dpkg-dev
* Added quotes to variable tests for maintainer name and email
(Closes: #342623)
+ * Refactored architecture evaluation to eliminate repetition and
+ suppress spurious warnings from dpkg-architecture when gcc is
+ not present (Closes: #281766)
-- Barry Hawkins <[EMAIL PROTECTED]> Tue, 07 Feb 2006 22:55:33 -0500
Modified: trunk/java-package/lib/blackdown-j2re.sh
===================================================================
--- trunk/java-package/lib/blackdown-j2re.sh 2006-02-09 05:17:41 UTC (rev
1883)
+++ trunk/java-package/lib/blackdown-j2re.sh 2006-02-09 05:25:33 UTC (rev
1884)
@@ -1,7 +1,6 @@
# Detect product
function blackdown_j2re_detect() {
- local found=
- eval $(dpkg-architecture)
+ local found=evaluate_architecture
case "${DEB_BUILD_ARCH:-$DEB_BUILD_GNU_TYPE}" in
i386|i386-linux)
case "$archive_name" in
Modified: trunk/java-package/lib/blackdown-j2sdk.sh
===================================================================
--- trunk/java-package/lib/blackdown-j2sdk.sh 2006-02-09 05:17:41 UTC (rev
1883)
+++ trunk/java-package/lib/blackdown-j2sdk.sh 2006-02-09 05:25:33 UTC (rev
1884)
@@ -1,7 +1,6 @@
# Detect product
function blackdown_j2sdk_detect() {
- local found=
- eval $(dpkg-architecture)
+ local found=evaluate_architecture
case "${DEB_BUILD_ARCH:-$DEB_BUILD_GNU_TYPE}" in
i386|i386-linux)
case "$archive_name" in
Modified: trunk/java-package/lib/common.sh
===================================================================
--- trunk/java-package/lib/common.sh 2006-02-09 05:17:41 UTC (rev 1883)
+++ trunk/java-package/lib/common.sh 2006-02-09 05:25:33 UTC (rev 1884)
@@ -117,7 +117,7 @@
if [ "${#files[*]}" -ne 1 ]; then
cat << EOF
-Exptected one file, but found the following ${#files[*]} files:
+Expected one file, but found the following ${#files[*]} files:
${files[*]}
EOF
@@ -179,3 +179,10 @@
fi
fi
}
+
+# provide the architecture for evaluation by plugins
+function evaluate_architecture() {
+ eval $(dpkg-architecture) 2>&1 |
+ { grep -v "dpkg-architecture: warning: Couldn't determine gcc system
type, falling back to default (native compilation) | sh: gcc: command not
found" >&2 || true; }
+
+}
\ No newline at end of file
Modified: trunk/java-package/lib/ibm-j2re.sh
===================================================================
--- trunk/java-package/lib/ibm-j2re.sh 2006-02-09 05:17:41 UTC (rev 1883)
+++ trunk/java-package/lib/ibm-j2re.sh 2006-02-09 05:25:33 UTC (rev 1884)
@@ -1,7 +1,6 @@
# Detect product
function ibm_j2re_detect() {
- local found=
- eval $(dpkg-architecture)
+ local found=evaluate_architecture
case "${DEB_BUILD_ARCH:-$DEB_BUILD_GNU_TYPE}" in
i386|i386-linux)
case "$archive_name" in
Modified: trunk/java-package/lib/ibm-j2sdk.sh
===================================================================
--- trunk/java-package/lib/ibm-j2sdk.sh 2006-02-09 05:17:41 UTC (rev 1883)
+++ trunk/java-package/lib/ibm-j2sdk.sh 2006-02-09 05:25:33 UTC (rev 1884)
@@ -1,7 +1,6 @@
# Detect product
function ibm_j2sdk_detect() {
- local found=
- eval $(dpkg-architecture)
+ local found=evaluate_architecture
case "${DEB_BUILD_ARCH:-$DEB_BUILD_GNU_TYPE}" in
i386|i386-linux)
case "$archive_name" in
Modified: trunk/java-package/lib/sun-j2re.sh
===================================================================
--- trunk/java-package/lib/sun-j2re.sh 2006-02-09 05:17:41 UTC (rev 1883)
+++ trunk/java-package/lib/sun-j2re.sh 2006-02-09 05:25:33 UTC (rev 1884)
@@ -1,7 +1,6 @@
# Detect product
function sun_j2re_detect() {
-local found=
- eval $(dpkg-architecture)
+local found=evaluate_architecture
case "${DEB_BUILD_ARCH:-$DEB_BUILD_GNU_TYPE}" in
i386|i386-linux)
case "$archive_name" in
Modified: trunk/java-package/lib/sun-j2sdk.sh
===================================================================
--- trunk/java-package/lib/sun-j2sdk.sh 2006-02-09 05:17:41 UTC (rev 1883)
+++ trunk/java-package/lib/sun-j2sdk.sh 2006-02-09 05:25:33 UTC (rev 1884)
@@ -1,7 +1,6 @@
# Detect product
function sun_j2sdk_detect() {
- local found=
- eval $(dpkg-architecture)
+ local found=evaluate_architecture
case "${DEB_BUILD_ARCH:-$DEB_BUILD_GNU_TYPE}" in
i386|i386-linux)
case "$archive_name" in
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
