Author: rvs
Date: Tue Jan 3 23:25:30 2012
New Revision: 1226989
URL: http://svn.apache.org/viewvc?rev=1226989&view=rev
Log:
BIGTOP-328. rename hadoop-pig package into pig
Added:
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/pig.postinst
- copied, changed from r1226988,
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/hadoop-pig.postinst
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/pig.preinst
- copied, changed from r1226988,
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/hadoop-pig.preinst
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/pig.prerm
- copied, changed from r1226988,
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/hadoop-pig.prerm
Removed:
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/hadoop-pig.postinst
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/hadoop-pig.preinst
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/hadoop-pig.prerm
Modified:
incubator/bigtop/branches/hadoop-0.22/bigtop-deploy/puppet/modules/hadoop-pig/manifests/init.pp
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/control
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/copyright
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/rules
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/pig/SPECS/pig.spec
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/package/src/main/resources/package_data_apt.xml
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/package/src/main/resources/package_data_urpmi.xml
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/package/src/main/resources/package_data_yum.xml
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/package/src/main/resources/package_data_zypper.xml
incubator/bigtop/branches/hadoop-0.22/bigtop.mk
Modified:
incubator/bigtop/branches/hadoop-0.22/bigtop-deploy/puppet/modules/hadoop-pig/manifests/init.pp
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-deploy/puppet/modules/hadoop-pig/manifests/init.pp?rev=1226989&r1=1226988&r2=1226989&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.22/bigtop-deploy/puppet/modules/hadoop-pig/manifests/init.pp
(original)
+++
incubator/bigtop/branches/hadoop-0.22/bigtop-deploy/puppet/modules/hadoop-pig/manifests/init.pp
Tue Jan 3 23:25:30 2012
@@ -15,14 +15,14 @@
class hadoop-pig {
define client {
- package { "hadoop-pig":
+ package { "pig":
ensure => latest,
require => Package["hadoop"],
}
file { "/etc/pig/conf/pig.properties":
content => template('hadoop-pig/pig.properties'),
- require => Package["hadoop-pig"],
+ require => Package["pig"],
owner => "root", /* FIXME: I'm really no sure about these -- we might
end */
mode => "755", /* up deploying/testing a different thing
compared */
/* to a straight rpm/deb deployment
*/
Modified:
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/control
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/control?rev=1226989&r1=1226988&r2=1226989&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/control
(original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/control
Tue Jan 3 23:25:30 2012
@@ -1,4 +1,19 @@
-Source: hadoop-pig
+# 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.
+
+Source: pig
Section: misc
Priority: extra
Maintainer: Bigtop <[email protected]>
@@ -6,7 +21,7 @@ Build-Depends: debhelper (>= 6), ant, an
Standards-Version: 3.8.0
Homepage: http://pig.apache.org/
-Package: hadoop-pig
+Package: pig
Architecture: all
Depends: hadoop, bigtop-utils
Description: A platform for analyzing large data sets using Hadoop
Modified:
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/copyright
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/copyright?rev=1226989&r1=1226988&r2=1226989&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/copyright
(original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/copyright
Tue Jan 3 23:25:30 2012
@@ -1,5 +1,5 @@
Format: http://dep.debian.net/deps/dep5
-Source: http://hadoop.apache.org/pig
+Source: http://pig.apache.org/
Upstream-Name: Apache Pig
Files: *
Copied:
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/pig.postinst
(from r1226988,
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/hadoop-pig.postinst)
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/pig.postinst?p2=incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/pig.postinst&p1=incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/hadoop-pig.postinst&r1=1226988&r2=1226989&rev=1226989&view=diff
==============================================================================
(empty)
Copied:
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/pig.preinst
(from r1226988,
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/hadoop-pig.preinst)
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/pig.preinst?p2=incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/pig.preinst&p1=incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/hadoop-pig.preinst&r1=1226988&r2=1226989&rev=1226989&view=diff
==============================================================================
(empty)
Copied:
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/pig.prerm
(from r1226988,
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/hadoop-pig.prerm)
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/pig.prerm?p2=incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/pig.prerm&p1=incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/hadoop-pig.prerm&r1=1226988&r2=1226989&rev=1226989&view=diff
==============================================================================
(empty)
Modified:
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/rules
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/rules?rev=1226989&r1=1226988&r2=1226989&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/rules
(original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/pig/rules Tue
Jan 3 23:25:30 2012
@@ -23,6 +23,8 @@
# This has to be exported to make some magic below work.
export DH_OPTIONS
+pig_pkg_name=pig
+
patch: patch-stamp
patch-stamp:
patch -p1 < debian/patch
@@ -34,7 +36,7 @@ clean:
ant clean
rm -f *-stamp
dh_clean
- rm -Rf debian/tmp debian/hadoop-pig debian/pig
+ rm -Rf debian/tmp debian/${pig_pkg_name}
find debian -name .\*swp -exec rm -f {} \;
build-indep: build-indep-stamp
@@ -51,9 +53,9 @@ install-indep:
cp debian/pig.1 .
sh -x debian/install_pig.sh \
--build-dir=build/pig-${PIG_BASE_VERSION} \
- --prefix=debian/hadoop-pig \
- --doc-dir=debian/hadoop-pig/usr/share/doc/hadoop-pig \
- --examples-dir=debian/hadoop-pig/usr/share/doc/hadoop-pig/examples
+ --prefix=debian/${pig_pkg_name} \
+ --doc-dir=debian/${pig_pkg_name}/usr/share/doc/${pig_pkg_name} \
+
--examples-dir=debian/${pig_pkg_name}/usr/share/doc/${pig_pkg_name}/examples
dh_install -i
(dh_lintian) || /bin/true
Modified:
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/pig/SPECS/pig.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/pig/SPECS/pig.spec?rev=1226989&r1=1226988&r2=1226989&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/pig/SPECS/pig.spec
(original)
+++
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/pig/SPECS/pig.spec
Tue Jan 3 23:25:30 2012
@@ -66,12 +66,12 @@
%endif
-Name: hadoop-pig
+Name: pig
Version: %{pig_version}
Release: %{pig_release}
Summary: Pig is a platform for analyzing large data sets
License: Apache License v2.0
-URL: http://hadoop.apache.org/pig/
+URL: http://pig.apache.org/
Group: Development/Libraries
Buildroot: %{_topdir}/INSTALL/%{name}-%{version}
BuildArch: noarch
