BIGTOP-713. use newer debhelper and source format 3.0 (quilt) for Debian and Ubuntu packaging (James Page, Sean Mackrory, Anatoli Fomenko via rvs)

git-svn-id: https://svn.apache.org/repos/asf/bigtop/trunk@1400914 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 7 insertions, 46 deletions

diff --git a/bigtop-packages/src/deb/sqoop/compat b/bigtop-packages/src/deb/sqoop/compat
index 1e8b3149..7f8f011e 100644
--- a/bigtop-packages/src/deb/sqoop/compat
+++ b/bigtop-packages/src/deb/sqoop/compat
@@ -1 +1 @@
-6
+7
diff --git a/bigtop-packages/src/deb/sqoop/control b/bigtop-packages/src/deb/sqoop/control
index b12ca70e..d3831700 100644
--- a/bigtop-packages/src/deb/sqoop/control
+++ b/bigtop-packages/src/deb/sqoop/control
@@ -16,7 +16,7 @@ Source: sqoop
 Section: misc
 Priority: extra
 Maintainer: Bigtop <bigtop-dev@incubator.apache.org>
-Build-Depends: debhelper (>= 6), ant, ant-optional, git-core, sed, asciidoc, xmlto
+Build-Depends: debhelper (>= 7.0.50~), ant, ant-optional, git-core, sed, asciidoc, xmlto
 Standards-Version: 3.8.0
 Homepage: http://incubator.apache.org/sqoop/
 
diff --git a/bigtop-packages/src/deb/sqoop/rules b/bigtop-packages/src/deb/sqoop/rules
index 98c96fe2..c73d5ecb 100755
--- a/bigtop-packages/src/deb/sqoop/rules
+++ b/bigtop-packages/src/deb/sqoop/rules
@@ -23,55 +23,15 @@ export DH_VERBOSE=1
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-patch: patch-stamp
-patch-stamp:	
-	touch $@
+%:
+	dh $@
 
-clean:	
-	dh_testdir
-	dh_testroot
-	rm -f *-stamp
-	dh_clean
-	rm -Rf debian/tmp debian/sqoop
-	find debian -name .\*swp -exec rm -f {} \;
-
-build-indep: build-indep-stamp
-build-indep-stamp: patch-stamp
+override_dh_auto_build:
 	bash debian/do-component-build -Divy.home=${HOME}/.ivy2
-	touch $@
 
-install: install-indep
-install-indep:	
-	dh_testdir
-	dh_testroot
+override_dh_auto_install:
 	sh -x debian/install_sqoop.sh \
 	  --build-dir=build/sqoop-${SQOOP_BASE_VERSION} \
 	  --conf-dir=/etc/sqoop/conf.dist \
 	  --prefix=debian/sqoop 
 	cp debian/sqoop-metastore.sh debian/sqoop-metastore.init 
-	dh_install -i
-
-binary-common:	
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installinit
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary-indep: build-indep install-indep
-	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-binary-arch:
-binary: binary-indep
-.PHONY: build clean binary-indep binary install-indep binary-arc
diff --git a/bigtop-packages/src/deb/sqoop/source/format b/bigtop-packages/src/deb/sqoop/source/format
new file mode 100644
index 00000000..163aaf8d
--- /dev/null
+++ b/bigtop-packages/src/deb/sqoop/source/format
@@ -0,0 +1 @@
+3.0 (quilt)