[libbytelist-java] 04/14: Switch build system from cdbs to debhelper

Miguel Landaeta nomadium at moszumanska.debian.org
Wed Jan 18 20:52:10 UTC 2017


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

nomadium pushed a commit to branch experimental
in repository libbytelist-java.

commit 45e4a9835fc281a135ea9de99e06787756a596d5
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Wed Jan 18 20:03:21 2017 +0000

    Switch build system from cdbs to debhelper
---
 debian/changelog             |  1 +
 debian/control               |  7 ++-----
 debian/libbytelist-java.poms | 28 ++++++++++++++++++++++++++++
 debian/maven.ignoreRules     |  1 +
 debian/maven.rules           |  1 +
 debian/rules                 | 18 +++---------------
 6 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5d1cc4e..32c445b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libbytelist-java (1.0.14-1) UNRELEASED; urgency=medium
 
   * New upstream release. (Closes: #851719)
   * Add myself as uploader.
+  * Switch build system from cdbs to debhelper.
 
  -- Miguel Landaeta <nomadium at debian.org>  Wed, 18 Jan 2017 19:53:52 +0000
 
diff --git a/debian/control b/debian/control
index 58483e0..58f2154 100644
--- a/debian/control
+++ b/debian/control
@@ -6,14 +6,11 @@ Uploaders: Torsten Werner <twerner at debian.org>,
            Miguel Landaeta <nomadium at debian.org>
 Build-Depends:
  debhelper (>= 9),
- cdbs,
- maven-repo-helper
+ maven-debian-helper
 Build-Depends-Indep:
- ant-optional,
  default-jdk,
  libjcodings-java,
- junit,
- javahelper
+ junit
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-java/libbytelist-java.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libbytelist-java.git
diff --git a/debian/libbytelist-java.poms b/debian/libbytelist-java.poms
new file mode 100644
index 0000000..8545d14
--- /dev/null
+++ b/debian/libbytelist-java.poms
@@ -0,0 +1,28 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+#   --ignore: ignore this POM and its artifact if any
+#   --ignore-pom: don't install the POM. To use on POM files that are created
+#     temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+#   --no-parent: remove the <parent> tag from the POM
+#   --package=<package>: an alternative package to use when installing this POM
+#      and its artifact
+#   --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+#      of the version for the package.
+#   --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+#      during a clean operation with mh_cleanpom or mh_installpom
+#   --artifact=<path>: path to the build artifact associated with this POM,
+#      it will be installed when using the command mh_install. [mh_install]
+#   --java-lib: install the jar into /usr/share/java to comply with Debian
+#      packaging guidelines
+#   --usj-name=<name>: name to use when installing the library in /usr/share/java
+#   --usj-version=<version>: version to use when installing the library in /usr/share/java
+#   --no-usj-versionless: don't install the versionless link in /usr/share/java
+#   --dest-jar=<path>: the destination for the real jar.
+#     It will be installed with mh_install. [mh_install]
+#   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+#   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+#     Empty by default. [mh_install]
+#
+pom.xml --no-parent
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..049cdef
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1 @@
+org.apache.maven.wagon wagon-webdav-jackrabbit * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..5be24d9
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1 @@
+junit junit jar s/.*/3.x/ * *
diff --git a/debian/rules b/debian/rules
index 012c48d..8e053ea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,6 @@
 #!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS  := jcodings ant-junit junit
-
-install/libbytelist-java::
-	jh_classpath --classpath=/usr/share/java/jcodings.jar lib/bytelist-*.jar
-	mh_installpom -plibbytelist-java --no-parent pom.xml
-	mh_installjar -plibbytelist-java pom.xml -l lib/bytelist-*.jar
-
-clean::
-	mh_clean
+%:
+	dh $@ --buildsystem=maven
 
 get-orig-source:
-	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+	uscan --verbose --download-current-version

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



More information about the pkg-java-commits mailing list