[sqlline] 20/22: Build with the DH sequencer instead of CDBS

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Apr 18 16:11:08 BST 2018


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository sqlline.

commit 787c3f9709e7df534afb404c10c9354e60e4130e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Apr 18 17:02:10 2018 +0200

    Build with the DH sequencer instead of CDBS
---
 debian/changelog |  1 +
 debian/clean     |  3 +++
 debian/control   |  1 -
 debian/rules     | 25 +++++++++++--------------
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 04bf4c7..bd6b15f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 sqlline (1.0.2-6) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Standards-Version updated to 4.1.4
   * Switch to debhelper level 11
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..736444f
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,3 @@
+VERSION.txt
+tmp/
+release/
diff --git a/debian/control b/debian/control
index 83d2e22..33ee581 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Build-Depends:
  debhelper (>= 11),
  default-jdk,
  libjline-java
- cdbs
 Standards-Version: 4.1.4
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/sqlline.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/sqlline.git
diff --git a/debian/rules b/debian/rules
index 24466c7..8805ce4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,21 +1,18 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+export CLASSPATH=/usr/share/java/jline.jar
 
-JAVA_HOME := /usr/lib/jvm/default-java
-ANT_HOME := /usr/share/ant
+%:
+	dh $@
 
-DEB_JARS := jline
+override_dh_auto_build:
+	mkdir -p test
+	dh_auto_build -- all jars.core.build
 
-# override build and clean target
-DEB_ANT_BUILD_TARGET = all
-DEB_ANT_CLEAN_TARGET = clean
-DEB_ANT_INSTALL_TARGET = jars.core.build
+override_dh_auto_test:
 
-# Strip .sh from script name
-binary-post-install/sqlline::
-	mv $(CURDIR)/debian/sqlline/usr/bin/sqlline.sh $(CURDIR)/debian/sqlline/usr/bin/sqlline
+override_dh_install:
+	dh_install
 
-clean::
-	rm -Rf VERSION.txt tmp release
+	# Strip .sh from script name
+	mv $(CURDIR)/debian/sqlline/usr/bin/sqlline.sh $(CURDIR)/debian/sqlline/usr/bin/sqlline

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sqlline.git



More information about the pkg-java-commits mailing list