[SCM] FreeHEP GraphicsIO Base Library branch, build, updated. debian/2.1.1-2-14-g9efd4c5
The following commit has been merged in the build branch: commit f114fc31515aec918df0bd44b955b4322255cff9 Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it Date: Sat Feb 11 15:20:13 2012 +0100 Update copyright. diff --git a/debian/copyright b/debian/copyright index d1757ad..91c7a68 100644 --- a/debian/copyright +++ b/debian/copyright @@ -88,7 +88,7 @@ License: other that this copyright notice remain intact. Files: debian/* -Copyright: 2010, Giovanni Mascellani g...@debian.org +Copyright: 2010-2012, Giovanni Mascellani g...@debian.org 2010, Gabriele Giacone 1o5g4...@gmail.com License: GPL-3+ On Debian GNU/Linux system you can find the complete text of the -- FreeHEP GraphicsIO Base Library ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] FreeHEP GraphicsIO Base Library branch, build, updated. debian/2.1.1-2-14-g9efd4c5
The following commit has been merged in the build branch: commit ecaa134879dc74b814c08ae3e2aa79190a0205e0 Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it Date: Sat Feb 11 15:20:45 2012 +0100 Releasing to sid. diff --git a/debian/changelog b/debian/changelog index 5d1235b..481af2e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -freehep-graphicsio (2.1.1-3) UNRELEASED; urgency=low +freehep-graphicsio (2.1.1-3) unstable; urgency=low * Apply patch from GeoGebra repository (that fixes JLaTeXMath to PDF export). * Add real watch file * Fix my email address. - -- Giovanni Mascellani g...@debian.org Sat, 11 Feb 2012 15:18:19 +0100 + -- Giovanni Mascellani g...@debian.org Sat, 11 Feb 2012 15:20:34 +0100 freehep-graphicsio (2.1.1-2) unstable; urgency=low -- FreeHEP GraphicsIO Base Library ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] FreeHEP GraphicsIO Base Library branch, build, updated. debian/2.1.1-2-14-g9efd4c5
The following commit has been merged in the build branch:
commit 18245572c3987c8e118b07391748bd82cb815f96
Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it
Date: Sat Feb 11 15:21:01 2012 +0100
Update patches.
diff --git a/debian/patches/patch/jlatexmath.diff
b/debian/patches/patch/jlatexmath.diff
new file mode 100644
index 000..94a4c7d
--- /dev/null
+++ b/debian/patches/patch/jlatexmath.diff
@@ -0,0 +1,37 @@
+From: Giovanni Mascellani g...@debian.org
+Subject: [PATCH] patch/jlatexmath
+
+Fix writing JLaTeXMath to PDF.
+
+Signed-off-by: Giovanni Mascellani g...@debian.org
+
+---
+ .../graphicsio/AbstractVectorGraphicsIO.java |9 ++---
+ 1 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git
a/src/main/java/org/freehep/graphicsio/AbstractVectorGraphicsIO.java
b/src/main/java/org/freehep/graphicsio/AbstractVectorGraphicsIO.java
+index b68a583..0eb3a1e 100644
+--- a/src/main/java/org/freehep/graphicsio/AbstractVectorGraphicsIO.java
b/src/main/java/org/freehep/graphicsio/AbstractVectorGraphicsIO.java
+@@ -797,13 +797,16 @@ public abstract class AbstractVectorGraphicsIO extends
VectorGraphicsIO {
+ * Clears any existing transformation and sets the a new one.
+ * The default implementation calls writeTransform using the
+ * inverted affine transform to calculate it.
+-s *
++ *
++ * new version by Calixte Denizet
++ * fixes eg writing output from JLaTeXMath - PDF
++ *
+ * @param transform to be written
+ */
+ protected void writeSetTransform(AffineTransform transform) throws
IOException {
+ try {
+- AffineTransform deltaTransform = new AffineTransform(transform);
+- deltaTransform.concatenate(oldTransform.createInverse());
++ AffineTransform deltaTransform = new
AffineTransform(oldTransform.createInverse());
++ deltaTransform.concatenate(transform);
+ writeTransform(deltaTransform);
+ } catch (NoninvertibleTransformException e) {
+ // ignored...
+--
+tg: (5535437..) patch/jlatexmath (depends on: master)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000..671e719
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+patch/jlatexmath.diff -p1
--
FreeHEP GraphicsIO Base Library
___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] FreeHEP GraphicsIO Base Library branch, build, updated. debian/2.1.1-2-14-g9efd4c5
The following commit has been merged in the build branch: commit 66e4d7ae063abb07096eb0ae7014c67508284364 Merge: 18245572c3987c8e118b07391748bd82cb815f96 c4d894a5a887ea4c6ccff8a90ba926e2b1336050 Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it Date: Sat Feb 11 17:41:45 2012 +0100 Merge branch 'master' into build -- FreeHEP GraphicsIO Base Library ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] FreeHEP GraphicsIO Base Library branch, build, updated. debian/2.1.1-2-14-g9efd4c5
The following commit has been merged in the build branch: commit 889dcd9f7330422490340db697f3b1429c5ee85c Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it Date: Sat Feb 11 19:54:35 2012 +0100 Fix generation of JARs in /usr/share/java. diff --git a/debian/libfreehep-graphicsio-java.poms b/debian/libfreehep-graphicsio-java.poms index 43e746b..89f648d 100644 --- a/debian/libfreehep-graphicsio-java.poms +++ b/debian/libfreehep-graphicsio-java.poms @@ -1 +1 @@ -pom.xml --no-parent +pom.xml --no-parent --java-lib -- FreeHEP GraphicsIO Base Library ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] FreeHEP GraphicsIO Base Library branch, build, updated. debian/2.1.1-2-14-g9efd4c5
The following commit has been merged in the build branch: commit 55354375d196b58cfb1d40f4275f76ac08d01366 Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it Date: Sat Feb 11 15:11:15 2012 +0100 Add topgit/quilt support. diff --git a/debian/README.source b/debian/README.source index 9a1ea30..6375d2d 100644 --- a/debian/README.source +++ b/debian/README.source @@ -10,3 +10,15 @@ The build system uses Maven but prevents it from downloading anything from the Internet, making the build compliant with the Debian policy. + +QUILT + +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. Please see: + +/usr/share/doc/quilt/README.source + +for more information on how to apply the patches, modify patches, or +remove a patch. + diff --git a/debian/rules b/debian/rules index c9523a8..9873a98 100755 --- a/debian/rules +++ b/debian/rules @@ -2,6 +2,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/maven.mk +-include /usr/share/topgit/tg2quilt.mk JAVA_HOME := /usr/lib/jvm/default-java -- FreeHEP GraphicsIO Base Library ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] FreeHEP GraphicsIO Base Library branch, build, updated. debian/2.1.1-2-14-g9efd4c5
The following commit has been merged in the build branch: commit ea515942cbb28f068f21c97b05122ef611d98c19 Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it Date: Sat Feb 11 17:36:50 2012 +0100 Upgrading to 3.0 (quilt). diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- FreeHEP GraphicsIO Base Library ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] FreeHEP GraphicsIO Base Library branch, build, updated. debian/2.1.1-2-14-g9efd4c5
The following commit has been merged in the build branch:
commit c4d894a5a887ea4c6ccff8a90ba926e2b1336050
Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it
Date: Sat Feb 11 17:39:50 2012 +0100
Fix some lintian warning.
diff --git a/debian/changelog b/debian/changelog
index 481af2e..7d3dc61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ freehep-graphicsio (2.1.1-3) unstable; urgency=low
export).
* Add real watch file
* Fix my email address.
+ * Bump Standards-Version to 3.9.2 (no change required).
+ * Fix some lintian warnings.
- -- Giovanni Mascellani g...@debian.org Sat, 11 Feb 2012 15:20:34 +0100
+ -- Giovanni Mascellani g...@debian.org Sat, 11 Feb 2012 17:39:36 +0100
freehep-graphicsio (2.1.1-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index ff1a285..1c88b76 100644
--- a/debian/control
+++ b/debian/control
@@ -7,14 +7,14 @@ Uploaders: Giovanni Mascellani g...@debian.org,
Build-Depends: debhelper (= 7), cdbs, maven-debian-helper, default-jdk
Build-Depends-Indep: libfreehep-export-java, libfreehep-graphics2d-java,
libfreehep-io-java, libmaven-exec-plugin-java
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/pkg-java/freehep/freehep-graphicsio.git
Vcs-Browser: http://git.debian.org/?p=pkg-java/freehep/freehep-graphicsio.git
Homepage: http://java.freehep.org/
Package: libfreehep-graphicsio-java
Architecture: all
-Depends: ${misc:Depends}, ${maven:Depends}, openjdk-6-jre | java2-runtime
+Depends: ${misc:Depends}, ${maven:Depends}
Recommends: ${maven:OptionalDepends}
Description: FreeHEP GraphicsIO Base Library
The GraphicsIO library offers a base interface for image exporters in many
diff --git a/debian/copyright b/debian/copyright
index 91c7a68..57343df 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: FreeHEP GraphicsIO Base Library
-Maintainer: The FreeHEP team
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: FreeHEP GraphicsIO Base Library
+Upstream-Contact: The FreeHEP team
Source: http://java.freehep.org/
Files: *
@@ -15,10 +15,10 @@ License: LGPL-2.1+
http://java.freehep.org/svn/repos/freehep/show/freehep/trunk/vectorgraphics/LICENSE.txt
and adopted license at http://java.freehep.org/license.html
-Files: src/main/java/org/freehep/graphicsio/ppm/ImageEncoder.java,
- src/main/java/org/freehep/graphicsio/ppm/PPMEncoder.java,
- src/main/java/org/freehep/graphicsio/ImageEncoder.java,
- src/main/java/org/freehep/graphicsio/gif/ImageEncoder.java,
+Files: src/main/java/org/freehep/graphicsio/ppm/ImageEncoder.java
+ src/main/java/org/freehep/graphicsio/ppm/PPMEncoder.java
+ src/main/java/org/freehep/graphicsio/ImageEncoder.java
+ src/main/java/org/freehep/graphicsio/gif/ImageEncoder.java
src/main/java/org/freehep/graphicsio/gif/GIFEncoder.java
Copyright: 1996-1998, Jef Poskanzer j...@acme.com
License: other
--
FreeHEP GraphicsIO Base Library
___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] FreeHEP GraphicsIO Base Library branch, build, updated. debian/2.1.1-2-14-g9efd4c5
The following commit has been merged in the build branch: commit 9efd4c5465f9dd8920da3cd41d67d1d6701f1c30 Merge: 66e4d7ae063abb07096eb0ae7014c67508284364 889dcd9f7330422490340db697f3b1429c5ee85c Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it Date: Sat Feb 11 19:54:55 2012 +0100 Merge branch 'master' into build -- FreeHEP GraphicsIO Base Library ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
