[SCM] collections15 packaging branch, master, updated. upstream/4.01+ds1-7-g1b43980

2011-11-28 Thread Giovanni Mascellani
The following commit has been merged in the master branch:
commit ae80f9b2bce1056ec26e4af557095a49dae9a123
Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it
Date:   Sun Nov 27 18:33:19 2011 +0100

Add file for javahelper.

diff --git a/debian/javabuild b/debian/javabuild
new file mode 100644
index 000..a7cf552
--- /dev/null
+++ b/debian/javabuild
@@ -0,0 +1 @@
+collections15.jar src/
diff --git a/debian/jlibs b/debian/jlibs
new file mode 100644
index 000..3d09ad4
--- /dev/null
+++ b/debian/jlibs
@@ -0,0 +1 @@
+collections15.jar

-- 
collections15 packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] collections15 packaging branch, master, updated. upstream/4.01+ds1-7-g1b43980

2011-11-28 Thread Giovanni Mascellani
The following commit has been merged in the master branch:
commit 96042d3d5393cdfa5f571323a5d3973f5ac86b84
Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it
Date:   Mon Nov 28 09:54:19 2011 +0100

Write d/copyright.

diff --git a/debian/copyright b/debian/copyright
index 70488b9..e4739a0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,20 +1,29 @@
 Format: http://dep.debian.net/deps/dep5
-Upstream-Name: collections15
-Source: url://example.com
+Upstream-Name: Collections with generics support
+Source: http://sourceforge.net/projects/collections/
 
 Files: *
-Copyright: years put author's name and email here
-   years likewise for another author
-License: special license
- Put the license of the package here indented by 1 space
- This follows the format of Description: lines in control file
+Copyright: © 2001 - 2004, The Apache Software Foundation
+   © 2003 - 2006, Matt Hall
+   © 2003 - 2006, John Watkinson
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the License);
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
  .
- Including paragraphs
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an AS IS BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the complete text of the Apache License version 2.0
+ can be found in /usr/share/common-licenses/Apache-2.0.
 
-# If you want to use GPL v2 or later for the /debian/* files use 
-# the following clauses, or change it to suit. Delete these two lines
 Files: debian/*
-Copyright: 2011 Giovanni Mascellani g...@debian.org
+Copyright: © 2011, Giovanni Mascellani g...@debian.org
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -31,6 +40,3 @@ License: GPL-2+
  .
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in /usr/share/common-licenses/GPL-2.
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.

-- 
collections15 packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] collections15 packaging branch, master, updated. upstream/4.01+ds1-7-g1b43980

2011-11-28 Thread Giovanni Mascellani
The following commit has been merged in the master branch:
commit ae5e8872c07b38dd318f6b3282a45d6661976ef7
Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it
Date:   Sun Nov 27 18:36:37 2011 +0100

Add junit4 dependency.

diff --git a/debian/control b/debian/control
index ca02baa..b037520 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: extra
 Maintainer: Debian Java Maintainers 
pkg-java-maintainers@lists.alioth.debian.org
 Uploaders: Giovanni Mascellani g...@debian.org
-Build-Depends: debhelper (= 8.0.0), default-jdk, javahelper
+Build-Depends: debhelper (= 8.0.0), default-jdk, javahelper, junit4
 Standards-Version: 3.9.2
 Homepage: http://larvalabs.com/collections/
 Vcs-Git: git://git.debian.org/pkg-java/collections15.git
diff --git a/debian/rules b/debian/rules
index f989aff..60bb93b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+export CLASSPATH=/usr/share/java/junit4.jar
+
 %:
dh $@ --with javahelper
 

-- 
collections15 packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] collections15 packaging branch, master, updated. upstream/4.01+ds1-7-g1b43980

2011-11-28 Thread Giovanni Mascellani
The following commit has been merged in the master branch:
commit 1b43980c27d49bd0e537437b7441474a68146b93
Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it
Date:   Mon Nov 28 09:55:59 2011 +0100

Releasing to sid.

diff --git a/debian/changelog b/debian/changelog
index 800fa67..8846dcc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-collections15 (4.01+ds1-1) UNRELEASED; urgency=low
+collections15 (4.01+ds1-1) unstable; urgency=low
 
   * Initial release (closes: #650172).
 
- -- Giovanni Mascellani g...@debian.org  Sun, 27 Nov 2011 10:08:55 +0100
+ -- Giovanni Mascellani g...@debian.org  Mon, 28 Nov 2011 09:55:54 +0100

-- 
collections15 packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits