[med-svn] r11966 - trunk/packages/figtree/trunk/debian

[Andreas Tille]

Author: tille
Date: 2012-08-02 07:52:23 +0000 (Thu, 02 Aug 2012)
New Revision: 11966

Modified:
   trunk/packages/figtree/trunk/debian/changelog
   trunk/packages/figtree/trunk/debian/compat
   trunk/packages/figtree/trunk/debian/control
   trunk/packages/figtree/trunk/debian/copyright
Log:
standards-version, debhelper 9, DEP5


Modified: trunk/packages/figtree/trunk/debian/changelog
===================================================================
--- trunk/packages/figtree/trunk/debian/changelog	2012-08-02 07:47:08 UTC (rev 11965)
+++ trunk/packages/figtree/trunk/debian/changelog	2012-08-02 07:52:23 UTC (rev 11966)
@@ -6,6 +6,9 @@
   * debian/control:
      - Switch Build-Depends to default-jdk (also thanks to James)
      - Fixed Vcs fields
+     - Standards-Version: 3.9.3 (no changes needed)
+  * debhelper 9 (control+compat)
+  * debian/copyright: Fixed some DEP5 issues
 
  -- Andreas Tille <tille at debian.org>  Thu, 02 Aug 2012 09:43:00 +0200
 

Modified: trunk/packages/figtree/trunk/debian/compat
===================================================================
--- trunk/packages/figtree/trunk/debian/compat	2012-08-02 07:47:08 UTC (rev 11965)
+++ trunk/packages/figtree/trunk/debian/compat	2012-08-02 07:52:23 UTC (rev 11966)
@@ -1 +1 @@
-7
+9

Modified: trunk/packages/figtree/trunk/debian/control
===================================================================
--- trunk/packages/figtree/trunk/debian/control	2012-08-02 07:47:08 UTC (rev 11965)
+++ trunk/packages/figtree/trunk/debian/control	2012-08-02 07:52:23 UTC (rev 11966)
@@ -4,13 +4,13 @@
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 7.1), javahelper (>=0.25), default-jdk, ant, quilt (>= 0.47),
+Build-Depends: debhelper (>= 9), javahelper (>=0.25), default-jdk, ant,
  libjebl2-java, libjam-java, libtrove-java,
  libfreehep-graphics2d-java, libfreehep-graphicsio-java,
  libfreehep-graphicsio-pdf-java, libfreehep-graphicsio-ps-java,
  libfreehep-graphicsio-swf-java, libfreehep-graphicsio-svg-java,
  libfreehep-graphicsio-emf-java, libitext5-java
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
 Homepage: http://tree.bio.ed.ac.uk/software/figtree/
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/figtree/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/figtree/trunk/

Modified: trunk/packages/figtree/trunk/debian/copyright
===================================================================
--- trunk/packages/figtree/trunk/debian/copyright	2012-08-02 07:47:08 UTC (rev 11965)
+++ trunk/packages/figtree/trunk/debian/copyright	2012-08-02 07:52:23 UTC (rev 11966)
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: FigTree
 Upstream-Contact: Andrew Rambaut <a.rambaut at ed.ac.uk>
 Source: http://code.google.com/p/figtree/
@@ -6,6 +6,31 @@
 Files: *
 Copyright: © 2005-2011 Andrew Rambaut <a.rambaut at ed.ac.uk>
 License: GPL
+
+Files: src/figtree/application/Arguments.java
+       src/figtree/application/Utils.java
+       src/figtree/ui/components/ColorWellButton.java
+       src/figtree/ui/components/JVerticalLabel.java
+       src/figtree/ui/components/RealNumberField.java
+       src/figtree/ui/components/WholeNumberField.java
+Copyright: © 2009 JAM Development Team
+License: LGPL
+
+Files: src/figtree/panel/SimpleTreeViewer.java
+       src/figtree/treeviewer/annotations/AnnotationDefinitionsDialog.java
+       src/figtree/treeviewer/annotations/AnnotationDialog.java
+       src/figtree/treeviewer/annotations/DefineAnnotationDialog.java
+       src/figtree/treeviewer/annotations/SelectAnnotationDialog.java
+       src/figtree/treeviewer/DefaultTreeViewer.java
+       src/figtree/treeviewer/ExtendedTreeViewer.java
+Copyright: © 2002-2005 BEAST Development Core Team
+License: LGPL
+
+Files: debian/*
+Copyright: © 2011 Andreas Tille <tille at debian.org>
+License: LGPL
+
+License: GPL
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public
  License as published by the Free Software Foundation; either
@@ -27,24 +52,7 @@
  License can be found in the file
  `/usr/share/common-licenses/GPL'.
 
-Files: src/figtree/application/Arguments.java
-       src/figtree/application/Utils.java
-       src/figtree/ui/components/ColorWellButton.java
-       src/figtree/ui/components/JVerticalLabel.java
-       src/figtree/ui/components/RealNumberField.java
-       src/figtree/ui/components/WholeNumberField.java
-Copyright: © 2009 JAM Development Team
 License: LGPL
-
-Files: src/figtree/panel/SimpleTreeViewer.java
-       src/figtree/treeviewer/annotations/AnnotationDefinitionsDialog.java
-       src/figtree/treeviewer/annotations/AnnotationDialog.java
-       src/figtree/treeviewer/annotations/DefineAnnotationDialog.java
-       src/figtree/treeviewer/annotations/SelectAnnotationDialog.java
-       src/figtree/treeviewer/DefaultTreeViewer.java
-       src/figtree/treeviewer/ExtendedTreeViewer.java
-Copyright: © 2002-2005 BEAST Development Core Team
-License: LGPL
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
  License as published by the Free Software Foundation; either
@@ -61,9 +69,5 @@
  .
  On Debian systems, the full text of the GNU LESSER GENERAL
  PUBLIC LICENSE can be found in the file
- `/usr/share/common-licenses/GPL'.
+ `/usr/share/common-licenses/LGPL'.
 
-Files: debian/*
-Copyright: © 2011 Andreas Tille <tille at debian.org>
-License: LGPL
- The packaging is licensed under LGPL