[libswingx-java] 15/26: * 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.
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Mar 7 12:01:49 GMT 2018
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository libswingx-java.
commit 4fc2635905c2c93f8e88abd84caeac7fcdae07c7
Author: Damien Raude-Morvan <drazzib at debian.org>
Date: Sat Mar 5 23:33:03 2011 +0000
* 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.
---
debian/README.source | 8 +++++-
debian/build.properties | 6 -----
debian/build.xml | 49 -------------------------------------
debian/changelog | 13 ++++++++++
debian/control | 13 +++++-----
debian/copyright | 20 +++++++--------
debian/libswingx-java-doc.install | 3 ++-
debian/libswingx-java.links | 1 +
debian/libswingx-java.poms | 4 +--
debian/maven.ignoreRules | 4 +++
debian/maven.properties | 1 +
debian/maven.rules | 10 +++++---
debian/orig-tar.sh | 2 +-
debian/patches/pom.diff | 51 ---------------------------------------
debian/patches/series | 1 -
debian/rules | 23 +++---------------
debian/watch | 3 ++-
17 files changed, 60 insertions(+), 152 deletions(-)
diff --git a/debian/README.source b/debian/README.source
index b863225..64bf2a2 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -10,4 +10,10 @@ Use the rules/get-orig-source target to create the orig.tar.gz.
For more details on repackaging of upstream sources please see the
debian/orig-tar.sh file.
--- Varun Hiremath <varunhiremath at gmail.com> 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.
+
diff --git a/debian/build.properties b/debian/build.properties
deleted file mode 100644
index d9c3d56..0000000
--- a/debian/build.properties
+++ /dev/null
@@ -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
diff --git a/debian/build.xml b/debian/build.xml
deleted file mode 100644
index c45f787..0000000
--- a/debian/build.xml
+++ /dev/null
@@ -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>
diff --git a/debian/changelog b/debian/changelog
index 6c94e3c..edb894d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 <drazzib at debian.org> Sun, 06 Mar 2011 00:28:45 +0100
+
libswingx-java (1:1.6.1-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 083955f..ec17b8f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ 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>,
Damien Raude-Morvan <drazzib at debian.org>
-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 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libswingx-java/
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 @@ Description: extensions to the Swing GUI toolkit
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
diff --git a/debian/copyright b/debian/copyright
index fbcd817..7bc325c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -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 @@ License: LGPL-2.1+
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 @@ License: Apache-2.0
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 @@ Files: src/java/org/jdesktop/swingx/image/*,
src/java/org/jdesktop/swingx/geom/Star2D.java
Copyright: Copyright 2005 Sun Microsystems, Inc.
Copyright: Copyright (c) 2006 Romain Guy <romain.guy at mac.com>
-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 @@ License: LPGL-2.1, BSD
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.
diff --git a/debian/libswingx-java-doc.install b/debian/libswingx-java-doc.install
index 862fc1f..2f47ecf 100644
--- a/debian/libswingx-java-doc.install
+++ b/debian/libswingx-java-doc.install
@@ -1 +1,2 @@
-build/api /usr/share/doc/libswingx-java/
+target/site/apidocs/* usr/share/doc/libswingx-java/api
+
diff --git a/debian/libswingx-java.links b/debian/libswingx-java.links
new file mode 100644
index 0000000..c6f2368
--- /dev/null
+++ b/debian/libswingx-java.links
@@ -0,0 +1 @@
+/usr/share/java/swingx-core.jar /usr/share/java/swingx.jar
diff --git a/debian/libswingx-java.poms b/debian/libswingx-java.poms
index d2ea97b..c749cd7 100644
--- a/debian/libswingx-java.poms
+++ b/debian/libswingx-java.poms
@@ -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
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..869961b
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -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 * * * *
diff --git a/debian/maven.properties b/debian/maven.properties
new file mode 100644
index 0000000..d2f1b82
--- /dev/null
+++ b/debian/maven.properties
@@ -0,0 +1 @@
+maven.test.skip=true
diff --git a/debian/maven.rules b/debian/maven.rules
index 39f88c6..a4ddf68 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -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/ * *
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index f947182..e9ce633 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -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
diff --git a/debian/patches/pom.diff b/debian/patches/pom.diff
deleted file mode 100644
index 3a65a42..0000000
--- a/debian/patches/pom.diff
+++ /dev/null
@@ -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>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 7740e23..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-pom.diff
diff --git a/debian/rules b/debian/rules
index a04815b..ba49f3e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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_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
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_MAVEN_DOC_TARGET := javadoc:aggregate
get-orig-source:
- uscan --upstream-version 0
+ uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
diff --git a/debian/watch b/debian/watch
index 18f4fba..b74a5bb 100644
--- a/debian/watch
+++ b/debian/watch
@@ -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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libswingx-java.git
More information about the pkg-java-commits
mailing list