[libjchart2d-java] 01/01: Imported Debian patch 3.2.2+dfsg-1

Markus Koschany apo-guest at moszumanska.debian.org
Mon Oct 13 14:23:44 BST 2014


This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository libjchart2d-java.

commit 8074114550a4ea16ea9d030ecb390a840aa86436
Author: Markus Koschany <apo at gambaru.de>
Date:   Mon Oct 13 13:49:27 2014 +0200

    Imported Debian patch 3.2.2+dfsg-1
---
 debian/README.source                |  18 ++++++
 debian/changelog                    |   5 ++
 debian/compat                       |   1 +
 debian/control                      |  53 ++++++++++++++++++
 debian/copyright                    |  31 ++++++++++
 debian/libjchart2d-java-doc.javadoc |   1 +
 debian/libjchart2d-java.jlibs       |   1 +
 debian/libjchart2d-java.poms        |   1 +
 debian/patches/build.patch          |  69 +++++++++++++++++++++++
 debian/patches/series               |   1 +
 debian/pom.xml                      | 109 ++++++++++++++++++++++++++++++++++++
 debian/rules                        |  22 ++++++++
 debian/source/format                |   1 +
 debian/watch                        |   3 +
 14 files changed, 316 insertions(+)

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..636f0ad
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,18 @@
+JChart2D for Debian
+===================
+
+
+Version 3.2.2 of JChart2D was downloaded from
+
+http://sourceforge.net/projects/jchart2d/files/jchart2d/sources/jchart2d-eclipse-project-3.2.2.zip/download
+
+The external libraries in jchart2d/ext were removed because they are shipped
+without corresponding source and because they are already packaged for Debian.
+
+The package was recompressed with xz.
+
+Due to bug #764865 uscan currently cannot repack the source tarball
+automatically.
+
+    -- Markus Koschany <apo at gambaru.de>  Mon, 13 Oct 2014 13:44:31 +0200
+
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..b3d089f
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+libjchart2d-java (3.2.2+dfsg-1) unstable; urgency=medium
+
+  * Initial release. (Closes: #626243)
+
+ -- Markus Koschany <apo at gambaru.de>  Mon, 13 Oct 2014 13:49:27 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..7c2de8d
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,53 @@
+Source: libjchart2d-java
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders:
+ Markus Koschany <apo at gambaru.de>
+Build-Depends:
+ debhelper (>= 9),
+ javahelper,
+ maven-repo-helper (>= 1.6~)
+Build-Depends-Indep:
+ ant,
+ default-jdk,
+ default-jdk-doc,
+ junit4,
+ libjide-oss-java,
+ libxmlgraphics-commons-java,
+ proguard
+Standards-Version: 3.9.6
+Homepage: http://jchart2d.sourceforge.net/
+Vcs-Git: git://anonscm.debian.org/pkg-java/libjchart2d-java.git
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/libjchart2d-java.git
+
+Package: libjchart2d-java
+Architecture: all
+Depends:
+ ${java:Depends},
+ ${misc:Depends}
+Recommends:
+ ${java:Recommends}
+Suggests:
+ libjchart2d-java-doc
+Description: Java based library for precise 2D charting visualizations
+ JChart2D is a minimalistic charting library. It is designed for displaying
+ multiple traces consisting of tracepoints, including dynamic (animated) data.
+ JChart2D is centered around a single configureable swing widget: the Chart2D.
+ This library is intended for engineering tasks and not for presentations.
+
+Package: libjchart2d-java-doc
+Section: doc
+Architecture: all
+Depends:
+ ${misc:Depends}
+Recommends:
+ default-jdk-doc,
+ ${java:Recommends}
+Description: Java based library for precise 2D charting visualizations -- docs
+ JChart2D is a minimalistic charting library. It is designed for displaying
+ multiple traces consisting of tracepoints, including dynamic (animated) data.
+ JChart2D is centered around a single configureable swing widget: the Chart2D.
+ This library is intended for engineering tasks and not for presentations.
+ .
+ This package contains the Javadoc API documentation for libjchart2d-java.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..8ac3839
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,31 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: JChart2D
+Upstream-Contact: Achim Westermann <Achim.Westermann at gmx.de>
+Source: http://sourceforge.net/projects/jchart2d/files/jchart2d/sources/
+Files-Excluded:
+ jchart2d/ext/*
+ *.jar
+ *.class
+
+Files: *
+Copyright: 2004-2011, Achim Westermann <Achim.Westermann at gmx.de>
+License: LGPL-2.1+
+
+Files: debian/*
+Copyright: 2014, Markus Koschany <apo at gambaru.de>
+License: LGPL-2.1+
+
+License: LGPL-2.1+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library 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.
+ .
+ The complete text of the GNU Lesser General Public License
+ can be found in the file `/usr/share/common-licenses/LGPL-2.1'.
+
diff --git a/debian/libjchart2d-java-doc.javadoc b/debian/libjchart2d-java-doc.javadoc
new file mode 100644
index 0000000..5f2e61a
--- /dev/null
+++ b/debian/libjchart2d-java-doc.javadoc
@@ -0,0 +1 @@
+jchart2d/doc/docs/javadoc
diff --git a/debian/libjchart2d-java.jlibs b/debian/libjchart2d-java.jlibs
new file mode 100644
index 0000000..788e0ec
--- /dev/null
+++ b/debian/libjchart2d-java.jlibs
@@ -0,0 +1 @@
+jchart2d/jchart2d-3.2.2.jar
diff --git a/debian/libjchart2d-java.poms b/debian/libjchart2d-java.poms
new file mode 100644
index 0000000..dd67508
--- /dev/null
+++ b/debian/libjchart2d-java.poms
@@ -0,0 +1 @@
+debian/pom.xml --usj-name=jchart2d
diff --git a/debian/patches/build.patch b/debian/patches/build.patch
new file mode 100644
index 0000000..d9b462c
--- /dev/null
+++ b/debian/patches/build.patch
@@ -0,0 +1,69 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Sat, 11 Oct 2014 14:18:26 +0200
+Subject: build
+
+---
+ jchart2d/build.xml | 18 ++++++++++--------
+ 1 file changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/jchart2d/build.xml b/jchart2d/build.xml
+index deda1b8..8194b5c 100644
+--- a/jchart2d/build.xml
++++ b/jchart2d/build.xml
+@@ -1,14 +1,15 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<project name="jchart2d" default="makejarBinary">
++<project name="jchart2d" default="debian">
+ 	<description>
+   A swing-widget for precise visualisation of charts.
+  </description>
+ 
+ 	<!-- General Properties -->
+ 
++	<property name="basedir" value="jchart2d" />
+ 	<property name="project.name" value="jchart2d" />
+ 	<property name="project.version" value="3.2.2" />
+-	<property name="libdir" value="${basedir}/ext" />
++    <property name="libdir" value="/usr/share/java" />
+ 	<property name="outjar" value="${basedir}/${project.name}-${project.version}.jar" />
+ 	<property name="distfolder" value="${basedir}/${project.name}-${project.version}/" />
+ 	<property name="distfile" value="${basedir}/${project.name}-${project.version}.zip" />
+@@ -22,7 +23,7 @@
+        The resource is a properties file within the proguard.jar
+        and informs about the task implementation.
+   -->
+-	<taskdef resource="proguard/ant/task.properties" classpath="${libdir}/build/proguard-4.5.1.jar" />
++    <taskdef resource="proguard/ant/task.properties" classpath="${libdir}/proguard.jar" />
+ 
+ 	<!-- General paths & filesets. -->
+ 
+@@ -139,9 +140,10 @@
+ 		<proguard obfuscate="false" shrink="true" overloadaggressively="false" warn="true" verbose="true" ignorewarnings="true" printmapping="true" allowaccessmodification="false" optimize="false">
+ 			<libraryjar>
+ 				<pathelement path="${java.home}/lib/rt.jar" />
+-				<fileset dir="${libdir}">
+-					<include name="*.jar" />
+-				</fileset>
++                <fileset dir="${libdir}">
++                    <include name="jide-oss.jar" />
++                    <include name="xmlgraphics-commons.jar" />
++                </fileset>
+ 			</libraryjar>
+ 			<!--
+                caution: The name attribut value has to be the same expression
+@@ -308,7 +310,7 @@
+ </target>
+ 
+ <!-- remove all resources in builddir and the current jar file-->
+-<target name="delete.classfiles">
++<target name="delete.classfiles" depends="init">
+ 	<delete verbose="true" failonerror="true">
+ 		<fileset dir="${builddir}" />
+ 		<file file="${outjar}" />
+@@ -362,5 +364,5 @@
+ 		<arg line="-classpath ${basedir}/ext/build/jipViewer.jar com.tivo.jipviewer.JipViewer profiler.xml" />
+ 	</exec>
+ </target>
+-
++<target name="debian" depends="makejarBinary, javadoc"></target>
+ </project>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5879227
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+build.patch
diff --git a/debian/pom.xml b/debian/pom.xml
new file mode 100644
index 0000000..c124588
--- /dev/null
+++ b/debian/pom.xml
@@ -0,0 +1,109 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>net.sf.jchart2d</groupId>
+  <artifactId>jchart2d</artifactId>
+  <packaging>jar</packaging>
+  <name>jchart2d</name>
+  <version>3.2.2</version>
+  <description>JChart2D is an easy to use component for displaying two- dimensional traces in a coordinate system written in Java.</description>
+  <url>http://jchart2d.sourceforge.net/</url>
+  <parent>
+    <groupId>org.sonatype.oss</groupId>
+    <artifactId>oss-parent</artifactId>
+    <version>7</version>
+  </parent>
+  <licenses>
+    <license>
+      <name>GNU Library or Lesser General Public License version 2.0 (LGPLv2)</name>
+      <url>http://www.gnu.org/licenses/lgpl-2.1.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <scm>
+    <connection>scm:git:git://jchart2d.git.sourceforge.net/gitroot/jchart2d/jchart2d</connection>
+    <url>http://jchart2d.git.sourceforge.net/</url>
+  </scm>
+  <developers>
+    <developer>
+      <id>achimwestermann</id>
+      <name>Achim Westermann</name>
+      <email>Achim.Westermann at gmx.de</email>
+    </developer>
+  </developers>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.xmlgraphics</groupId>
+      <artifactId>xmlgraphics-commons</artifactId>
+      <version>1.3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.jidesoft</groupId>
+      <artifactId>jide-oss</artifactId>
+      <version>2.4.8</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <directory>${project.basedir}/build</directory>
+    <outputDirectory>${project.build.directory}/classes</outputDirectory>
+    <finalName>${project.artifactId}-${project.version}</finalName>
+    <sourceDirectory>${project.basedir}/src</sourceDirectory>
+    <testSourceDirectory>${project.basedir}/test</testSourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.4</version>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <version>2.1.2</version>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-javadocs</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-gpg-plugin</artifactId>
+        <version>1.4</version>
+        <executions>
+          <execution>
+            <id>sign-artifacts</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>sign</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..3dfe4fa
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,22 @@
+#!/usr/bin/make -f
+# export DH_VERBOSE=1
+PKD  = $(abspath $(dir $(MAKEFILE_LIST)))
+VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s*([\d\.]+)}')
+export JAVA_HOME=/usr/lib/jvm/default-java
+export CLASSPATH=/usr/share/java/jide-oss.jar:/usr/share/java/xmlgraphics-commons.jar
+
+%:
+	dh $@ --parallel --with javahelper,jh_maven_repo_helper
+
+override_dh_auto_build:
+	dh_auto_build --sourcedirectory=jchart2d
+
+get-orig-source::
+	# Does not work currently due to bug #764865. See also README.source.
+	uscan --verbose --repack --compression xz --force-download
+
+get-orig-pom:
+	# Maven uses a wrong version. The latest version is 3.2.2. This was
+	# corrected in Debian's pom.xml file.
+	wget -O debian/pom.xml \
+	https://repo1.maven.org/maven2/net/sf/jchart2d/jchart2d/3.3.2/jchart2d-3.3.2.pom
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..dfec809
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/(\da?)[\+\.\-~](?:dfsg|debian|ds|repack|repacked)\.?\d*$/$1/ \
+http://sf.net/jchart2d/jchart2d-eclipse-project-(.+)\.(?:zip|tgz|tbz2|txz|tar\.gz|tar\.bz2|tar\.xz)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjchart2d-java.git



More information about the pkg-java-commits mailing list