[pkg-java] r14233 - trunk/liblastfm-java/debian

[Torsten Werner]

Author: twerner
Date: 2011-08-16 20:20:50 +0000 (Tue, 16 Aug 2011)
New Revision: 14233

Removed:
   trunk/liblastfm-java/debian/build.xml
Modified:
   trunk/liblastfm-java/debian/changelog
   trunk/liblastfm-java/debian/docs
   trunk/liblastfm-java/debian/rules
Log:
* Update debian/watch. But uscan does not work yet.
* Switch to upstream provided build.xml and remove debian/build.xml.

Deleted: trunk/liblastfm-java/debian/build.xml
===================================================================
--- trunk/liblastfm-java/debian/build.xml	2011-08-16 20:07:18 UTC (rev 14232)
+++ trunk/liblastfm-java/debian/build.xml	2011-08-16 20:20:50 UTC (rev 14233)
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<project default="jar" name="${project.name}" basedir="..">
-  <patternset id="compiler.resources">
-    <include name="**/?*.properties" />
-  </patternset>
-
-  <target name="clean">
-    <delete dir="${class.dir}" quiet="true" />
-    <delete file="${jar.name}" quiet="true" />
-    <delete dir="${doc.dir}" quiet="true" />
-  </target>
-
-  <target name="compile">
-    <mkdir dir="${class.dir}" />
-    <javac srcdir="${source.dir}" destdir="${class.dir}"
-	   debug="true" source="1.5"/>
-    <copy todir="${class.dir}">
-      <fileset dir="${source.dir}">
-        <patternset refid="compiler.resources" />
-      </fileset>
-    </copy>
-  </target>
-
-  <target name="jar" description="o Create the jar" depends="compile">
-    <jar jarfile="${jar.name}" basedir="${class.dir}" excludes="test/**/*"/>
-  </target>
-
-  <target name="javadoc" description="Creates Javadoc documentation">
-    <mkdir dir="${doc.dir}" />
-    <javadoc packagenames="*" sourcepath="${source.dir}"
-    destdir="${doc.dir}" excludepackagenames="examples, test"/>
-  </target>
-
-</project>

Modified: trunk/liblastfm-java/debian/changelog
===================================================================
--- trunk/liblastfm-java/debian/changelog	2011-08-16 20:07:18 UTC (rev 14232)
+++ trunk/liblastfm-java/debian/changelog	2011-08-16 20:20:50 UTC (rev 14233)
@@ -1,10 +1,10 @@
 liblastfm-java (1:0.1.0-1) unstable; urgency=low
 
-  UNRELEASED (uscan does not work yet)
   * New upstream release
-  * Update debian/watch.
+  * Update debian/watch. But uscan does not work yet.
+  * Switch to upstream provided build.xml and remove debian/build.xml.
 
- -- Torsten Werner <twerner at debian.org>  Mon, 15 Aug 2011 23:39:05 +0200
+ -- Torsten Werner <twerner at debian.org>  Tue, 16 Aug 2011 22:19:48 +0200
 
 liblastfm-java (7.3-1) unstable; urgency=low
 

Modified: trunk/liblastfm-java/debian/docs
===================================================================
--- trunk/liblastfm-java/debian/docs	2011-08-16 20:07:18 UTC (rev 14232)
+++ trunk/liblastfm-java/debian/docs	2011-08-16 20:20:50 UTC (rev 14233)
@@ -1 +1 @@
-apidocs
+doc/*

Modified: trunk/liblastfm-java/debian/rules
===================================================================
--- trunk/liblastfm-java/debian/rules	2011-08-16 20:07:18 UTC (rev 14232)
+++ trunk/liblastfm-java/debian/rules	2011-08-16 20:20:50 UTC (rev 14233)
@@ -3,13 +3,13 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-JAVA_HOME 		:= /usr/lib/jvm/java-6-openjdk
-DEB_ANT_BUILD_TARGET	:= jar javadoc
-DEB_ANT_BUILDFILE	:= debian/build.xml
+JAVA_HOME := /usr/lib/jvm/java-6-openjdk
 
 install/liblastfm-java::
-	install -m 644 -D lastfm.jar $(DEB_DESTDIR)/usr/share/java/lastfm-$(DEB_UPSTREAM_VERSION).jar
-	dh_link /usr/share/java/lastfm-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/lastfm.jar
+	install -m 644 -D last.fm-bindings-0.1.0.jar \
+	    $(DEB_DESTDIR)/usr/share/java/lastfm-$(DEB_UPSTREAM_VERSION).jar
+	dh_link /usr/share/java/lastfm-$(DEB_UPSTREAM_VERSION).jar \
+	    /usr/share/java/lastfm.jar
 
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download