[pkg-java] r17863 - in tags/libmiglayout-java: . 4.2-1/debian

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Tue Mar 11 15:59:23 UTC 2014


Author: ebourg-guest
Date: 2014-03-11 15:59:23 +0000 (Tue, 11 Mar 2014)
New Revision: 17863

Added:
   tags/libmiglayout-java/4.2-1/
   tags/libmiglayout-java/4.2-1/debian/changelog
   tags/libmiglayout-java/4.2-1/debian/compat
   tags/libmiglayout-java/4.2-1/debian/control
   tags/libmiglayout-java/4.2-1/debian/libmiglayout-java.poms
   tags/libmiglayout-java/4.2-1/debian/maven.ignoreRules
   tags/libmiglayout-java/4.2-1/debian/maven.properties
   tags/libmiglayout-java/4.2-1/debian/maven.rules
   tags/libmiglayout-java/4.2-1/debian/orig-tar.sh
   tags/libmiglayout-java/4.2-1/debian/patches/
   tags/libmiglayout-java/4.2-1/debian/rules
   tags/libmiglayout-java/4.2-1/debian/watch
Removed:
   tags/libmiglayout-java/4.2-1/debian/ant.properties
   tags/libmiglayout-java/4.2-1/debian/build.xml
   tags/libmiglayout-java/4.2-1/debian/changelog
   tags/libmiglayout-java/4.2-1/debian/compat
   tags/libmiglayout-java/4.2-1/debian/control
   tags/libmiglayout-java/4.2-1/debian/orig-tar.sh
   tags/libmiglayout-java/4.2-1/debian/rules
   tags/libmiglayout-java/4.2-1/debian/watch
Log:
[svn-buildpackage] Tagging libmiglayout-java 4.2-1

Deleted: tags/libmiglayout-java/4.2-1/debian/ant.properties
===================================================================
--- trunk/libmiglayout-java/debian/ant.properties	2014-03-11 07:41:49 UTC (rev 17856)
+++ tags/libmiglayout-java/4.2-1/debian/ant.properties	2014-03-11 15:59:23 UTC (rev 17863)
@@ -1,4 +0,0 @@
-project.name=miglayout
-class.dir=build
-source.dir=.
-jar=miglayout.jar

Deleted: tags/libmiglayout-java/4.2-1/debian/build.xml
===================================================================
--- trunk/libmiglayout-java/debian/build.xml	2014-03-11 07:41:49 UTC (rev 17856)
+++ tags/libmiglayout-java/4.2-1/debian/build.xml	2014-03-11 15:59:23 UTC (rev 17863)
@@ -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>

Deleted: tags/libmiglayout-java/4.2-1/debian/changelog
===================================================================
--- trunk/libmiglayout-java/debian/changelog	2014-03-11 07:41:49 UTC (rev 17856)
+++ tags/libmiglayout-java/4.2-1/debian/changelog	2014-03-11 15:59:23 UTC (rev 17863)
@@ -1,47 +0,0 @@
-libmiglayout-java (3.7.4-2) unstable; urgency=low
-
-  * Replace libswt-gtk-3.6-java with libswt-gtk-3-java
-
- -- Andrew Ross <ubuntu at rossfamily.co.uk>  Wed, 27 Jul 2011 23:35:34 +0100
-
-libmiglayout-java (3.7.4-1) unstable; urgency=low
-
-  * New upstream release.
-  * Replace libswt-gtk-3.5-java with libswt-gtk-3.6-java (Closes: #629721)
-  * Bumped standards version to 3.9.2 (no changes)
-  * Drop dependency on jre.
-  * Added debian/source/format file
-  * Removed reference to /usr/share/common-licenses/BSD as it is no
-    longer included.
-
- -- Andrew Ross <ubuntu at rossfamily.co.uk>  Wed, 08 Jun 2011 19:27:32 +0100
-
-libmiglayout-java (3.7.2-1) unstable; urgency=low
-
-  * New upstream release
-  * debian/control: replace libswt-gtk-3.4-java with libswt-gtk-3.5-java,
-    fixes build (Closes: #564387)
-
- -- Varun Hiremath <varun at debian.org>  Sun, 24 Jan 2010 13:59:12 -0500
-
-libmiglayout-java (3.7.1-2) unstable; urgency=low
-
-  * debian/rules: DEB_JARS use swt.jar provided using alternatives in
-    /usr/share/java instead of the versioned jar in /usr/lib/java
-
- -- Varun Hiremath <varun at debian.org>  Mon, 31 Aug 2009 19:50:21 -0400
-
-libmiglayout-java (3.7.1-1) unstable; urgency=low
-
-  * New upstream release
-  * Build-Depends: Replace libswt3.2-gtk-java with libswt-gtk-3.4-java,
-    fixes FTBFS (Closes: #543129)
-  * Bump Standards-Version to 3.8.3
-
- -- Varun Hiremath <varun at debian.org>  Mon, 24 Aug 2009 03:10:26 -0400
-
-libmiglayout-java (3.7-1) unstable; urgency=low
-
-  * Initial release (Closes: #530490)
-
- -- Varun Hiremath <varun at debian.org>  Mon, 25 May 2009 01:59:26 -0400

Copied: tags/libmiglayout-java/4.2-1/debian/changelog (from rev 17862, trunk/libmiglayout-java/debian/changelog)
===================================================================
--- tags/libmiglayout-java/4.2-1/debian/changelog	                        (rev 0)
+++ tags/libmiglayout-java/4.2-1/debian/changelog	2014-03-11 15:59:23 UTC (rev 17863)
@@ -0,0 +1,63 @@
+libmiglayout-java (4.2-1) unstable; 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
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 11 Mar 2014 09:41:19 +0100
+
+libmiglayout-java (3.7.4-2) unstable; urgency=low
+
+  * Replace libswt-gtk-3.6-java with libswt-gtk-3-java
+
+ -- Andrew Ross <ubuntu at rossfamily.co.uk>  Wed, 27 Jul 2011 23:35:34 +0100
+
+libmiglayout-java (3.7.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Replace libswt-gtk-3.5-java with libswt-gtk-3.6-java (Closes: #629721)
+  * Bumped standards version to 3.9.2 (no changes)
+  * Drop dependency on jre.
+  * Added debian/source/format file
+  * Removed reference to /usr/share/common-licenses/BSD as it is no
+    longer included.
+
+ -- Andrew Ross <ubuntu at rossfamily.co.uk>  Wed, 08 Jun 2011 19:27:32 +0100
+
+libmiglayout-java (3.7.2-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/control: replace libswt-gtk-3.4-java with libswt-gtk-3.5-java,
+    fixes build (Closes: #564387)
+
+ -- Varun Hiremath <varun at debian.org>  Sun, 24 Jan 2010 13:59:12 -0500
+
+libmiglayout-java (3.7.1-2) unstable; urgency=low
+
+  * debian/rules: DEB_JARS use swt.jar provided using alternatives in
+    /usr/share/java instead of the versioned jar in /usr/lib/java
+
+ -- Varun Hiremath <varun at debian.org>  Mon, 31 Aug 2009 19:50:21 -0400
+
+libmiglayout-java (3.7.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Build-Depends: Replace libswt3.2-gtk-java with libswt-gtk-3.4-java,
+    fixes FTBFS (Closes: #543129)
+  * Bump Standards-Version to 3.8.3
+
+ -- Varun Hiremath <varun at debian.org>  Mon, 24 Aug 2009 03:10:26 -0400
+
+libmiglayout-java (3.7-1) unstable; urgency=low
+
+  * Initial release (Closes: #530490)
+
+ -- Varun Hiremath <varun at debian.org>  Mon, 25 May 2009 01:59:26 -0400

Deleted: tags/libmiglayout-java/4.2-1/debian/compat
===================================================================
--- trunk/libmiglayout-java/debian/compat	2014-03-11 07:41:49 UTC (rev 17856)
+++ tags/libmiglayout-java/4.2-1/debian/compat	2014-03-11 15:59:23 UTC (rev 17863)
@@ -1 +0,0 @@
-6

Copied: tags/libmiglayout-java/4.2-1/debian/compat (from rev 17857, trunk/libmiglayout-java/debian/compat)
===================================================================
--- tags/libmiglayout-java/4.2-1/debian/compat	                        (rev 0)
+++ tags/libmiglayout-java/4.2-1/debian/compat	2014-03-11 15:59:23 UTC (rev 17863)
@@ -0,0 +1 @@
+9

Deleted: tags/libmiglayout-java/4.2-1/debian/control
===================================================================
--- trunk/libmiglayout-java/debian/control	2014-03-11 07:41:49 UTC (rev 17856)
+++ tags/libmiglayout-java/4.2-1/debian/control	2014-03-11 15:59:23 UTC (rev 17863)
@@ -1,23 +0,0 @@
-Source: libmiglayout-java
-Section: java
-Priority: optional
-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 (>= 6), cdbs
-Build-Depends-Indep: ant, default-jdk, libswt-gtk-3-java, substance
-Standards-Version: 3.9.2
-Homepage: http://www.miglayout.com
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libmiglayout-java
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libmiglayout-java
-
-Package: libmiglayout-java
-Architecture: all
-Depends: ${misc:Depends}, 
-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
- constraints to format the layout. MiGLayout can produce flowing, grid
- based, absolute (with links), grouped and docking layouts. MiGLayout
- is created to be to manually coded layouts what Matisse/GroupLayout
- is to IDE supported visual layouts.

Copied: tags/libmiglayout-java/4.2-1/debian/control (from rev 17859, trunk/libmiglayout-java/debian/control)
===================================================================
--- tags/libmiglayout-java/4.2-1/debian/control	                        (rev 0)
+++ tags/libmiglayout-java/4.2-1/debian/control	2014-03-11 15:59:23 UTC (rev 17863)
@@ -0,0 +1,24 @@
+Source: libmiglayout-java
+Section: java
+Priority: optional
+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, 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
+Homepage: http://www.miglayout.com
+
+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
+ constraints to format the layout. MiGLayout can produce flowing, grid
+ based, absolute (with links), grouped and docking layouts. MiGLayout
+ is created to be to manually coded layouts what Matisse/GroupLayout
+ is to IDE supported visual layouts.

Copied: tags/libmiglayout-java/4.2-1/debian/libmiglayout-java.poms (from rev 17859, trunk/libmiglayout-java/debian/libmiglayout-java.poms)
===================================================================
--- tags/libmiglayout-java/4.2-1/debian/libmiglayout-java.poms	                        (rev 0)
+++ tags/libmiglayout-java/4.2-1/debian/libmiglayout-java.poms	2014-03-11 15:59:23 UTC (rev 17863)
@@ -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

Copied: tags/libmiglayout-java/4.2-1/debian/maven.ignoreRules (from rev 17859, trunk/libmiglayout-java/debian/maven.ignoreRules)
===================================================================
--- tags/libmiglayout-java/4.2-1/debian/maven.ignoreRules	                        (rev 0)
+++ tags/libmiglayout-java/4.2-1/debian/maven.ignoreRules	2014-03-11 15:59:23 UTC (rev 17863)
@@ -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 * * * *

Copied: tags/libmiglayout-java/4.2-1/debian/maven.properties (from rev 17859, trunk/libmiglayout-java/debian/maven.properties)
===================================================================
--- tags/libmiglayout-java/4.2-1/debian/maven.properties	                        (rev 0)
+++ tags/libmiglayout-java/4.2-1/debian/maven.properties	2014-03-11 15:59:23 UTC (rev 17863)
@@ -0,0 +1,5 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
+maven.test.skip=true

Copied: tags/libmiglayout-java/4.2-1/debian/maven.rules (from rev 17859, trunk/libmiglayout-java/debian/maven.rules)
===================================================================
--- tags/libmiglayout-java/4.2-1/debian/maven.rules	                        (rev 0)
+++ tags/libmiglayout-java/4.2-1/debian/maven.rules	2014-03-11 15:59:23 UTC (rev 17863)
@@ -0,0 +1 @@
+

Deleted: tags/libmiglayout-java/4.2-1/debian/orig-tar.sh
===================================================================
--- trunk/libmiglayout-java/debian/orig-tar.sh	2014-03-11 07:41:49 UTC (rev 17856)
+++ tags/libmiglayout-java/4.2-1/debian/orig-tar.sh	2014-03-11 15:59:23 UTC (rev 17863)
@@ -1,18 +0,0 @@
-#!/bin/sh -e
-
-# called by uscan with '--upstream-version' <version> <file>
-DIR=miglayout-$2
-TAR=../libmiglayout-java_$2.orig.tar.gz
-
-# clean up the upstream tarball
-mkdir $DIR
-(cd $DIR && jar xf ../$3)
-tar -c -z -f $TAR $DIR
-rm -rf $DIR $3
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
-    . .svn/deb-layout
-    mv $TAR $origDir
-    echo "moved $TAR to $origDir"
-fi

Copied: tags/libmiglayout-java/4.2-1/debian/orig-tar.sh (from rev 17858, trunk/libmiglayout-java/debian/orig-tar.sh)
===================================================================
--- tags/libmiglayout-java/4.2-1/debian/orig-tar.sh	                        (rev 0)
+++ tags/libmiglayout-java/4.2-1/debian/orig-tar.sh	2014-03-11 15:59:23 UTC (rev 17863)
@@ -0,0 +1,17 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+VERSION=$2
+TAR=../libmiglayout-java_$VERSION.orig.tar.xz
+
+# clean up the upstream tarball
+unzip $3
+XZ_OPT=--best tar -c -J -f $TAR miglayout-*
+rm -rf miglayout-* $3
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+    . .svn/deb-layout
+    mv $TAR $origDir
+    echo "moved $TAR to $origDir"
+fi

Deleted: tags/libmiglayout-java/4.2-1/debian/rules
===================================================================
--- trunk/libmiglayout-java/debian/rules	2014-03-11 07:41:49 UTC (rev 17856)
+++ tags/libmiglayout-java/4.2-1/debian/rules	2014-03-11 15:59:23 UTC (rev 17863)
@@ -1,15 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-JAVA_HOME		:= /usr/lib/jvm/default-java
-DEB_ANT_BUILDFILE	:= debian/build.xml
-DEB_JARS		:= substance swt
-
-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
-
-get-orig-source:
-	-uscan --upstream-version 0 --rename	

Copied: tags/libmiglayout-java/4.2-1/debian/rules (from rev 17861, trunk/libmiglayout-java/debian/rules)
===================================================================
--- tags/libmiglayout-java/4.2-1/debian/rules	                        (rev 0)
+++ tags/libmiglayout-java/4.2-1/debian/rules	2014-03-11 15:59:23 UTC (rev 17863)
@@ -0,0 +1,20 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/maven.mk
+
+JAVA_HOME := /usr/lib/jvm/default-java
+
+binary-install/libmiglayout-java::
+	# Create a all in one jar to ensure the backward compatibility
+	mkdir target/classes
+	cp -R core/target/classes/*    target/classes
+	cp -R swing/target/classes/*   target/classes
+	cp -R swt/target/classes/*     target/classes
+	cp -R ideutil/target/classes/* target/classes
+	jar -cf target/miglayout.jar -C target/classes/ .
+	dh_install -plibmiglayout-java target/miglayout.jar usr/share/java
+	dh_link -plibmiglayout-java /usr/share/java/miglayout.jar /usr/share/java/miglayout-$(DEB_UPSTREAM_VERSION).jar
+
+get-orig-source:
+	-uscan --upstream-version $(DEB_UPSTREAM_VERSION) --rename

Deleted: tags/libmiglayout-java/4.2-1/debian/watch
===================================================================
--- trunk/libmiglayout-java/debian/watch	2014-03-11 07:41:49 UTC (rev 17856)
+++ tags/libmiglayout-java/4.2-1/debian/watch	2014-03-11 15:59:23 UTC (rev 17863)
@@ -1,3 +0,0 @@
-version=3
-http://www.migcalendar.com/miglayout/versions/([\d\.]+)/miglayout-([\d\.]+)-sources.jar \
-  debian debian/orig-tar.sh

Copied: tags/libmiglayout-java/4.2-1/debian/watch (from rev 17858, trunk/libmiglayout-java/debian/watch)
===================================================================
--- tags/libmiglayout-java/4.2-1/debian/watch	                        (rev 0)
+++ tags/libmiglayout-java/4.2-1/debian/watch	2014-03-11 15:59:23 UTC (rev 17863)
@@ -0,0 +1,3 @@
+version=3
+opts=downloadurlmangle=s^.*/((\d[\d\.]+))^http://miglayout.googlecode.com/archive/miglayout-parent-$1.zip^ \
+http://central.maven.org/maven2/com/miglayout/miglayout-core/ (\d[\d\.]+)/.* debian debian/orig-tar.sh




More information about the pkg-java-commits mailing list