[pkg-java] r10963 - trunk/libjlayer-java/debian
Damien Raude-Morvan
drazzib at alioth.debian.org
Sun Nov 1 21:23:36 UTC 2009
Author: drazzib
Date: 2009-11-01 21:23:36 +0000 (Sun, 01 Nov 2009)
New Revision: 10963
Added:
trunk/libjlayer-java/debian/README.source
trunk/libjlayer-java/debian/ant.properties
trunk/libjlayer-java/debian/libjlayer-java-doc.doc-base
trunk/libjlayer-java/debian/libjlayer-java-doc.install
trunk/libjlayer-java/debian/orig-tar.exclude
Removed:
trunk/libjlayer-java/debian/README.Debian-source
trunk/libjlayer-java/debian/doc-base
trunk/libjlayer-java/debian/docs
Modified:
trunk/libjlayer-java/debian/changelog
trunk/libjlayer-java/debian/compat
trunk/libjlayer-java/debian/control
trunk/libjlayer-java/debian/copyright
trunk/libjlayer-java/debian/orig-tar.sh
trunk/libjlayer-java/debian/rules
Log:
* New upstream release.
* Split documentation into libjlayer-java-doc package:
- Install API documentation in /usr/share/doc/libjlayer-java/api/
* Bump Standards-Version to 3.8.3
- Change section to "java"
- Rename debian/README.Debian-source to debian/README.source
* Bump debhelper version to >= 7
* Remove unused Depends on ${shlibs:Depends}
* Default JRE:
- Build-Depends on default-jdk
- Depends on default-jre-headless
- Use /usr/lib/jvm/default-java as JAVA_HOME
- Force 1.2 source and target in debian/ant.properties
* Add myself to Uploaders
* Use DEP5 format for debian/copyright
Deleted: trunk/libjlayer-java/debian/README.Debian-source
===================================================================
--- trunk/libjlayer-java/debian/README.Debian-source 2009-11-01 18:39:13 UTC (rev 10962)
+++ trunk/libjlayer-java/debian/README.Debian-source 2009-11-01 21:23:36 UTC (rev 10963)
@@ -1,13 +0,0 @@
-libjlayer-java
-==============
-
-The upstream supplied source package contains binary jar files,
-pre-compiled classes and pre-built documentation. Currently no clean
-source distribution exists. Therefore, the upstream sources were
-modified to comply with the Debian Free Software Guidelines.
-
-Use the rules/get-orig-source target to create the orig.tar.gz.
-For more details on repackaging of upstream sources please see the
-debian/orig-tar.sh file.
-
--- Varun Hiremath <varunhiremath at gmail.com> Mon, 27 Aug 2007 19:02:53 +0530
Copied: trunk/libjlayer-java/debian/README.source (from rev 10928, trunk/libjlayer-java/debian/README.Debian-source)
===================================================================
--- trunk/libjlayer-java/debian/README.source (rev 0)
+++ trunk/libjlayer-java/debian/README.source 2009-11-01 21:23:36 UTC (rev 10963)
@@ -0,0 +1,13 @@
+libjlayer-java
+==============
+
+The upstream supplied source package contains binary jar files,
+pre-compiled classes and pre-built documentation. Currently no clean
+source distribution exists. Therefore, the upstream sources were
+modified to comply with the Debian Free Software Guidelines.
+
+Use the rules/get-orig-source target to create the orig.tar.gz.
+For more details on repackaging of upstream sources please see the
+debian/orig-tar.sh file.
+
+-- Varun Hiremath <varunhiremath at gmail.com> Mon, 27 Aug 2007 19:02:53 +0530
Added: trunk/libjlayer-java/debian/ant.properties
===================================================================
--- trunk/libjlayer-java/debian/ant.properties (rev 0)
+++ trunk/libjlayer-java/debian/ant.properties 2009-11-01 21:23:36 UTC (rev 10963)
@@ -0,0 +1,2 @@
+ant.build.javac.source=1.2
+ant.build.javac.target=1.2
Modified: trunk/libjlayer-java/debian/changelog
===================================================================
--- trunk/libjlayer-java/debian/changelog 2009-11-01 18:39:13 UTC (rev 10962)
+++ trunk/libjlayer-java/debian/changelog 2009-11-01 21:23:36 UTC (rev 10963)
@@ -1,3 +1,23 @@
+libjlayer-java (1.0.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Split documentation into libjlayer-java-doc package:
+ - Install API documentation in /usr/share/doc/libjlayer-java/api/
+ * Bump Standards-Version to 3.8.3
+ - Change section to "java"
+ - Rename debian/README.Debian-source to debian/README.source
+ * Bump debhelper version to >= 7
+ * Remove unused Depends on ${shlibs:Depends}
+ * Default JRE:
+ - Build-Depends on default-jdk
+ - Depends on default-jre-headless
+ - Use /usr/lib/jvm/default-java as JAVA_HOME
+ - Force 1.2 source and target in debian/ant.properties
+ * Add myself to Uploaders
+ * Use DEP5 format for debian/copyright
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sun, 01 Nov 2009 22:15:00 +0100
+
libjlayer-java (1.0-2) unstable; urgency=low
* Move the package to pkg-java svn.
Modified: trunk/libjlayer-java/debian/compat
===================================================================
--- trunk/libjlayer-java/debian/compat 2009-11-01 18:39:13 UTC (rev 10962)
+++ trunk/libjlayer-java/debian/compat 2009-11-01 21:23:36 UTC (rev 10963)
@@ -1 +1 @@
-5
+7
Modified: trunk/libjlayer-java/debian/control
===================================================================
--- trunk/libjlayer-java/debian/control 2009-11-01 18:39:13 UTC (rev 10962)
+++ trunk/libjlayer-java/debian/control 2009-11-01 21:23:36 UTC (rev 10963)
@@ -1,19 +1,31 @@
Source: libjlayer-java
-Section: libs
+Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>
-Build-Depends: cdbs, debhelper (>= 5)
-Build-Depends-Indep: ant, java-gcj-compat-dev
-Standards-Version: 3.7.3
+Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>, Damien Raude-Morvan <drazzib at debian.org>
+Build-Depends: cdbs, debhelper (>= 7), ant, default-jdk
+Standards-Version: 3.8.3
Homepage: http://www.javazoom.net/javalayer/javalayer.html
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjlayer-java
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjlayer-java
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjlayer-java/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjlayer-java/
Package: libjlayer-java
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime
+Depends: ${misc:Depends}, default-jre-headless
Description: library to decode, convert and play MP3 files
JAVA library that decodes, converts and plays MP3 files in
real-time. JLayer supports MPEG 1/2/2.5 Layer 1/2/3 audio
format. JLayer doesn't need JMF. It runs under J2SE.
+
+Package: libjlayer-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Suggests: libjlayer-java
+Description: library to decode, convert and play MP3 files - documentation
+ JAVA library that decodes, converts and plays MP3 files in
+ real-time. JLayer supports MPEG 1/2/2.5 Layer 1/2/3 audio
+ format. JLayer doesn't need JMF. It runs under J2SE.
+ .
+ This package contains API documentation (Javadoc) of JLayer.
+
Modified: trunk/libjlayer-java/debian/copyright
===================================================================
--- trunk/libjlayer-java/debian/copyright 2009-11-01 18:39:13 UTC (rev 10962)
+++ trunk/libjlayer-java/debian/copyright 2009-11-01 21:23:36 UTC (rev 10963)
@@ -1,22 +1,18 @@
-This package was debianized by Varun Hiremath <varunhiremath at gmail.com> on
-Mon, 23 Apr 2007 00:21:24 +0530.
+Format-Specification: http://dep.debian.net/deps/dep5/
+Name: JLayer
+Maintainer: JavaZOOM <jlayer at javazoom.net>
+ Matthew McGowan <javalayer at revival.force9.co.uk>
+ Matthias Pfisterer <matthias.pfisterer at web.de>
+ Michael Scheerer <m_scheerer at web.de>
+ Daniel Szabo <szd713 at hotmail.com>
+ Micah Spears <micah at usa.com>
+ Paul Santon <wanto_ at hotmail.com>
+Source: http://www.javazoom.net/javalayer/sources.html
-It was downloaded from http://www.javazoom.net/javalayer/sources.html
-Upstream Authors:
-JavaZOOM <jlayer at javazoom.net>
-Matthew McGowan <javalayer at revival.force9.co.uk>
-Matthias Pfisterer <matthias.pfisterer at web.de>
-Michael Scheerer <m_scheerer at web.de>
-Daniel Szabo <szd713 at hotmail.com>
-Micah Spears <micah at usa.com>
-Paul Santon <wanto_ at hotmail.com>
-
-Copyright:
-(C) 2004 JavaZOOM <jlayer at javazoom.net>
-
-License:
-
+Files: *
+Copyright: Copyright (C) 2004 JavaZOOM <jlayer at javazoom.net>
+License: LGPL-2.1+
This package 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
@@ -27,8 +23,12 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
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'.
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
-The Debian packaging is (C) 2007, Varun Hiremath <varunhiremath at gmail.com> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+Files: debian/*
+Copyright: (C) Copyright 2007, Varun Hiremath <varunhiremath at gmail.com>
+Copyright: (C) Copyright 2009, Damien Raude-Morvan <drazzib at debian.org>
+Licence: GPL-2+
+ Debian packaging is licensed under the GPL version 2 (or later),
+ see `/usr/share/common-licenses/GPL-2'.
Deleted: trunk/libjlayer-java/debian/doc-base
===================================================================
--- trunk/libjlayer-java/debian/doc-base 2009-11-01 18:39:13 UTC (rev 10962)
+++ trunk/libjlayer-java/debian/doc-base 2009-11-01 21:23:36 UTC (rev 10963)
@@ -1,9 +0,0 @@
-Document: libjlayer-java
-Title: MP3 decoder/player/converter library for the Java platform
-Author: JavaZOOM
-Abstract: JLayer is Java library that decodes, converts and plays MP3 files in real-time. JLayer supports MPEG 1/2/2.5 Layer 1/2/3 audio format. JLayer doesn't need JMF. It runs under J2SE.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libjlayer-java/index.html
-Files: /usr/share/doc/libjlayer-java/*.html
Deleted: trunk/libjlayer-java/debian/docs
===================================================================
--- trunk/libjlayer-java/debian/docs 2009-11-01 18:39:13 UTC (rev 10962)
+++ trunk/libjlayer-java/debian/docs 2009-11-01 21:23:36 UTC (rev 10963)
@@ -1 +0,0 @@
-doc/*
Copied: trunk/libjlayer-java/debian/libjlayer-java-doc.doc-base (from rev 10962, trunk/libjlayer-java/debian/doc-base)
===================================================================
--- trunk/libjlayer-java/debian/libjlayer-java-doc.doc-base (rev 0)
+++ trunk/libjlayer-java/debian/libjlayer-java-doc.doc-base 2009-11-01 21:23:36 UTC (rev 10963)
@@ -0,0 +1,9 @@
+Document: libjlayer-java
+Title: MP3 decoder/player/converter library for the Java platform
+Author: JavaZOOM
+Abstract: JLayer is Java library that decodes, converts and plays MP3 files in real-time. JLayer supports MPEG 1/2/2.5 Layer 1/2/3 audio format. JLayer doesn't need JMF. It runs under J2SE.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libjlayer-java/api/index.html
+Files: /usr/share/doc/libjlayer-java/api/*.html
Copied: trunk/libjlayer-java/debian/libjlayer-java-doc.install (from rev 10962, trunk/libjlayer-java/debian/docs)
===================================================================
--- trunk/libjlayer-java/debian/libjlayer-java-doc.install (rev 0)
+++ trunk/libjlayer-java/debian/libjlayer-java-doc.install 2009-11-01 21:23:36 UTC (rev 10963)
@@ -0,0 +1 @@
+doc/* /usr/share/doc/libjlayer-java/api/
Added: trunk/libjlayer-java/debian/orig-tar.exclude
===================================================================
--- trunk/libjlayer-java/debian/orig-tar.exclude (rev 0)
+++ trunk/libjlayer-java/debian/orig-tar.exclude 2009-11-01 21:23:36 UTC (rev 10963)
@@ -0,0 +1,3 @@
+*.jar
+*/classes/*
+*/doc/*
Modified: trunk/libjlayer-java/debian/orig-tar.sh
===================================================================
--- trunk/libjlayer-java/debian/orig-tar.sh 2009-11-01 18:39:13 UTC (rev 10962)
+++ trunk/libjlayer-java/debian/orig-tar.sh 2009-11-01 21:23:36 UTC (rev 10963)
@@ -7,7 +7,7 @@
# clean up the upstream tarball
tar -x -z -f $3
mv JLayer$2 $DIR
-tar -c -z -f $3 --exclude '*.jar' --exclude '*/classes/*' --exclude '*/doc/*' $DIR
+tar -c -z -f $3 -X debian/orig-tar.exclude $DIR
rm -rf $DIR
# move to directory 'tarballs'
Modified: trunk/libjlayer-java/debian/rules
===================================================================
--- trunk/libjlayer-java/debian/rules 2009-11-01 18:39:13 UTC (rev 10962)
+++ trunk/libjlayer-java/debian/rules 2009-11-01 21:23:36 UTC (rev 10963)
@@ -3,12 +3,17 @@
include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-JAVA_HOME := /usr/lib/jvm/java-gcj
+JAVA_HOME := /usr/lib/jvm/default-java
DEB_ANT_BUILD_TARGET := all
install/libjlayer-java::
- install -m 644 -D jl*.jar $(DEB_DESTDIR)/usr/share/java/jl-$(DEB_UPSTREAM_VERSION).jar
- dh_link /usr/share/java/jl-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jl.jar
+ mv jl*.jar jl-$(DEB_UPSTREAM_VERSION).jar
+ dh_install -plibjlayer-java jl-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/
+ dh_link -plibjlayer-java /usr/share/java/jl-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jl.jar
+clean::
+ rm -rf doc/*
+ rm -rf classes/*
+
get-orig-source:
-uscan --upstream-version 0 --rename
More information about the pkg-java-commits
mailing list