[SCM] FreeHEP Export and Save As Library branch, build, updated. upstream/2.1.1-30-ge259228

[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 Export and Save As Library".

The branch, build has been updated
       via  e2592288900d5d265cd119ea0c0274829e90b06c (commit)
       via  40f9e4ad7162fe5018813fefc61ea5b1c6ff1aca (commit)
       via  c262cd69f8c8324cc86d20d330c3f0a0d0f4c36b (commit)
       via  3cd22506bfc339624d6a73307717de2452669b6f (commit)
       via  de8aa543801dbb2a46b4add134ee0f72c547ad3e (commit)
      from  16a02773f67f6d570078fbf4d7d30bcdd1500122 (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 e2592288900d5d265cd119ea0c0274829e90b06c
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Wed Jan 20 12:26:28 2010 +0100

    Added patches

commit 40f9e4ad7162fe5018813fefc61ea5b1c6ff1aca
Merge: 3cd22506bfc339624d6a73307717de2452669b6f c262cd69f8c8324cc86d20d330c3f0a0d0f4c36b
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Wed Jan 20 12:26:06 2010 +0100

    Merge branch 'master' into build

commit 3cd22506bfc339624d6a73307717de2452669b6f
Merge: 16a02773f67f6d570078fbf4d7d30bcdd1500122 de8aa543801dbb2a46b4add134ee0f72c547ad3e
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Wed Jan 20 12:05:14 2010 +0100

    Merge branch 'master' into build

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

Summary of changes:
 debian/control                    |    4 ++--
 debian/patches/patch/pom.xml.diff |   30 ++++++++++++++++++++++++++++++
 debian/patches/series             |    1 +
 debian/rules                      |    2 ++
 4 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 35e66ea..1732813 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,9 @@ 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, default-jdk, maven-debian-helper
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper, quilt
 Build-Depends-Indep: libsurefire-java (>= 2.4.3), libfreehep-swing-java,
- libjas-plotter-java, libmaven-exec-plugin-java
+ libmaven-exec-plugin-java
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-java/freehep/freehep-export.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/freehep/freehep-export.git;a=summary
diff --git a/debian/patches/patch/pom.xml.diff b/debian/patches/patch/pom.xml.diff
new file mode 100644
index 0000000..0a74721
--- /dev/null
+++ b/debian/patches/patch/pom.xml.diff
@@ -0,0 +1,30 @@
+From: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
+Subject: [PATCH] patch/pom.xml
+
+Fixes pom.xml, which shouldn't depend on jas-plotter.
+
+Signed-off-by: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
+
+---
+ pom.xml |    6 ------
+ 1 files changed, 0 insertions(+), 6 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 67a92df..22d5408 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -23,12 +23,6 @@
+       <artifactId>freehep-swing</artifactId>
+       <version>2.0.3</version>
+     </dependency>
+-    <dependency>
+-      <groupId>org.freehep</groupId>
+-      <artifactId>jas-plotter</artifactId>
+-      <version>2.2</version>
+-      <scope>test</scope>
+-    </dependency>
+   </dependencies>
+   <build>
+     <plugins>
+-- 
+tg: (c262cd6..) 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
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 Export and Save As Library