[SCM] FreeHEP Export and Save As Library branch, master, updated. debian/2.1.1-2

[Torsten Werner]

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, master has been updated
       via  f38279d36b370ee83c7311189b84a525192e9053 (commit)
       via  dd85f58346e5cd2645dd22385408f92ab0414896 (commit)
       via  5699e30068294b1da2de5df1756185c2475c3900 (commit)
       via  4f31eca0c486fd7ec3ed74a235df39541e95aafb (commit)
       via  e2592288900d5d265cd119ea0c0274829e90b06c (commit)
       via  40f9e4ad7162fe5018813fefc61ea5b1c6ff1aca (commit)
       via  3cd22506bfc339624d6a73307717de2452669b6f (commit)
       via  16a02773f67f6d570078fbf4d7d30bcdd1500122 (commit)
       via  0b66283644b6deafcc85d8432a7dc0b8b07e8253 (commit)
       via  91f7426a28390e7196607a5a81ec2804da28c2dd (commit)
       via  8a371d4484a58a567d5d55d8218058181356c9cc (commit)
       via  86cc8d5a937a07cd5006f1f6722e777f44f58b19 (commit)
       via  f2828b9af159992d998427e9e6fffac7fc9dd5af (commit)
       via  2574bd40ffc0f5fa3afac3f695011346382fc71b (commit)
      from  6121abcc55ff09fdb44c0329c1b97e287b5a8a9a (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 f38279d36b370ee83c7311189b84a525192e9053
Merge: dd85f58 6121abc
Author: Torsten Werner <twerner at debian.org>
Date:   Tue Aug 30 22:37:26 2011 +0200

    Merge branch 'master' into build

commit dd85f58346e5cd2645dd22385408f92ab0414896
Merge: 5699e30 11cdec7
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Wed Jan 27 00:59:37 2010 +0100

    Merge branch 'master' into build

commit 5699e30068294b1da2de5df1756185c2475c3900
Merge: 4f31eca fea2662
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Wed Jan 27 00:43:05 2010 +0100

    Merge branch 'master' into build

commit 4f31eca0c486fd7ec3ed74a235df39541e95aafb
Merge: e259228 532e76c
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Wed Jan 27 00:29:22 2010 +0100

    Merge branch 'master' into build

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: 3cd2250 c262cd6
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: 16a0277 de8aa54
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Wed Jan 20 12:05:14 2010 +0100

    Merge branch 'master' into build

commit 16a02773f67f6d570078fbf4d7d30bcdd1500122
Merge: 0b66283 1c80ba4
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Tue Jan 19 16:41:10 2010 +0100

    Merge branch 'master' into build

commit 0b66283644b6deafcc85d8432a7dc0b8b07e8253
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Tue Jan 12 20:20:43 2010 +0100

    Fixed upstream tarball

commit 91f7426a28390e7196607a5a81ec2804da28c2dd
Merge: 8a371d4 119db0e
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Tue Jan 12 20:14:44 2010 +0100

    Merge branch 'master' into build

commit 8a371d4484a58a567d5d55d8218058181356c9cc
Merge: 86cc8d5 e18f8f7
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sun Dec 13 17:11:40 2009 +0100

    Merge branch 'master' into build

commit 86cc8d5a937a07cd5006f1f6722e777f44f58b19
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sun Dec 13 00:58:26 2009 +0100

    Removed patch

commit f2828b9af159992d998427e9e6fffac7fc9dd5af
Merge: 2574bd4 3e47b69
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sun Dec 13 00:56:36 2009 +0100

    Merge branch 'master' into build

commit 2574bd40ffc0f5fa3afac3f695011346382fc71b
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sat Dec 12 19:42:05 2009 +0100

    Added patch

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

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

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


hooks/post-receive
-- 
FreeHEP Export and Save As Library