Author: drazzib Date: 2011-03-05 23:33:03 +0000 (Sat, 05 Mar 2011) New Revision: 13388
Added: trunk/libswingx-java/debian/libswingx-java.links trunk/libswingx-java/debian/maven.ignoreRules trunk/libswingx-java/debian/maven.properties Removed: trunk/libswingx-java/debian/build.properties trunk/libswingx-java/debian/build.xml trunk/libswingx-java/debian/patches/pom.diff trunk/libswingx-java/debian/patches/series Modified: trunk/libswingx-java/debian/README.source trunk/libswingx-java/debian/changelog trunk/libswingx-java/debian/control trunk/libswingx-java/debian/copyright trunk/libswingx-java/debian/libswingx-java-doc.install trunk/libswingx-java/debian/libswingx-java.poms trunk/libswingx-java/debian/maven.rules trunk/libswingx-java/debian/orig-tar.sh trunk/libswingx-java/debian/rules trunk/libswingx-java/debian/watch Log: * New upstream release. * Switch to maven as build system: - d/control: drop ant, add maven-debian-helper - d/rules: use maven.mk * d/patches/pom.diff: drop, uneeded since upstream fixed its dependencies. * d/watch: update to use java.net directly. * d/rules: force debian version for JARs (Closes: #603495). * d/copyright: Update to lastest DEP-5 r166. Modified: trunk/libswingx-java/debian/README.source =================================================================== --- trunk/libswingx-java/debian/README.source 2011-03-05 23:11:23 UTC (rev 13387) +++ trunk/libswingx-java/debian/README.source 2011-03-05 23:33:03 UTC (rev 13388) @@ -10,4 +10,10 @@ For more details on repackaging of upstream sources please see the debian/orig-tar.sh file. --- Varun Hiremath <[email protected]> Mon, 27 Aug 2007 19:02:53 +0530 +Maven build system +================== + +The build system uses Maven but prevents it from downloading +anything from the Internet, making the build compliant with +the Debian policy. + Deleted: trunk/libswingx-java/debian/build.properties =================================================================== --- trunk/libswingx-java/debian/build.properties 2011-03-05 23:11:23 UTC (rev 13387) +++ trunk/libswingx-java/debian/build.properties 2011-03-05 23:33:03 UTC (rev 13388) @@ -1,6 +0,0 @@ -javadoc.dir=build/api -maven.test.skip=true -build.javaVersion=1.5 -classpath.compile = \ - /usr/share/java/batik-all.jar:\ - ${basedir}/swingx-core/build/swingx-core-${version}.jar Deleted: trunk/libswingx-java/debian/build.xml =================================================================== --- trunk/libswingx-java/debian/build.xml 2011-03-05 23:11:23 UTC (rev 13387) +++ trunk/libswingx-java/debian/build.xml 2011-03-05 23:33:03 UTC (rev 13388) @@ -1,49 +0,0 @@ -<project name="swingx" basedir=".." default="build"> - - <property file="debian/build.properties"/> - <property name="maven.build" value="/usr/share/maven-ant-helper/maven-build.xml"/> - <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/> - - <macrodef name="cleanmodule"> - <attribute name="dir"/> - <sequential> - <ant target="clean" antfile="${maven.build}" dir="@{dir}"> - <property name="debian.dir" location="debian" /> - <property name="project.dir" value="@{dir}" /> - </ant> - </sequential> - </macrodef> - - <macrodef name="packagemodule"> - <attribute name="dir"/> - <attribute name="src"/> - <sequential> - <ant target="package" antfile="${maven.build}" dir="@{dir}"> - <property name="debian.dir" location="debian" /> - <property name="project.dir" value="@{dir}" /> - <property name="build.sourceDirectory" value="@{src}"/> - </ant> - </sequential> - </macrodef> - - - <target name="clean"> - <delete dir="build"/> - <cleanmodule dir="swingx-core"/> - <cleanmodule dir="swingx-beaninfo"/> - </target> - - <target name="package"> - <packagemodule dir="swingx-core" src="../src/java/"/> - <packagemodule dir="swingx-beaninfo" src="../src/beaninfo/"/> - </target> - - <target name="javadoc"> - <javadoc destdir="${javadoc.dir}"> - <packageset dir="src/java/"/> - <packageset dir="src/beaninfo/"/> - </javadoc> - </target> - - -</project> Modified: trunk/libswingx-java/debian/changelog =================================================================== --- trunk/libswingx-java/debian/changelog 2011-03-05 23:11:23 UTC (rev 13387) +++ trunk/libswingx-java/debian/changelog 2011-03-05 23:33:03 UTC (rev 13388) @@ -1,3 +1,16 @@ +libswingx-java (1:1.6.2-1) unstable; urgency=low + + * New upstream release. + * Switch to maven as build system: + - d/control: drop ant, add maven-debian-helper + - d/rules: use maven.mk + * d/patches/pom.diff: drop, uneeded since upstream fixed its dependencies. + * d/watch: update to use java.net directly. + * d/rules: force debian version for JARs (Closes: #603495). + * d/copyright: Update to lastest DEP-5 r166. + + -- Damien Raude-Morvan <[email protected]> Sun, 06 Mar 2011 00:28:45 +0100 + libswingx-java (1:1.6.1-1) unstable; urgency=low * New upstream release. Modified: trunk/libswingx-java/debian/control =================================================================== --- trunk/libswingx-java/debian/control 2011-03-05 23:11:23 UTC (rev 13387) +++ trunk/libswingx-java/debian/control 2011-03-05 23:33:03 UTC (rev 13388) @@ -4,8 +4,8 @@ Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Varun Hiremath <[email protected]>, Torsten Werner <[email protected]>, Damien Raude-Morvan <[email protected]> -Build-Depends: cdbs, debhelper (>= 7), default-jdk, ant, maven-ant-helper -Build-Depends-Indep: libbatik-java, maven-repo-helper +Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-debian-helper (>= 1.4) +Build-Depends-Indep: default-jdk-doc, libmaven-javadoc-plugin-java, libjhlabs-filters-java Standards-Version: 3.9.1 Homepage: https://swingx.dev.java.net/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libswingx-java/ @@ -13,8 +13,9 @@ Package: libswingx-java Architecture: all -Depends: ${misc:Depends} -Suggests: libbatik-java +Depends: ${misc:Depends}, ${maven:Depends} +Recommends: ${maven:OptionalDepends} +Suggests: libswingx-java-doc Description: extensions to the Swing GUI toolkit This package contains extensions to the Swing GUI toolkit, including new and enhanced components that provide functionality commonly required by rich @@ -35,8 +36,8 @@ Package: libswingx-java-doc Architecture: all Section: doc -Depends: ${misc:Depends} -Suggests: libswingx-java +Depends: ${misc:Depends}, ${maven:DocDepends} +Recommends: ${maven:DocOptionalDepends} Description: extensions to the Swing GUI toolkit - documentation This package contains extensions to the Swing GUI toolkit, including new and enhanced components that provide functionality commonly required by rich Modified: trunk/libswingx-java/debian/copyright =================================================================== --- trunk/libswingx-java/debian/copyright 2011-03-05 23:11:23 UTC (rev 13387) +++ trunk/libswingx-java/debian/copyright 2011-03-05 23:33:03 UTC (rev 13388) @@ -1,6 +1,6 @@ -Format-Specification: http://dep.debian.net/deps/dep5/ -Name: SwingX -Maintainer: SwingLabs SwingX Project +Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166 +Upstream-Name: SwingX +Upstream-Contact: SwingLabs SwingX Project Source: http://swinglabs.org/downloads.jsp Files: * @@ -10,12 +10,12 @@ modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + . This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - + . On Debian systems, the complete text of the GNU Lesser General Public License can be found in `/usr/share/common-licenses/LGPL-2'. @@ -25,9 +25,9 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + . http://www.apache.org/licenses/LICENSE-2.0 - + . Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -39,9 +39,9 @@ src/java/org/jdesktop/swingx/geom/Star2D.java Copyright: Copyright 2005 Sun Microsystems, Inc. Copyright: Copyright (c) 2006 Romain Guy <[email protected]> -License: LPGL-2.1, BSD +License: LPGL-2.1+ or BSD Dual-licensed under LGPL (Sun and Romain Guy) and BSD (Romain Guy). - + . Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -52,7 +52,7 @@ documentation and/or other materials provided with the distribution. 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. - + . THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. Modified: trunk/libswingx-java/debian/libswingx-java-doc.install =================================================================== --- trunk/libswingx-java/debian/libswingx-java-doc.install 2011-03-05 23:11:23 UTC (rev 13387) +++ trunk/libswingx-java/debian/libswingx-java-doc.install 2011-03-05 23:33:03 UTC (rev 13388) @@ -1 +1,2 @@ -build/api /usr/share/doc/libswingx-java/ +target/site/apidocs/* usr/share/doc/libswingx-java/api + Added: trunk/libswingx-java/debian/libswingx-java.links =================================================================== --- trunk/libswingx-java/debian/libswingx-java.links (rev 0) +++ trunk/libswingx-java/debian/libswingx-java.links 2011-03-05 23:33:03 UTC (rev 13388) @@ -0,0 +1 @@ +/usr/share/java/swingx-core.jar /usr/share/java/swingx.jar Modified: trunk/libswingx-java/debian/libswingx-java.poms =================================================================== --- trunk/libswingx-java/debian/libswingx-java.poms 2011-03-05 23:11:23 UTC (rev 13387) +++ trunk/libswingx-java/debian/libswingx-java.poms 2011-03-05 23:33:03 UTC (rev 13388) @@ -1,3 +1,3 @@ pom.xml --no-parent -swingx-core/pom.xml --no-parent -swingx-beaninfo/pom.xml --no-parent +swingx-core/pom.xml +swingx-beaninfo/pom.xml Added: trunk/libswingx-java/debian/maven.ignoreRules =================================================================== --- trunk/libswingx-java/debian/maven.ignoreRules (rev 0) +++ trunk/libswingx-java/debian/maven.ignoreRules 2011-03-05 23:33:03 UTC (rev 13388) @@ -0,0 +1,4 @@ +junit junit * * * * +net.sf.jmd maven-crap4j-plugin * * * * +org.apache.maven.plugins maven-surefire-plugin * * * * +org.codehaus.mojo emma-maven-plugin * * * * Added: trunk/libswingx-java/debian/maven.properties =================================================================== --- trunk/libswingx-java/debian/maven.properties (rev 0) +++ trunk/libswingx-java/debian/maven.properties 2011-03-05 23:33:03 UTC (rev 13388) @@ -0,0 +1 @@ +maven.test.skip=true Modified: trunk/libswingx-java/debian/maven.rules =================================================================== --- trunk/libswingx-java/debian/maven.rules 2011-03-05 23:11:23 UTC (rev 13387) +++ trunk/libswingx-java/debian/maven.rules 2011-03-05 23:33:03 UTC (rev 13388) @@ -1,4 +1,6 @@ -commons-collections commons-collections jar s/3\..*/3.x/ -junit junit jar s/3\..*/3.x/ -jmock jmock jar s/.*/1.x/ - +commons-collections commons-collections jar s/3\..*/3.x/ * * +junit junit jar s/3\..*/3.x/ * * +jmock jmock jar s/.*/1.x/ * * +org.swinglabs swingx-beaninfo jar s/1\..*/1.x/ * * +org.swinglabs swingx-core jar s/1\..*/1.x/ * * +org.swinglabs swingx-project pom s/1\..*/1.x/ * * Modified: trunk/libswingx-java/debian/orig-tar.sh =================================================================== --- trunk/libswingx-java/debian/orig-tar.sh 2011-03-05 23:11:23 UTC (rev 13387) +++ trunk/libswingx-java/debian/orig-tar.sh 2011-03-05 23:33:03 UTC (rev 13388) @@ -3,7 +3,7 @@ # called by uscan with '--upstream-version' <version> <file> TAR=../libswingx-java_$2.orig.tar.gz -DIR=swingx-$2-src +DIR=swingx-$2-sources # clean up and repackage the upstream zip file unzip $3 Deleted: trunk/libswingx-java/debian/patches/pom.diff =================================================================== --- trunk/libswingx-java/debian/patches/pom.diff 2011-03-05 23:11:23 UTC (rev 13387) +++ trunk/libswingx-java/debian/patches/pom.diff 2011-03-05 23:33:03 UTC (rev 13388) @@ -1,51 +0,0 @@ ---- a/swingx-beaninfo/pom.xml -+++ b/swingx-beaninfo/pom.xml -@@ -20,14 +20,6 @@ - <groupId>com.jhlabs</groupId> - <artifactId>filters</artifactId> - </dependency> -- <dependency> -- <groupId>org.swinglabs</groupId> -- <artifactId>swing-worker</artifactId> -- </dependency> -- <dependency> -- <groupId>org.swinglabs</groupId> -- <artifactId>multiplegradientpaint</artifactId> -- </dependency> - <!-- Preferably we should use this jmock configuration with junit 4 --> - <!--dependency> - <groupId>org.jmock</groupId> ---- a/swingx-core/pom.xml -+++ b/swingx-core/pom.xml -@@ -16,14 +16,6 @@ - <artifactId>filters</artifactId> - </dependency> - <dependency> -- <groupId>org.swinglabs</groupId> -- <artifactId>swing-worker</artifactId> -- </dependency> -- <dependency> -- <groupId>org.swinglabs</groupId> -- <artifactId>multiplegradientpaint</artifactId> -- </dependency> -- <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> ---- a/pom.xml -+++ b/pom.xml -@@ -118,12 +118,14 @@ - <version>1.1</version> - <!--scope>compile</scope--> - </dependency> -+<!-- - <dependency> - <groupId>org.swinglabs</groupId> - <artifactId>multiplegradientpaint</artifactId> - <version>1.0</version> - <scope>compile</scope> - </dependency> -+--> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> Deleted: trunk/libswingx-java/debian/patches/series =================================================================== --- trunk/libswingx-java/debian/patches/series 2011-03-05 23:11:23 UTC (rev 13387) +++ trunk/libswingx-java/debian/patches/series 2011-03-05 23:33:03 UTC (rev 13388) @@ -1 +0,0 @@ -pom.diff Modified: trunk/libswingx-java/debian/rules =================================================================== --- trunk/libswingx-java/debian/rules 2011-03-05 23:11:23 UTC (rev 13387) +++ trunk/libswingx-java/debian/rules 2011-03-05 23:33:03 UTC (rev 13388) @@ -1,25 +1,10 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk +include /usr/share/cdbs/1/class/maven.mk -PACKAGE := swingx -VERSION := $(DEB_UPSTREAM_VERSION) +JAVA_HOME := /usr/lib/jvm/default-java +DEB_MAVEN_DOC_TARGET := javadoc:aggregate -JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := ant-nodeps -DEB_ANT_BUILD_TARGET := package javadoc -DEB_ANT_BUILDFILE := debian/build.xml -DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dversion=$(VERSION) - - -binary-post-install/lib$(PACKAGE)-java:: - mh_installpoms -plib$(PACKAGE)-java - mh_installjar -plib$(PACKAGE)-java -l -nswingx swingx-core/pom.xml swingx-core/build/swingx-core-$(VERSION).jar - mh_installjar -plib$(PACKAGE)-java -l swingx-beaninfo/pom.xml swingx-beaninfo/build/swingx-beaninfo-$(VERSION).jar - -clean:: - -rm -rf debian/tmp - get-orig-source: - uscan --upstream-version 0 + uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename Modified: trunk/libswingx-java/debian/watch =================================================================== --- trunk/libswingx-java/debian/watch 2011-03-05 23:11:23 UTC (rev 13387) +++ trunk/libswingx-java/debian/watch 2011-03-05 23:33:03 UTC (rev 13388) @@ -1,3 +1,4 @@ version=3 -http://swinglabs.org/downloads.jsp .*/swingx-([\d.]+)-src.zip \ +http://java.net/downloads/swingx/releases/([\d.]+)/ \ + swingx-([\d.]+)-sources.zip \ debian debian/orig-tar.sh _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
