[SCM] JAS(2) Plotter branch, patch/pom.xml, updated. upstream/2.2.6-21-gbfa0a1c
Gabriele Giacone
gg0-guest at alioth.debian.org
Sun Jan 17 17:15:38 UTC 2010
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 "JAS(2) Plotter".
The branch, patch/pom.xml has been updated
via bfa0a1c80795c9fae4dcc0ce1acc8a7d99389bbc (commit)
via 13f164da8ba5d6a6f95c4edaaf6b2164c94f069d (commit)
via 7c2b2b248a724ba28106a4d170b839577602beaa (commit)
via 4e7278f91bfeaa58b658f934ea47e35b6cf61917 (commit)
via e0fee32a4f0f1cd6faff5a14e1e84db8e47a7a68 (commit)
via 046fb2db41196186f81e7af7e5f64245d3000fe4 (commit)
via 4cf4a7dd5a3ec281817f0c542e93ee53204f9a21 (commit)
via 5ce374a5ffbe75c675c3c82960eddde102073036 (commit)
via 5595965675ba57d8d5609faecc768cdaa93d6859 (commit)
via fb34ab12f4a6c9af5fdfd0c8cf849f4eb3d7e9ec (commit)
from bb4687ee30af4959b1bbe94c934ec7723c86b8f6 (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 bfa0a1c80795c9fae4dcc0ce1acc8a7d99389bbc
Merge: 7c2b2b248a724ba28106a4d170b839577602beaa 13f164da8ba5d6a6f95c4edaaf6b2164c94f069d
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date: Sun Jan 17 17:51:10 2010 +0100
Merge commit 'refs/top-bases/patch/pom.xml' into patch/pom.xml
commit 7c2b2b248a724ba28106a4d170b839577602beaa
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date: Sun Jan 17 17:43:05 2010 +0100
Updated .topmsg
commit 4e7278f91bfeaa58b658f934ea47e35b6cf61917
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date: Sun Jan 17 14:31:20 2010 +0100
pom.xml: Added Debian libtablelayout dependency
-----------------------------------------------------------------------
Summary of changes:
.topmsg | 4 ++--
debian/README.source | 11 +++++++++++
debian/changelog | 2 +-
debian/control | 6 +++---
debian/copyright | 25 +++++++++----------------
debian/gbp.conf | 2 +-
debian/maven.rules | 1 +
debian/orig-tar.sh | 16 ----------------
debian/watch | 6 ++----
pom.xml | 8 +++++++-
10 files changed, 37 insertions(+), 44 deletions(-)
diff --git a/.topmsg b/.topmsg
index e345d78..82aea68 100644
--- a/.topmsg
+++ b/.topmsg
@@ -1,7 +1,7 @@
From: Gabriele Giacone <1o5g4r8o at gmail.com>
Subject: [PATCH] patch/pom.xml
-Removed dependency on freehep-export.
-freehep-export already is dependent on jas-plotter.
+ - Removed dependence on freehep-export (cyclic dependency)
+ - Added dependence on Debian libtablelayout
Signed-off-by: Gabriele Giacone <1o5g4r8o at gmail.com>
diff --git a/debian/README.source b/debian/README.source
index 683133e..a89e916 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,6 +1,9 @@
Information about jas-plotter
------------------------------
+
+DEBIANIZATION
+
This package was debianized using the mh_make command
from the maven-debian-helper package.
@@ -8,6 +11,9 @@ The build system uses Maven but prevents it from downloading
anything from the Internet, making the build compliant with
the Debian policy.
+
+QUILT
+
This package uses quilt to manage all modifications to the upstream
source. Changes are stored in the source package as diffs in
debian/patches and applied during the build. Please see:
@@ -18,4 +24,9 @@ for more information on how to apply the patches, modify patches, or
remove a patch.
+REPACKAGING
+
+The original tarball for this package has been modified, because it
+included some non DFSG compliant code (the directory src/main/java/tablelayout
+has been removed).
diff --git a/debian/changelog b/debian/changelog
index 34c4750..28a69fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,4 @@ jas-plotter (2.2.6-1) unstable; urgency=low
* Initial release (Closes: #558344)
- -- Gabriele Giacone <losgarbo at libero.it> Sat, 28 Nov 2009 04:18:27 +0100
+ -- Gabriele Giacone <1o5g4r8o at gmail.com> Sat, 12 Dec 2009 18:07:45 +0100
diff --git a/debian/control b/debian/control
index 9c76dd3..6859e27 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,11 @@ Source: jas-plotter
Section: java
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>
+Uploaders: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>,
+ Gabriele Giacone <1o5g4r8o at gmail.com>
Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper, quilt
Build-Depends-Indep: libsurefire-java (>= 2.4.3), javahelp2 (>= 2.0.05.ds1-3), junit,
- libxerces2-java
+ libxerces2-java, libtablelayout-java (>= 20090826)
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-java/freehep/jas-plotter.git
Vcs-Browser: http://git.debian.org/?p=pkg-java/freehep/jas-plotter.git;a=summary
diff --git a/debian/copyright b/debian/copyright
index 65dbaef..d9c0f0d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,27 +4,20 @@ Maintainer: The FreeHEP team
Source: http://java.freehep.org/jas-plotter
Files: *
-Copyright: © 2003 - 2007 Mark Donszelmann <Mark.Donszelmann at slac.stanford.edu>
- © 2003 - 2007 Tony Johnson <tonyj at slac.stanford.edu>
- © 2003 - 2007 Max Turri <turri at slac.stanford.edu>
- © 2003 - 2007 Victor Serbo <Victor.Serbo at slac.stanford.edu>
- © 2003 - 2007 Gary Bower <Gary.Bower at slac.stanford.edu>
- © 2003 - 2007 Julius Hrivnac <hrivnac at lal.in2p3.fr>
- © 2003 - 2007 Cal Loomis <loomis at lal.in2p3.fr>
- © 2003 - 2007 Joseph Perl <Joseph.Perl at slac.stanford.edu>
- © 2003 - 2007 Peter Armstrong
- © 2003 - 2007 Simon Fischer
- © 2003 - 2007 Andre Bach
- © 2003 - 2007 Partick Hellwig
- © 2003 - 2007 Sami Kama
- © 2003 - 2007 Paul Spence
+Copyright: 2000-2007, CERN, Geneva, Switzerland
+ 2000-2007, SLAC, Stanford, California, U.S.A.
+ 2000-2007, University of California Santa Cruz, U.S.A.
License: LGPL-2.1+
On Debian GNU/Linux system you can find the complete text of the
LGPL-2.1 license in '/usr/share/common-licenses/LGPL-2.1'
+ No license files are included in upstream tarball but copyright holders
+ list is available at
+<http://java.freehep.org/svn/repos/freehep/show/freehep/trunk/vectorgraphics/LICENSE.txt>
+ and adopted license at <http://java.freehep.org/license.html>
Files: debian/*
-Copyright: © 2009 Gabriele Giacone <1o5g4r8o at gmail.com>
-Copyright: © 2009 Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
+Copyright: 2010, Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
+ 2010, Gabriele Giacone <1o5g4r8o at gmail.com>
License: GPL-3+
On Debian GNU/Linux system you can find the complete text of the
GPL-3 license in '/usr/share/common-licenses/GPL-3'
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/maven.rules b/debian/maven.rules
index e69de29..f60def6 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -0,0 +1 @@
+junit junit jar s/.*/3.x/ *
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
deleted file mode 100755
index 92e3109..0000000
--- a/debian/orig-tar.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh -e
-
-VERSION=$2
-TAR=../jas-plotter_$VERSION.orig.tar.gz
-DIR=jas-plotter-$VERSION
-TAG=$(echo "jas-plotter-$VERSION" | sed -re's/~(alpha|beta)/-\1-/')
-
-svn export svn://svn.freehep.org/svn/freehep/tags/${TAG}/ $DIR
-GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR
-rm -rf $DIR ../$TAG
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
- . .svn/deb-layout
- mv $TAR $origDir && echo "moved $TAR to $origDir"
-fi
diff --git a/debian/watch b/debian/watch
index 248505f..f1fc674 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,2 @@
-version=3
-opts="uversionmangle=s/-(alpha|beta)-/~$1/" \
- svn://svn.freehep.org/svn/freehep/tags/ \
- jas-plotter-(\d.*)/ debian debian/orig-tar.sh
+# Watch file missing, because upstream releases are available only via
+# SVN, but uscan is unable to read in a SVN repository.
diff --git a/pom.xml b/pom.xml
index 258722a..ade5308 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,13 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.debian</groupId>
+ <artifactId>tablelayout</artifactId>
+ <scope>system</scope>
+ <systemPath>/usr/share/java/tablelayout.jar</systemPath>
+ </dependency>
</dependencies>
<scm>
hooks/post-receive
--
JAS(2) Plotter
More information about the pkg-java-commits
mailing list