[SCM] JAS(2) Plotter branch, build, updated. upstream/2.2.6-11-g40988af

[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 "JAS(2) Plotter".

The branch, build has been updated
       via  40988afe076809739048c461a6f87b966486b1ed (commit)
       via  fb34ab12f4a6c9af5fdfd0c8cf849f4eb3d7e9ec (commit)
      from  ac58bafb1a3026ea84e85d78daf30f19e2bec08a (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 40988afe076809739048c461a6f87b966486b1ed
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Sat Dec 12 13:49:14 2009 +0100

    Patches generated by topgit

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

Summary of changes:
 debian/gbp.conf                   |    2 +-
 debian/patches/patch/pom.xml.diff |   31 +++++++++++++++++++++++++++++++
 debian/patches/series             |    1 +
 3 files changed, 33 insertions(+), 1 deletions(-)

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 7c036eb..d730773 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -2,6 +2,6 @@
 [DEFAULT]
 cleaner = fakeroot debian/rules clean
 upstream-branch = upstream
-debian-branch = master
+debian-branch = build
 pristine-tar = True
 
diff --git a/debian/patches/patch/pom.xml.diff b/debian/patches/patch/pom.xml.diff
new file mode 100644
index 0000000..ab2929b
--- /dev/null
+++ b/debian/patches/patch/pom.xml.diff
@@ -0,0 +1,31 @@
+From: Gabriele Giacone <1o5g4r8o at gmail.com>
+Subject: [PATCH] patch/pom.xml
+
+Removed dependency on freehep-export.
+freehep-export already is dependent on jas-plotter.
+
+Signed-off-by: Gabriele Giacone <1o5g4r8o at gmail.com>
+
+---
+ pom.xml |    6 ------
+ 1 files changed, 0 insertions(+), 6 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index ed34af3..258722a 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -29,12 +29,6 @@
+   </build>
+   <dependencies>
+     <dependency>
+-      <groupId>org.freehep</groupId>
+-      <artifactId>freehep-export</artifactId>
+-      <version>2.1.1</version>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+       <groupId>javax.help</groupId>
+       <artifactId>javahelp</artifactId>
+       <version>2.0.02</version>
+-- 
+tg: (ac58baf..) patch/pom.xml (depends on: master)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..abd225c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+patch/pom.xml.diff -p1


hooks/post-receive
-- 
JAS(2) Plotter