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

[Gabriele Giacone]

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  86cc8d5a937a07cd5006f1f6722e777f44f58b19 (commit)
       via  f2828b9af159992d998427e9e6fffac7fc9dd5af (commit)
       via  3e47b69ca45edd74929ee14942582da4057e9f78 (commit)
       via  116861f9e7ed6b2f045dd4e86ee4b5c326ba55a5 (commit)
      from  2574bd40ffc0f5fa3afac3f695011346382fc71b (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 86cc8d5a937a07cd5006f1f6722e777f44f58b19
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sun Dec 13 00:58:26 2009 +0100

    Removed patch

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

    Merge branch 'master' into build

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

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

diff --git a/debian/control b/debian/control
index 3bf909c..543858b 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: Gabriele Giacone <1o5g4r8o at gmail.com>,
 	Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper, quilt
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper
 Build-Depends-Indep: libsurefire-java (>= 2.4.3), libfreehep-swing-java,
  libjas-plotter-java, libmaven-exec-plugin-java
 Standards-Version: 3.8.3
diff --git a/debian/maven.rules b/debian/maven.rules
index e69de29..2223ad7 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -0,0 +1 @@
+org.codehaus.mojo exec-maven-plugin maven-plugin s/.*/1.1.1/ *
diff --git a/debian/patches/patch/pom.xml.diff b/debian/patches/patch/pom.xml.diff
deleted file mode 100644
index 6804393..0000000
--- a/debian/patches/patch/pom.xml.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Gabriele Giacone <1o5g4r8o at gmail.com>
-Subject: [PATCH] patch/pom.xml
-
-Forced exec-maven-plugin to 1.1.1
-
-Signed-off-by: Gabriele Giacone <1o5g4r8o at gmail.com>
-
----
- pom.xml |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index 67a92df..ce70ab1 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -43,7 +43,7 @@
-       <plugin>
-         <groupId>org.codehaus.mojo</groupId>
-         <artifactId>exec-maven-plugin</artifactId>
--        <version>1.0.2</version>
-+        <version>1.1.1</version>
-         <executions>
-           <execution>
-             <goals>
--- 
-tg: (a3386d5..) patch/pom.xml (depends on: master)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index abd225c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-patch/pom.xml.diff -p1
diff --git a/debian/rules b/debian/rules
index 90ab7ed..c9523a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,6 @@
 
 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