[pkg-java] r17859 - in trunk/libmiglayout-java/debian: . patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Mar 11 13:15:49 UTC 2014
Author: ebourg-guest
Date: 2014-03-11 13:15:49 +0000 (Tue, 11 Mar 2014)
New Revision: 17859
Added:
trunk/libmiglayout-java/debian/libmiglayout-java.poms
trunk/libmiglayout-java/debian/maven.ignoreRules
trunk/libmiglayout-java/debian/maven.properties
trunk/libmiglayout-java/debian/maven.rules
trunk/libmiglayout-java/debian/patches/
trunk/libmiglayout-java/debian/patches/01-tweak-swt-dependency.patch
trunk/libmiglayout-java/debian/patches/series
Removed:
trunk/libmiglayout-java/debian/ant.properties
trunk/libmiglayout-java/debian/build.xml
Modified:
trunk/libmiglayout-java/debian/changelog
trunk/libmiglayout-java/debian/control
trunk/libmiglayout-java/debian/rules
Log:
New upstream release (4.2)
Build with maven-debian-helper and install the Maven artifacts
Added a suggested dependency on libswt-gtk-3-java
Removed the build dependency on substance
Deleted: trunk/libmiglayout-java/debian/ant.properties
===================================================================
--- trunk/libmiglayout-java/debian/ant.properties 2014-03-11 10:55:47 UTC (rev 17858)
+++ trunk/libmiglayout-java/debian/ant.properties 2014-03-11 13:15:49 UTC (rev 17859)
@@ -1,4 +0,0 @@
-project.name=miglayout
-class.dir=build
-source.dir=.
-jar=miglayout.jar
Deleted: trunk/libmiglayout-java/debian/build.xml
===================================================================
--- trunk/libmiglayout-java/debian/build.xml 2014-03-11 10:55:47 UTC (rev 17858)
+++ trunk/libmiglayout-java/debian/build.xml 2014-03-11 13:15:49 UTC (rev 17859)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project default="jar" name="${project.name}" basedir="..">
-
- <target name="clean">
- <delete dir="${class.dir}" quiet="true"/>
- </target>
-
- <target name="compile" description="o Compile the source files">
- <mkdir dir="${class.dir}"/>
- <javac srcdir="${source.dir}" destdir="${class.dir}"
- debug="true" source="1.5" nowarn="true"/>
- </target>
-
- <target name="jar" description="o Create the jar" depends="compile">
- <jar jarfile="${jar}">
- <fileset dir="${class.dir}">
- <include name="**"/>
- </fileset>
- </jar>
- </target>
-
-</project>
Modified: trunk/libmiglayout-java/debian/changelog
===================================================================
--- trunk/libmiglayout-java/debian/changelog 2014-03-11 10:55:47 UTC (rev 17858)
+++ trunk/libmiglayout-java/debian/changelog 2014-03-11 13:15:49 UTC (rev 17859)
@@ -1,13 +1,16 @@
-libmiglayout-java (3.7.4-3) UNRELEASED; urgency=medium
+libmiglayout-java (4.2-1) UNRELEASED; urgency=medium
* Team upload.
+ * New upstream release
+ * Build with maven-debian-helper and install the Maven artifacts
* Download the new releases from code.google.com
* debian/control:
+ - Added a suggested dependency on libswt-gtk-3-java
+ - Removed the build dependency on substance
- Standards-Version updated to 3.9.5 (no changes)
- Use canonical URLs for the Vcs-* fields
* Switch to debhelper level 9
* Use XZ compression for the upstream tarball
- * debian/rules: Added a clean target
-- Emmanuel Bourg <ebourg at apache.org> Tue, 11 Mar 2014 09:41:19 +0100
Modified: trunk/libmiglayout-java/debian/control
===================================================================
--- trunk/libmiglayout-java/debian/control 2014-03-11 10:55:47 UTC (rev 17858)
+++ trunk/libmiglayout-java/debian/control 2014-03-11 13:15:49 UTC (rev 17859)
@@ -4,8 +4,8 @@
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>,
Andrew Ross <ubuntu at rossfamily.co.uk>
-Build-Depends: debhelper (>= 9), cdbs
-Build-Depends-Indep: ant, default-jdk, libswt-gtk-3-java, substance
+Build-Depends: debhelper (>= 9), cdbs, maven-debian-helper
+Build-Depends-Indep: ant, default-jdk, libswt-gtk-3-java
Standards-Version: 3.9.5
Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libmiglayout-java
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libmiglayout-java
@@ -14,6 +14,7 @@
Package: libmiglayout-java
Architecture: all
Depends: ${misc:Depends},
+Suggests: libswt-gtk-3-java
Description: Java Layout Manager
MiGLayout is a superbly versatile SWT/Swing layout manager that makes
layout problems trivial. It is using String or API type-checked
Added: trunk/libmiglayout-java/debian/libmiglayout-java.poms
===================================================================
--- trunk/libmiglayout-java/debian/libmiglayout-java.poms (rev 0)
+++ trunk/libmiglayout-java/debian/libmiglayout-java.poms 2014-03-11 13:15:49 UTC (rev 17859)
@@ -0,0 +1,35 @@
+# 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 --has-package-version
+core/pom.xml --has-package-version --java-lib
+swing/pom.xml --has-package-version --java-lib
+swt/pom.xml --has-package-version --java-lib
+javafx/pom.xml --ignore
+ideutil/pom.xml --has-package-version --java-lib
+demo/pom.xml --ignore
+examples/pom.xml --ignore
Added: trunk/libmiglayout-java/debian/maven.ignoreRules
===================================================================
--- trunk/libmiglayout-java/debian/maven.ignoreRules (rev 0)
+++ trunk/libmiglayout-java/debian/maven.ignoreRules 2014-03-11 13:15:49 UTC (rev 17859)
@@ -0,0 +1,10 @@
+
+com.miglayout miglayout-demo jar * * *
+com.miglayout miglayout-examples jar * * *
+com.miglayout miglayout-javafx jar * * *
+junit junit * * * *
+org.apache.maven.plugins maven-javadoc-plugin * * * *
+org.apache.maven.plugins maven-release-plugin * * * *
+org.apache.maven.plugins maven-site-plugin * * * *
+org.apache.maven.plugins maven-source-plugin * * * *
+org.apache.maven.plugins maven-surefire-plugin * * * *
Added: trunk/libmiglayout-java/debian/maven.properties
===================================================================
--- trunk/libmiglayout-java/debian/maven.properties (rev 0)
+++ trunk/libmiglayout-java/debian/maven.properties 2014-03-11 13:15:49 UTC (rev 17859)
@@ -0,0 +1,5 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
+maven.test.skip=true
Added: trunk/libmiglayout-java/debian/maven.rules
===================================================================
--- trunk/libmiglayout-java/debian/maven.rules (rev 0)
+++ trunk/libmiglayout-java/debian/maven.rules 2014-03-11 13:15:49 UTC (rev 17859)
@@ -0,0 +1 @@
+
Added: trunk/libmiglayout-java/debian/patches/01-tweak-swt-dependency.patch
===================================================================
--- trunk/libmiglayout-java/debian/patches/01-tweak-swt-dependency.patch (rev 0)
+++ trunk/libmiglayout-java/debian/patches/01-tweak-swt-dependency.patch 2014-03-11 13:15:49 UTC (rev 17859)
@@ -0,0 +1,23 @@
+Description: Link the org.eclipse.swt.gtk.linux:* artifacts to /usr/share/java/swt.jar
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/swt/pom.xml
++++ b/swt/pom.xml
+@@ -51,6 +51,8 @@
+ <groupId>org.eclipse.swt.gtk.linux</groupId>
+ <artifactId>x86</artifactId>
+ <version>3.3.0-v3346</version>
++ <scope>system</scope>
++ <systemPath>/usr/share/java/swt.jar</systemPath>
+ </dependency>
+ </dependencies>
+ </profile>
+@@ -68,6 +70,8 @@
+ <groupId>org.eclipse.swt.gtk.linux</groupId>
+ <artifactId>x86_64</artifactId>
+ <version>3.3.0-v3346</version>
++ <scope>system</scope>
++ <systemPath>/usr/share/java/swt.jar</systemPath>
+ </dependency>
+ </dependencies>
+ </profile>
Added: trunk/libmiglayout-java/debian/patches/series
===================================================================
--- trunk/libmiglayout-java/debian/patches/series (rev 0)
+++ trunk/libmiglayout-java/debian/patches/series 2014-03-11 13:15:49 UTC (rev 17859)
@@ -0,0 +1 @@
+01-tweak-swt-dependency.patch
Modified: trunk/libmiglayout-java/debian/rules
===================================================================
--- trunk/libmiglayout-java/debian/rules 2014-03-11 10:55:47 UTC (rev 17858)
+++ trunk/libmiglayout-java/debian/rules 2014-03-11 13:15:49 UTC (rev 17859)
@@ -1,18 +1,9 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/maven.mk
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_ANT_BUILDFILE := debian/build.xml
-DEB_JARS := substance swt
+JAVA_HOME := /usr/lib/jvm/default-java
-install/libmiglayout-java::
- install -m644 -D miglayout.jar $(DEB_DESTDIR)/usr/share/java/miglayout-$(DEB_UPSTREAM_VERSION).jar
- dh_link -plibmiglayout-java /usr/share/java/miglayout-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/miglayout.jar
-
-clean::
- rm -f *.jar
-
get-orig-source:
-uscan --upstream-version $(DEB_UPSTREAM_VERSION) --rename
More information about the pkg-java-commits
mailing list