bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ofle...@apache.org
Subject [1/4] bigtop git commit: BIGTOP-2137: Fix bigtop-groovy package
Date Sat, 14 Nov 2015 15:49:08 GMT
Repository: bigtop
Updated Branches:
  refs/heads/master e1c6d96c7 -> 855c112e8


BIGTOP-2137: Fix bigtop-groovy package


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/38cf28a4
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/38cf28a4
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/38cf28a4

Branch: refs/heads/master
Commit: 38cf28a49e1cfc869e30859989584a2cebcfaa3c
Parents: e1c6d96
Author: Olaf Flebbe <of@ofleb.be>
Authored: Fri Nov 13 21:53:35 2015 +0100
Committer: Olaf Flebbe <of@ofleb.be>
Committed: Sat Nov 14 16:42:25 2015 +0100

----------------------------------------------------------------------
 .../src/common/bigtop-groovy/install_groovy.sh  |  1 +
 .../deb/bigtop-groovy/bigtop-groovy.postinst    | 36 --------------------
 bigtop-packages/src/deb/bigtop-groovy/compat    |  2 +-
 bigtop-packages/src/deb/bigtop-groovy/control   |  2 +-
 bigtop-packages/src/deb/bigtop-groovy/rules     |  2 +-
 5 files changed, 4 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/38cf28a4/bigtop-packages/src/common/bigtop-groovy/install_groovy.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/bigtop-groovy/install_groovy.sh b/bigtop-packages/src/common/bigtop-groovy/install_groovy.sh
index 14a14f2..42fe44a 100755
--- a/bigtop-packages/src/common/bigtop-groovy/install_groovy.sh
+++ b/bigtop-packages/src/common/bigtop-groovy/install_groovy.sh
@@ -94,6 +94,7 @@ echo ${BIGTOP_GROOVY_BASE_VERSION}
 install -d -m 0755 ${PREFIX}/${BIN_DIR}
 cp ${BUILD_DIR}/bin/startGroovy ${PREFIX}/${BIN_DIR}
 cp ${BUILD_DIR}/bin/groovy ${PREFIX}/${BIN_DIR}
+chmod 755 ${PREFIX}/${BIN_DIR}/*
 
 # lib
 install -d -m 0755 ${PREFIX}/${LIB_DIR}

http://git-wip-us.apache.org/repos/asf/bigtop/blob/38cf28a4/bigtop-packages/src/deb/bigtop-groovy/bigtop-groovy.postinst
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/bigtop-groovy/bigtop-groovy.postinst b/bigtop-packages/src/deb/bigtop-groovy/bigtop-groovy.postinst
deleted file mode 100644
index 29db417..0000000
--- a/bigtop-packages/src/deb/bigtop-groovy/bigtop-groovy.postinst
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# postinst script for bigtop-groovy
-
-set -e
-
-case "$1" in
-    configure)
-	    chmod 0755 /usr/lib/bigtop-groovy/bin/*
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-#DEBHELPER#

http://git-wip-us.apache.org/repos/asf/bigtop/blob/38cf28a4/bigtop-packages/src/deb/bigtop-groovy/compat
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/bigtop-groovy/compat b/bigtop-packages/src/deb/bigtop-groovy/compat
index 7f8f011..ec63514 100755
--- a/bigtop-packages/src/deb/bigtop-groovy/compat
+++ b/bigtop-packages/src/deb/bigtop-groovy/compat
@@ -1 +1 @@
-7
+9

http://git-wip-us.apache.org/repos/asf/bigtop/blob/38cf28a4/bigtop-packages/src/deb/bigtop-groovy/control
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/bigtop-groovy/control b/bigtop-packages/src/deb/bigtop-groovy/control
index f88bd8b..dbf6e0e 100755
--- a/bigtop-packages/src/deb/bigtop-groovy/control
+++ b/bigtop-packages/src/deb/bigtop-groovy/control
@@ -21,7 +21,7 @@ Standards-Version: 3.8.0
 Homepage: http://groovy.codehaus.org/
 
 Package: bigtop-groovy
-Architecture: any
+Architecture: all
 Depends: bigtop-utils (>= 0.7)
 Description: An agile and dynamic language for the Java Virtual Machine
  Groovy provides a JVM based runtime environment for function programming and scripting.

http://git-wip-us.apache.org/repos/asf/bigtop/blob/38cf28a4/bigtop-packages/src/deb/bigtop-groovy/rules
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/bigtop-groovy/rules b/bigtop-packages/src/deb/bigtop-groovy/rules
index f4cd744..c6310c0 100755
--- a/bigtop-packages/src/deb/bigtop-groovy/rules
+++ b/bigtop-packages/src/deb/bigtop-groovy/rules
@@ -21,7 +21,7 @@
 export DH_VERBOSE=1
 
 # This has to be exported to make some magic below work.
-export DH_OPTIONS=-s
+export DH_OPTIONS=
 
 %:
 	dh $@


Mime
View raw message