[SCM] FreeHEP Scalable Vector Graphics Driver branch, build, updated. upstream/2.1.1-13-g50153ac

[Giovanni Mascellani]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FreeHEP Scalable Vector Graphics Driver".

The branch, build has been updated
       via  50153ac9cfb6799e0de8fc580b7b61b5aa68d417 (commit)
       via  4944f56f02a7d050ac8b2508378c47ca6e35ccc5 (commit)
       via  f49f4ef972eebede70c2f09a11410d7aef673620 (commit)
       via  6ebb7a3b086ab692aed5c4da66978d67be943409 (commit)
       via  7fe6f35b011443c0d799cdfaa84136dd27eb8675 (commit)
       via  547d2d7215e664c0fdecbb90dab0cf505a1510cf (commit)
      from  4fbaca41c7e6a7bc7e02095b5216d83a18a111df (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 50153ac9cfb6799e0de8fc580b7b61b5aa68d417
Merge: f49f4ef972eebede70c2f09a11410d7aef673620 4944f56f02a7d050ac8b2508378c47ca6e35ccc5
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Fri Mar 12 19:46:33 2010 +0100

    Merge branch 'master' into build

commit f49f4ef972eebede70c2f09a11410d7aef673620
Merge: 7fe6f35b011443c0d799cdfaa84136dd27eb8675 6ebb7a3b086ab692aed5c4da66978d67be943409
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Fri Mar 12 19:43:05 2010 +0100

    Merge branch 'master' into build

commit 7fe6f35b011443c0d799cdfaa84136dd27eb8675
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Fri Mar 12 19:40:18 2010 +0100

    Added patches

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                   |    7 +++++++
 debian/control                     |    2 +-
 debian/patches/patch/geogebra.diff |   27 +++++++++++++++++++++++++++
 debian/patches/series              |    1 +
 debian/rules                       |    2 ++
 5 files changed, 38 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2988f11..4b9a1f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+freehep-graphicsio-svg (2.1.1-3) unstable; urgency=low
+
+  * Added geogebra patch: make a SVGGraphics2D filed protected, so it can
+    be used by extending classes (for example, geogebra package needs it).
+
+ -- Giovanni Mascellani <mascellani at poisson.phc.unipi.it>  Fri, 12 Mar 2010 19:41:12 +0100
+
 freehep-graphicsio-svg (2.1.1-2) unstable; urgency=low
 
   * Moved default-jdk from Build-Depends-Indep to Build-Depends
diff --git a/debian/control b/debian/control
index 06d73a9..1ec7a32 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>,
  Gabriele Giacone <1o5g4r8o at gmail.com>
-Build-Depends: debhelper (>= 7), cdbs, maven-debian-helper, default-jdk
+Build-Depends: debhelper (>= 7), cdbs, maven-debian-helper, default-jdk, quilt
 Build-Depends-Indep: libfreehep-xml-java, libfreehep-graphicsio-java, 
  libfreehep-graphicsio-tests-java, junit
 Standards-Version: 3.8.4
diff --git a/debian/patches/patch/geogebra.diff b/debian/patches/patch/geogebra.diff
new file mode 100644
index 0000000..3d7a971
--- /dev/null
+++ b/debian/patches/patch/geogebra.diff
@@ -0,0 +1,27 @@
+From: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
+Subject: [PATCH] patch/geogebra
+
+The visibility of a field is moved from private to protected, so GeoGebra
+can extend that class.
+
+Signed-off-by: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
+
+---
+ .../org/freehep/graphicsio/svg/SVGGraphics2D.java  |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/main/java/org/freehep/graphicsio/svg/SVGGraphics2D.java b/src/main/java/org/freehep/graphicsio/svg/SVGGraphics2D.java
+index 6c348eb..c9130bb 100644
+--- a/src/main/java/org/freehep/graphicsio/svg/SVGGraphics2D.java
++++ b/src/main/java/org/freehep/graphicsio/svg/SVGGraphics2D.java
+@@ -154,7 +154,7 @@ public class SVGGraphics2D extends AbstractVectorGraphicsIO {
+     // The private writer used for this file.
+     private OutputStream ros;
+ 
+-    private PrintWriter os;
++    protected PrintWriter os;
+ 
+     // table for gradients
+     Hashtable gradients = new Hashtable();
+-- 
+tg: (4fbaca4..) patch/geogebra (depends on: master)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..052ce41
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+patch/geogebra.diff -p1
diff --git a/debian/rules b/debian/rules
index c9523a8..90ab7ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,8 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/maven.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+-include /usr/share/topgit/tg2quilt.mk
 
 JAVA_HOME := /usr/lib/jvm/default-java
 


hooks/post-receive
-- 
FreeHEP Scalable Vector Graphics Driver