[SCM] FreeHEP Character Table Converter branch, master, updated. upstream/2.0-22-g971b83e

[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 Character Table Converter".

The branch, master has been updated
       via  971b83ea4423d53f72001817fe9756e277b234c4 (commit)
       via  875753c151d7d72202a55b951ab147b71ee60f97 (commit)
       via  a7cf45236de5d41c7cf9a641491c388546a2cae5 (commit)
      from  a22bdcefc0a08ef31d725fe336d8c3367291b4f4 (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 |    6 ++++++
 debian/control   |    2 +-
 debian/gbp.conf  |    2 +-
 debian/rules     |    2 ++
 pom.xml          |    4 ----
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 46a8138..913e0a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+freehep-chartableconverter-plugin (2.0-3) unstable; urgency=low
+
+  * Switched to quilt and topgit patches over upstream code
+
+ -- Giovanni Mascellani <mascellani at poisson.phc.unipi.it>  Sat, 28 Nov 2009 19:00:17 +0100
+
 freehep-chartableconverter-plugin (2.0-2) unstable; urgency=low
 
   * debian/control: fixed Vcs-* fields
diff --git a/debian/control b/debian/control
index e8fd367..c75416f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ 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: debhelper (>= 7), cdbs, maven-debian-helper, quilt
 Build-Depends-Indep: default-jdk, libplexus-compiler-api-java
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-java/freehep/freehep-chartableconverter-plugin.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 857b866..af5dba4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,10 +25,6 @@
       <artifactId>plexus-compiler-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-project</artifactId>
     </dependency>


hooks/post-receive
-- 
FreeHEP Character Table Converter