[pkg-java] r19025 - in trunk/entagged/debian: . patches

Wed Apr 13 13:47:10 UTC 2016

Author: apo
Date: 2016-04-13 13:47:10 +0000 (Wed, 13 Apr 2016)
New Revision: 19025

Added:
   trunk/entagged/debian/watch
Modified:
   trunk/entagged/debian/changelog
   trunk/entagged/debian/compat
   trunk/entagged/debian/control
   trunk/entagged/debian/copyright
   trunk/entagged/debian/docs
   trunk/entagged/debian/entagged.1
   trunk/entagged/debian/entagged.desktop
   trunk/entagged/debian/patches/build.diff
   trunk/entagged/debian/rules
Log:
Release 0.35-5


Modified: trunk/entagged/debian/changelog
===================================================================

--- trunk/entagged/debian/changelog	2016-04-02 22:07:11 UTC (rev 19024)
+++ trunk/entagged/debian/changelog	2016-04-13 13:47:10 UTC (rev 19025)
@@ -1,10 +1,25 @@
-entagged (0.35-5) UNRELEASED; urgency=low
+entagged (0.35-5) unstable; urgency=medium
 
   * Team upload.
-  * Use public access URL in Vcs-Svn field. (Closes: #669293).
-  * Bump Standards-Version to 3.9.3. No changes were required.
+  * Use canonical Vcs-URI. (Closes: #669293)
+  * wrap-and-sort -sa.
+  * Use compat level 9 and require debhelper >= 9.
+  * Use only Build-Depends field.
+  * Declare compliance with Debian Policy 3.9.8.
+  * Replace dependency on openjdk-6-jre with default-jre.
+  * Improve package description.
+    Thanks to Justin B Rye for the report and patch. (Closes: #680746)
+  * Switch from cdbs to dh-sequencer.
+  * entagged.desktop: Add keywords and a comment in German.
+  * Add DEP-3 header to build.diff.
+  * Fix spelling mistakes in man page.
+  * Fix Lintian warning copyright-refers-to-symlink-license.
+  * Add debian/watch file.
+  * Depend on default-jre (>= 2:1.8) | java8-runtime. Despite setting source
+    1.5 in build.xml, according to Lintian the class files require at least
+    Java 8.
 
- -- Miguel Landaeta <miguel at miguel.cc>  Thu, 26 Apr 2012 19:33:40 -0430
+ -- Markus Koschany <apo at debian.org>  Wed, 13 Apr 2016 15:30:10 +0200
 
 entagged (0.35-4) unstable; urgency=low
 

Modified: trunk/entagged/debian/compat
===================================================================
--- trunk/entagged/debian/compat	2016-04-02 22:07:11 UTC (rev 19024)
+++ trunk/entagged/debian/compat	2016-04-13 13:47:10 UTC (rev 19025)
@@ -1 +1 @@
-7
+9

Modified: trunk/entagged/debian/control
===================================================================
--- trunk/entagged/debian/control	2016-04-02 22:07:11 UTC (rev 19024)
+++ trunk/entagged/debian/control	2016-04-13 13:47:10 UTC (rev 19025)
@@ -2,20 +2,30 @@
 Section: editors
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Torsten Werner <twerner at debian.org>, Varun Hiremath <varun at debian.org>
-Build-Depends: cdbs, debhelper (>= 7)
-Build-Depends-Indep: ant, junit, libhsqldb-java, default-jdk
-Standards-Version: 3.9.3
+Uploaders:
+ Torsten Werner <twerner at debian.org>,
+ Varun Hiremath <varun at debian.org>
+Build-Depends:
+ ant,
+ debhelper (>= 9),
+ default-jdk,
+ junit,
+ libhsqldb-java
+Standards-Version: 3.9.8
 Homepage: http://sourceforge.net/projects/entagged
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/entagged
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/entagged/
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/entagged
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-java/trunk/entagged/
 
 Package: entagged
 Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | java6-runtime, libhsqldb-java,
- squareness
-Description: Java Audio File Tagger
- Entagged is a audiofile tagger, using the freedb online database for
- the retrieval of the tags. It supports custom file renaming from tags
- (with any directory stucture) and vice versa. Supports: mp3, ogg,
- flac, mpc, ape, wma.
+Depends:
+ libhsqldb-java,
+ default-jre (>= 2:1.8) | java8-runtime,
+ squareness,
+ ${misc:Depends}
+Description: graphical audio file tagger with freedb support
+ Entagged is an audio file tagger written in Java, using the freedb online
+ database for the retrieval of the tags. It can be used to organize files into
+ complex directory structures according to their tags, or to tag them from
+ their filenames. Supports: APE, FLAC, MP3, MPC, OGG, WMA.
+

Modified: trunk/entagged/debian/copyright
===================================================================
--- trunk/entagged/debian/copyright	2016-04-02 22:07:11 UTC (rev 19024)
+++ trunk/entagged/debian/copyright	2016-04-13 13:47:10 UTC (rev 19025)
@@ -3,11 +3,11 @@
 
 It was downloaded from http://sourceforge.net/projects/entagged
 
-Upstream Author: 
+Upstream Author:
 Raphal Slinckx <raphael at slinckx.net>
 Christian Laireiter <liree at web.de>
 
-Copyright: 
+Copyright:
 (c) 2003-2005 Raphal Slinckx <raphael at slinckx.net>
 (c) 2004-2005 Christian Laireiter <liree at web.de>
 
@@ -24,7 +24,7 @@
    GNU General Public License for more details.
 
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
 -----
 
@@ -42,7 +42,7 @@
     Lesser General Public License for more details.
 
 On Debian systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL'.
+Public License can be found in `/usr/share/common-licenses/LGPL-2'.
 
 The Debian packaging is (C) 2007, Varun Hiremath <varunhiremath at gmail.com> and
-is licensed under the GPL, see above.
+is licensed under the GPL-2, see above.

Modified: trunk/entagged/debian/docs
===================================================================
--- trunk/entagged/debian/docs	2016-04-02 22:07:11 UTC (rev 19024)
+++ trunk/entagged/debian/docs	2016-04-13 13:47:10 UTC (rev 19025)
@@ -1,2 +1,2 @@
+build/entagged/docs/images
 build/entagged/docs/readme.html
-build/entagged/docs/images

Modified: trunk/entagged/debian/entagged.1
===================================================================
--- trunk/entagged/debian/entagged.1	2016-04-02 22:07:11 UTC (rev 19024)
+++ trunk/entagged/debian/entagged.1	2016-04-13 13:47:10 UTC (rev 19025)
@@ -5,7 +5,7 @@
 .PP
 Entagged provides a convenient way of changing the value of tag
 fields, either manually, or automatically via the freedb
-database. 
+database.
 
 Entagged can also do a lot of organization work. You can rename your
 files from their tag in any way you like, including complex directory
@@ -23,7 +23,7 @@
 * Support for OGG Vorbis files - MP3 (id3v1 and id3v2 tags) files - FLAC
 Files - MPC(MP+) Musepack Files - APE Monkey Audio Files - WAV files
 .PP
-* Handles all files independently of their type (allows to batch files
+* Handles all files independently of their type (allows one to batch files
 even from mixed types)
 .PP
 * Edit essential tag information
@@ -46,7 +46,7 @@
 find any match, you can search freedb for a given artist/album and
 find the correct match yourself, then ask entagged to tag the files.
 .PP
-* Supports Multi langage (currently only english,french and spanish)
+* Supports Multi language (currently only english,french and spanish)
 (contributors appreciated)
 .PP
 * Recursive processing of all the above operations, easily !
@@ -57,7 +57,7 @@
 * Separate freedb and audioformats libraries that can be used
 independently by anyone who want to read and/or write meta data to
 audio files
-.SH DOCUMENTAION
+.SH DOCUMENTATION
 Please see /usr/share/doc/entagged/readme.html
 .SH HOMEPAGE
 http://entagged.sourceforge.net/

Modified: trunk/entagged/debian/entagged.desktop
===================================================================
--- trunk/entagged/debian/entagged.desktop	2016-04-02 22:07:11 UTC (rev 19024)
+++ trunk/entagged/debian/entagged.desktop	2016-04-13 13:47:10 UTC (rev 19025)
@@ -2,9 +2,11 @@
 Name=Entagged
 Comment=Tag Editor
 Comment[fr]=Editeur de Tags
+Comment[de]=Editor zum Kennzeichnen von Audiodateien
 Exec=entagged
-Icon=entagged.png
+Icon=entagged
 TryExec=entagged
-Terminal=0
+Terminal=false
 Type=Application
 Categories=AudioVideo;
+Keywords=tag;editor;audio;video;java;

Modified: trunk/entagged/debian/patches/build.diff
===================================================================
--- trunk/entagged/debian/patches/build.diff	2016-04-02 22:07:11 UTC (rev 19024)
+++ trunk/entagged/debian/patches/build.diff	2016-04-13 13:47:10 UTC (rev 19025)
@@ -1,7 +1,16 @@
-Index: entagged-0.31/build.xml
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Wed, 13 Apr 2016 14:49:20 +0200
+Subject: build
+
 ===================================================================
---- entagged-0.31.orig/build.xml	2007-03-23 15:25:25.000000000 +0100
-+++ entagged-0.31/build.xml	2007-04-08 11:53:57.000000000 +0200
+---
+ build.xml | 29 +++++++++++++++++++++--------
+ 1 file changed, 21 insertions(+), 8 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 2dc3a78..944b209 100755
+--- a/build.xml
++++ b/build.xml
 @@ -28,9 +28,9 @@
  	
  	<!-- set global properties -->
@@ -23,7 +32,7 @@
  <echo>
  Entagged Tag editor is now fully compiled.
  You can use either:
-@@ -71,7 +71,7 @@
+@@ -71,7 +71,7 @@ to launch entagged from sources you just compiled !
  	<!-- Prepares the classes to be packaged -->
  	<target name="build" depends="compile">
  		<!-- Jar the classes files  -->
@@ -32,7 +41,7 @@
  			<manifest>
  				<attribute name="Class-Path" value="${tageditor_jar_classpath}"/>
  				<attribute name="Main-Class" value="${tageditor_jar_mainclass}"/>
-@@ -82,16 +82,29 @@
+@@ -82,16 +82,29 @@ to launch entagged from sources you just compiled !
  	<target name="build-dir" depends="build">
  		<mkdir dir="${build_dir}" />
  		<copy todir="${build_dir}/docs">

Modified: trunk/entagged/debian/rules
===================================================================
--- trunk/entagged/debian/rules	2016-04-02 22:07:11 UTC (rev 19024)
+++ trunk/entagged/debian/rules	2016-04-13 13:47:10 UTC (rev 19025)
@@ -1,16 +1,20 @@
 #!/usr/bin/make -f
+export JAVA_HOME=/usr/lib/jvm/default-java
+export CLASSPATH=/usr/share/java/hsqldb.jar
+DEB_UPSTREAM_VERSION ?= $(shell dpkg-parsechangelog | sed -rne 's/^Version: ([0-9.]+)[-+].*$$/\1/p')
 
-include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
+%:
+	dh $@ --parallel --buildsystem=ant
 
-JAVA_HOME		:= /usr/lib/jvm/default-java
-DEB_ANT_BUILD_TARGET 	:= build-dir
-DEB_JARS  		:= hsqldb
+override_dh_auto_build:
+	dh_auto_build -- build-dir
 
+DEB_DESTDIR   := debian/entagged
 IMAGE_SRCDIR  := entagged/entagged-build-resources/image
 IMAGE_DESTDIR := $(DEB_DESTDIR)/usr/share/icons/hicolor
 
-install/entagged::
+override_dh_install:
+	dh_install
 	install -m 644 -D build/entagged/entagged-tageditor*.jar \
 	  $(DEB_DESTDIR)/usr/share/java/entagged-tageditor-$(DEB_UPSTREAM_VERSION).jar
 	dh_link /usr/share/java/entagged-tageditor-$(DEB_UPSTREAM_VERSION).jar \

Added: trunk/entagged/debian/watch
===================================================================
--- trunk/entagged/debian/watch	                        (rev 0)
+++ trunk/entagged/debian/watch	2016-04-13 13:47:10 UTC (rev 19025)
@@ -0,0 +1,2 @@
+version=4
+http://sf.net/entagged/Entagged-install-(\d\S*)\.(?:exe|zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))


