[SCM] FreeHEP swing extensions branch, patch/pom.xml, updated. upstream/2.0.3-28-ga2e6c23

[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 swing extensions".

The branch, patch/pom.xml has been updated
       via  a2e6c232bbc265a7c1ed912b0577c568d36bc2d7 (commit)
       via  2bab25db5d66a21ffed6b576138bdfbf02f5071a (commit)
       via  a39fc07f47be8df7a297aa864b5f3aabc1bf0901 (commit)
      from  20503e2a60672ea3db7e567706261a550faa6e5b (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 a2e6c232bbc265a7c1ed912b0577c568d36bc2d7
Merge: 2bab25db5d66a21ffed6b576138bdfbf02f5071a a39fc07f47be8df7a297aa864b5f3aabc1bf0901
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Tue Dec 8 17:01:56 2009 +0100

    Merge commit 'refs/top-bases/patch/pom.xml' into patch/pom.xml

commit 2bab25db5d66a21ffed6b576138bdfbf02f5071a
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Tue Dec 8 17:01:14 2009 +0100

    Revert "Merge branch 'build' of git+ssh://git.debian.org/git/pkg-java/freehep/freehep-swing into patch/pom.xml"
    
    This reverts commit f7c39c1f44f74802e5c080abc21fec77fa82b986, reversing
    changes made to c219e0ca4a119e20d29655f9189ed18351428382.
    
    Conflicts:
    
    	debian/control

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

Summary of changes:
 debian/maven.rules                |    1 +
 debian/patches/patch/pom.xml.diff |   32 --------------------------------
 debian/patches/series             |    1 -
 3 files changed, 1 insertions(+), 33 deletions(-)

diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..f60def6
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1 @@
+junit junit jar s/.*/3.x/ *
diff --git a/debian/patches/patch/pom.xml.diff b/debian/patches/patch/pom.xml.diff
deleted file mode 100644
index fed730d..0000000
--- a/debian/patches/patch/pom.xml.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
-Subject: [PATCH] patch/pom.xml
-
-Patch pom.xml in order to activate 1.4 source version
-
-Signed-off-by: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
-
----
- pom.xml |    8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index c11a59f..2858561 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -43,6 +43,14 @@
-           </excludes>
-         </configuration>
-       </plugin>
-+      <plugin>
-+        <groupId>org.apache.maven.plugins</groupId>
-+        <artifactId>maven-compiler-plugin</artifactId>
-+        <configuration>
-+          <source>1.4</source>
-+          <target>1.4</target>
-+        </configuration>
-+      </plugin>
-     </plugins>
-   </build>
- 
--- 
-tg: (56beb8e..) 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


hooks/post-receive
-- 
FreeHEP swing extensions