[janino] 05/05: Switch to debhelper 7.
Damien Raude-Morvan
drazzib at alioth.debian.org
Sat Aug 17 13:16:13 UTC 2013
This is an automated email from the git hooks/post-receive script.
drazzib pushed a commit to annotated tag debian/2.6.1-1
in repository janino.
commit f963e29f6e7f92230584f9a44fecd4777e2091f9
Author: Damien Raude-Morvan <drazzib at drazzib.com>
Date: Fri Aug 16 10:45:49 2013 +0200
Switch to debhelper 7.
---
debian/ant.properties | 2 -
debian/changelog | 18 +++++-
debian/control | 36 +++++++++++-
debian/copyright | 2 +-
debian/dirs | 2 -
debian/docs | 1 -
debian/install | 2 -
debian/janino.install | 1 +
debian/{manpages => janino.manpages} | 0
debian/javabuild | 3 +
debian/libjanino-java-doc.docs | 1 +
debian/libjanino-java-doc.javadoc | 1 +
debian/libjanino-java.jlibs | 3 +
debian/libjanino-java.manifest | 2 +
debian/patches/build-remove-hardcoded.patch | 85 ---------------------------
debian/patches/series | 2 -
debian/rules | 24 ++++----
debian/source/options | 2 +
18 files changed, 75 insertions(+), 112 deletions(-)
diff --git a/debian/ant.properties b/debian/ant.properties
deleted file mode 100644
index 82b239a..0000000
--- a/debian/ant.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-ant.build.javac.target=1.4
-ant.build.javac.source=1.4
diff --git a/debian/changelog b/debian/changelog
index ae7d0ae..0573616 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,23 @@
-janino (2.6.1-1) UNRELEASED; urgency=low
+janino (2.6.1-1) unstable; urgency=low
+ * New upstream release:
+ - d/rules: Override configure step to unzip *-src.zip.
+ - d/rules: Also clean existing binary JAR files.
* d/watch: Updated from sepwatch.
* d/copyright: Update and use copyright-format 1.0.
+ * Switch to dh 7 and javahelper:
+ - d/ant.properties, d/patches/*: Dropped.
+ - d/control: Drop cdbs.
+ - d/javabuild: Build all 3 modules.
+ - d/*.javadoc: Publish 'internal' Javadoc from javahelper.
+ - d/*.jlibs: Install 3 modules into /usr/share/java.
+ - d/*.manifest: Add Main-Class attribute to janino.jar.
+ - d/rules: Call dh with javahelper.
+ * Split janino package:
+ - Move Javadoc to libjanino-java-doc package
+ - Move /usr/share/java/janino.jar to libjanino-java package.
+ - Only keep janinoc into janino package.
+ - Adjust Depends / Conflicts to help migration.
-- Damien Raude-Morvan <drazzib at debian.org> Fri, 16 Aug 2013 10:21:12 +0200
diff --git a/debian/control b/debian/control
index 1fdbd46..7cdf907 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
Uploaders: Philipp Hagemeister <ubuntu at phihag.de>,
Damien Raude-Morvan <drazzib at debian.org>
Standards-Version: 3.9.4
-Build-Depends: cdbs, debhelper (>= 9)
+Build-Depends: debhelper (>= 9), javahelper
Build-Depends-Indep: ant, default-jdk, unzip
Homepage: http://janino.net
Vcs-Git: git://anonscm.debian.org/pkg-java/janino.git
@@ -13,10 +13,42 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/janino.git
Package: janino
Architecture: all
+Depends: libjanino-java, libjanino-java-doc, ${misc:Depends}
+Recommends: default-jre-headless
+Description: runtime compiler for Java expressions - binary
+ Janino is a compiler that reads a Java expression, block, class body,
+ source file or a set of source files, and generates Java bytecode that is
+ loaded and executed directly. Janino is not intended to be a development tool,
+ but an embedded compiler for run-time compilation purposes, e.g. expression
+ evaluators or embedded code as with JSP.
+ .
+ This package contains the janinoc tool.
+
+Package: libjanino-java
+Architecture: all
+Depends: ${misc:Depends}
+Replaces: janino (<< 2.6.1-1~)
+Breaks: janino (<< 2.6.1-1~)
+Description: runtime compiler for Java expressions - library
+ Janino is a compiler that reads a Java expression, block, class body,
+ source file or a set of source files, and generates Java bytecode that is
+ loaded and executed directly. Janino is not intended to be a development tool,
+ but an embedded compiler for run-time compilation purposes, e.g. expression
+ evaluators or embedded code as with JSP.
+ .
+ This package contains Java library.
+
+Package: libjanino-java-doc
+Section: doc
+Architecture: all
Depends: ${misc:Depends}
-Description: Runtime Java compiler
+Replaces: janino (<< 2.6.1-1~)
+Breaks: janino (<< 2.6.1-1~)
+Description: runtime compiler for Java expressions - documentation
Janino is a compiler that reads a Java expression, block, class body,
source file or a set of source files, and generates Java bytecode that is
loaded and executed directly. Janino is not intended to be a development tool,
but an embedded compiler for run-time compilation purposes, e.g. expression
evaluators or embedded code as with JSP.
+ .
+ This package contains Java library documentation as Javadoc.
diff --git a/debian/copyright b/debian/copyright
index a82a92a..54965f6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -37,4 +37,4 @@ License: BSD-3-clauses
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 60dac6d..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/java
-usr/bin
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index cce9c33..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-src/org/codehaus/janino/samples
diff --git a/debian/install b/debian/install
deleted file mode 100644
index 2ce7358..0000000
--- a/debian/install
+++ /dev/null
@@ -1,2 +0,0 @@
-build/lib/janino-*.jar usr/share/java/
-debian/janinoc usr/bin
diff --git a/debian/janino.install b/debian/janino.install
new file mode 100644
index 0000000..d250a60
--- /dev/null
+++ b/debian/janino.install
@@ -0,0 +1 @@
+debian/janinoc /usr/bin/
diff --git a/debian/manpages b/debian/janino.manpages
similarity index 100%
rename from debian/manpages
rename to debian/janino.manpages
diff --git a/debian/javabuild b/debian/javabuild
new file mode 100644
index 0000000..7d5cf27
--- /dev/null
+++ b/debian/javabuild
@@ -0,0 +1,3 @@
+commons-compiler.jar commons-compiler/
+commons-compiler-jdk.jar commons-compiler-jdk/
+janino.jar janino/
diff --git a/debian/libjanino-java-doc.docs b/debian/libjanino-java-doc.docs
new file mode 100644
index 0000000..54105fb
--- /dev/null
+++ b/debian/libjanino-java-doc.docs
@@ -0,0 +1 @@
+janino/org/codehaus/janino/samples
diff --git a/debian/libjanino-java-doc.javadoc b/debian/libjanino-java-doc.javadoc
new file mode 100644
index 0000000..aa2ed67
--- /dev/null
+++ b/debian/libjanino-java-doc.javadoc
@@ -0,0 +1 @@
+internal /usr/share/doc/libjanino-java/api
\ No newline at end of file
diff --git a/debian/libjanino-java.jlibs b/debian/libjanino-java.jlibs
new file mode 100644
index 0000000..d408e47
--- /dev/null
+++ b/debian/libjanino-java.jlibs
@@ -0,0 +1,3 @@
+commons-compiler.jar
+commons-compiler-jdk.jar
+janino.jar
\ No newline at end of file
diff --git a/debian/libjanino-java.manifest b/debian/libjanino-java.manifest
new file mode 100644
index 0000000..f1201ec
--- /dev/null
+++ b/debian/libjanino-java.manifest
@@ -0,0 +1,2 @@
+usr/share/java/janino.jar:
+ Main-Class: org.codehaus.janino.SimpleCompiler
diff --git a/debian/patches/build-remove-hardcoded.patch b/debian/patches/build-remove-hardcoded.patch
deleted file mode 100644
index 953a8a2..0000000
--- a/debian/patches/build-remove-hardcoded.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From: <ubuntu at phihag.de>
-Subject: Remove hardcoded paths from build.xml.
- Create a manifest in the resulting jar file to set the Compiler class
- as main class. Correct indenting
-
----
- build.xml | 32 +++++++++++++++++---------------
- 1 file changed, 17 insertions(+), 15 deletions(-)
-
---- a/build.xml
-+++ b/build.xml
-@@ -35,23 +35,23 @@
- <project name="Janino" default="compile" basedir=".">
- <description>
- Build file for the Janino project
-- </description>
--
-+ </description>
-+
- <property file="build.properties"/>
--
-+ <property name="janino.manifest" value="janino.manifest"/>
-+
- <target name="compile" description="Compile the source">
- <mkdir dir="build/classes"/>
--
-+
- <javac
- fork="yes"
-- executable="${jdk_1_2_2_home}/bin/javac"
- srcdir="src" excludes="org/codehaus/janino/AstGeneratorVisitor.java"
- destdir="build/classes"
- debug="true"
- debuglevel="source"
- />
- </target>
--
-+
- <target name="javadoc" description="Build JAVADOC" depends="compile">
- <mkdir dir="build/javadoc"/>
- <javadoc
-@@ -64,15 +64,16 @@
- classpath="build/classes;${ant_jar}"
- destdir="build/javadoc"
- packagenames="${javadoc_packages}"
-- >
-- <link offline="true" href="${jdk_javadoc_remote}" packagelistloc="${jdk_javadoc_local}"/>
-- <link offline="true" href="${ant_javadoc_remote}" packagelistloc="${ant_javadoc_local}"/>
-- </javadoc>
-+ />
-+ </target>
-+
-+ <target name="createManifest" description="Create a manifest file for the resulting jar">
-+ <echo file="${janino.manifest}" append="false" message="Manifest-Version: 1.0${line.separator}Main-Class: org.codehaus.janino.Compiler${line.separator}"/>
- </target>
--
-- <target name="jar" description="Create the janino jar." depends="compile">
-+
-+ <target name="jar" description="Create the janino jar." depends="compile, createManifest">
- <mkdir dir="build/lib"/>
-- <jar jarfile="build/lib/janino.jar" basedir="build/classes"/>
-+ <jar jarfile="build/lib/janino.jar" basedir="build/classes" manifest="${janino.manifest}"/>
- </target>
-
- <target name="dist" description="Generate the distribution" depends="jar, javadoc">
-@@ -84,7 +85,7 @@
- <arg value="build/lib/janino.jar"/>
- <arg value="dummy"/>
- </exec>
--
-+
- <zip destfile="${janino_zip}">
- <zipfileset file="build/lib/janino.jar" prefix="janino-${version}/lib"/>
- <zipfileset dir="build/javadoc" prefix="janino-${version}/javadoc"/>
-@@ -92,8 +93,9 @@
- <zipfileset file="build.*" prefix="janino-${version}"/>
- </zip>
- </target>
--
-+
- <target name="clean" description="Clean built files.">
- <delete dir="build"/>
-+ <delete file="${janino.manifest}"/>
- </target>
- </project>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d98777d..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-build-remove-hardcoded.patch
-
diff --git a/debian/rules b/debian/rules
index 57bea22..1a6b84c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,26 +1,22 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+export JAVA_HOME=/usr/lib/jvm/default-java
+export CLASSPATH=/usr/share/java/ant.jar:commons-compiler.jar
-DEB_ANT_BUILDFILE := build.xml
-DEB_ANT_BUILD_TARGET := jar
-JAVA_HOME := /usr/lib/jvm/default-java
+%:
+ dh $@ --with javahelper
# Package name (exclusively) for get-orig-source. ${DEB_SOURCE_PACKAGE} can't be used as it does not work when calling get-orig-source from any directory as
# http://www.debian.org/doc/debian-policy/ch-source.html#s-debianrules defines.
PACKAGE_NAME := janino
-# Path to the debian directory, exclusively for get-orig-source
-DEBIAN_DIR := $(shell echo ${MAKEFILE_LIST} | awk '{print $$1}' | xargs dirname )
+override_dh_auto_configure:
+ unzip -q -o -d commons-compiler-jdk/ commons-compiler-jdk-src.zip
+ unzip -q -o -d commons-compiler/ commons-compiler-src.zip
+ unzip -q -o -d janino/ janino-src.zip
-common-post-build-indep::
- mv build/lib/janino.jar build/lib/${DEB_SOURCE_PACKAGE}-${DEB_VERSION}.jar
-
-common-install-prehook-indep::
- # Create versionless symlink
- cd debian/${DEB_SOURCE_PACKAGE}/usr/share/java/ && \
- ln -s ${DEB_SOURCE_PACKAGE}-${DEB_VERSION}.jar ${DEB_SOURCE_PACKAGE}.jar
+override_dh_auto_clean:
+ -rm -rf janino/ commons-compiler/ commons-compiler-jdk/
get-orig-source::
cd ${DEBIAN_DIR}/.. && \
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..b326e85
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1,2 @@
+# Do not generate diff for changes in config.(sub|guess)
+extend-diff-ignore = "(^|/)README.txt$"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/janino.git
More information about the pkg-java-commits
mailing list