[SCM] FreeHEP swing extensions branch, master, updated. upstream/2.0.3-12-gf1b396b

[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, master has been updated
       via  f1b396bd30e0f4b91b4397364898edc62073493a (commit)
       via  56beb8ea9a85153564574a35f5e93532ab5fa35e (commit)
       via  49f645642bbbefcaa69cdc4a8fc55b369cf1f76f (commit)
       via  77798e3c3aca5f27c2553d82da3c471d46aff5f0 (commit)
      from  36e972eef2904c81213c08e2b7eac2179e51e7c2 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    2 +-
 debian/control   |    4 ++--
 debian/gbp.conf  |    2 +-
 debian/rules     |    2 ++
 pom.xml          |    8 --------
 5 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 422d498..22a5ad3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,4 @@ freehep-swing (2.0.3-1) unstable; urgency=low
 
   * Initial release (Closes: #556395)
 
- -- Giovanni Mascellani <mascellani at poisson.phc.unipi.it>  Sun, 08 Nov 2009 22:18:30 +0100
+ -- Giovanni Mascellani <mascellani at poisson.phc.unipi.it>  Sun, 29 Nov 2009 17:57:38 +0100
diff --git a/debian/control b/debian/control
index 27aafcb..da81f36 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
-Build-Depends: debhelper (>= 7), cdbs, maven-debian-helper
-Build-Depends-Indep: default-jdk, libfreehep-util-java, junit
+Build-Depends: debhelper (>= 7), cdbs, maven-debian-helper, quilt
+Build-Depends-Indep: default-jdk, libfreehep-util-java (>= 2.0.2-2), junit
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-java/freehep/freehep-swing.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/freehep/freehep-swing.git
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/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
 
diff --git a/pom.xml b/pom.xml
index 2858561..c11a59f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,14 +43,6 @@
           </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>
 


hooks/post-receive
-- 
FreeHEP swing extensions