[pkg-java] r13386 - trunk/libjhlabs-filters-java/debian

Damien Raude-Morvan drazzib at alioth.debian.org
Sat Mar 5 23:11:10 UTC 2011 

Author: drazzib
Date: 2011-03-05 23:11:10 +0000 (Sat, 05 Mar 2011)
New Revision: 13386

Added:
   trunk/libjhlabs-filters-java/debian/javabuild
   trunk/libjhlabs-filters-java/debian/javadoc
   trunk/libjhlabs-filters-java/debian/pom.xml
Removed:
   trunk/libjhlabs-filters-java/debian/ant.properties
   trunk/libjhlabs-filters-java/debian/build.xml
   trunk/libjhlabs-filters-java/debian/docs
Modified:
   trunk/libjhlabs-filters-java/debian/changelog
   trunk/libjhlabs-filters-java/debian/control
   trunk/libjhlabs-filters-java/debian/copyright
   trunk/libjhlabs-filters-java/debian/rules
   trunk/libjhlabs-filters-java/debian/watch
Log:
* Add myself to Uploaders.
* Bump Standards-Version to 3.9.1 (no changes needed).
* Drop cdbs and switch to dh 7.
* Maven Repository:
  - d/pom.xml: create simple POM for debian.
  - d/control: B-D on maven-repo-helper
  - d/rules: use mh_install{pom,jar} to install artifacts.
* d/control: drop runtime dependencies on JRE, its a library.
* d/copyright: upgrade to DEP-5 r166.
* d/watch: use repo1.maven.org.

Deleted: trunk/libjhlabs-filters-java/debian/ant.properties
===================================================================
--- trunk/libjhlabs-filters-java/debian/ant.properties	2011-03-05 17:39:11 UTC (rev 13385)
+++ trunk/libjhlabs-filters-java/debian/ant.properties	2011-03-05 23:11:10 UTC (rev 13386)
@@ -1,5 +0,0 @@
-project.name=jhlabs-filters
-class.dir=classes
-source.dir=.
-doc.dir=apidocs
-jar.name=jhlabs-filters.jar

Deleted: trunk/libjhlabs-filters-java/debian/build.xml
===================================================================
--- trunk/libjhlabs-filters-java/debian/build.xml	2011-03-05 17:39:11 UTC (rev 13385)
+++ trunk/libjhlabs-filters-java/debian/build.xml	2011-03-05 23:11:10 UTC (rev 13386)
@@ -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/libjhlabs-filters-java/debian/changelog
===================================================================
--- trunk/libjhlabs-filters-java/debian/changelog	2011-03-05 17:39:11 UTC (rev 13385)
+++ trunk/libjhlabs-filters-java/debian/changelog	2011-03-05 23:11:10 UTC (rev 13386)
@@ -1,3 +1,18 @@
+libjhlabs-filters-java (2.0.235-3) unstable; urgency=low
+
+  * Add myself to Uploaders.
+  * Bump Standards-Version to 3.9.1 (no changes needed).
+  * Drop cdbs and switch to dh 7.
+  * Maven Repository:
+    - d/pom.xml: create simple POM for debian.
+    - d/control: B-D on maven-repo-helper
+    - d/rules: use mh_install{pom,jar} to install artifacts.
+  * d/control: drop runtime dependencies on JRE, its a library.
+  * d/copyright: upgrade to DEP-5 r166.
+  * d/watch: use repo1.maven.org.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 06 Mar 2011 00:03:41 +0100
+
 libjhlabs-filters-java (2.0.235-2) unstable; urgency=low
 
   * Team Upload

Modified: trunk/libjhlabs-filters-java/debian/control
===================================================================
--- trunk/libjhlabs-filters-java/debian/control	2011-03-05 17:39:11 UTC (rev 13385)
+++ trunk/libjhlabs-filters-java/debian/control	2011-03-05 23:11:10 UTC (rev 13386)
@@ -2,18 +2,16 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Varun Hiremath <varun at debian.org>
-Build-Depends: cdbs, debhelper (>= 7)
-Build-Depends-Indep: ant, default-jdk
-Standards-Version: 3.8.4
+Uploaders: Varun Hiremath <varun at debian.org>, Damien Raude-Morvan <drazzib at debian.org>
+Build-Depends: debhelper (>= 7.0.50~), javahelper, default-jdk, maven-repo-helper
+Standards-Version: 3.9.1
 Homepage: http://www.jhlabs.com/ip/filters/index.html
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjhlabs-filters-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjhlabs-filters-java
 
 Package: libjhlabs-filters-java
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre | java2-runtime
-Suggests: java-virtual-machine
+Depends: ${misc:Depends}, ${java:Depends}
 Description: Java Image Processing Filters
  Jhlabs filters is a collection of large number of Java Image
  filters. The filters are all standard Java BufferedImageOps and can

Modified: trunk/libjhlabs-filters-java/debian/copyright
===================================================================
--- trunk/libjhlabs-filters-java/debian/copyright	2011-03-05 17:39:11 UTC (rev 13385)
+++ trunk/libjhlabs-filters-java/debian/copyright	2011-03-05 23:11:10 UTC (rev 13386)
@@ -1,8 +1,7 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=19
-Name: jhlabs-filters
-Maintainer: Varun Hiremath <varun at debian.org>
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
+Upstream-Name: jhlabs-filters
+Upstream-Contact: Jerry Huxtable
 Source: http://ftp.us.xemacs.org/pub/mirrors/maven2/com/jhlabs/filters/
-X-Upstream-Authors: Jerry Huxtable
 
 Files: *
 Copyright: © 2006 Jerry Huxtable
@@ -10,6 +9,7 @@
 
 Files: debian/*
 Copyright: © 2009 Varun Hiremath <varun at debian.org>
+Copyright: © 2011 Damien Raude-Morvan <drazzib at debian.org>
 License: Apache-2.0
 
 License: Apache-2.0

Deleted: trunk/libjhlabs-filters-java/debian/docs
===================================================================
--- trunk/libjhlabs-filters-java/debian/docs	2011-03-05 17:39:11 UTC (rev 13385)
+++ trunk/libjhlabs-filters-java/debian/docs	2011-03-05 23:11:10 UTC (rev 13386)
@@ -1 +0,0 @@
-apidocs

Added: trunk/libjhlabs-filters-java/debian/javabuild
===================================================================
--- trunk/libjhlabs-filters-java/debian/javabuild	                        (rev 0)
+++ trunk/libjhlabs-filters-java/debian/javabuild	2011-03-05 23:11:10 UTC (rev 13386)
@@ -0,0 +1 @@
+jhlabs-filters.jar com

Added: trunk/libjhlabs-filters-java/debian/javadoc
===================================================================
--- trunk/libjhlabs-filters-java/debian/javadoc	                        (rev 0)
+++ trunk/libjhlabs-filters-java/debian/javadoc	2011-03-05 23:11:10 UTC (rev 13386)
@@ -0,0 +1 @@
+internal

Added: trunk/libjhlabs-filters-java/debian/pom.xml
===================================================================
--- trunk/libjhlabs-filters-java/debian/pom.xml	                        (rev 0)
+++ trunk/libjhlabs-filters-java/debian/pom.xml	2011-03-05 23:11:10 UTC (rev 13386)
@@ -0,0 +1,17 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 
+  <modelVersion>4.0.0</modelVersion> 
+  <groupId>com.jhlabs</groupId> 
+  <artifactId>filters</artifactId> 
+  <packaging>jar</packaging> 
+  <version>2.0.235</version> 
+  <name>JHLabs Image Processing Filters</name> 
+  <description>A collection of image processing filters.</description> 
+  <url>http://www.jhlabs.com/ip/index.html</url> 
+  <licenses> 
+    <license> 
+        <name>Apache License, Version 2.0</name> 
+        <url>http://www.apache.org/licenses/LICENSE-2.0</url> 
+    </license> 
+  </licenses> 
+</project>

Modified: trunk/libjhlabs-filters-java/debian/rules
===================================================================
--- trunk/libjhlabs-filters-java/debian/rules	2011-03-05 17:39:11 UTC (rev 13385)
+++ trunk/libjhlabs-filters-java/debian/rules	2011-03-05 23:11:10 UTC (rev 13386)
@@ -1,15 +1,11 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
+%:
+	dh $@ --with javahelper
 
-JAVA_HOME		:= /usr/lib/jvm/default-java
-DEB_ANT_BUILD_TARGET	:= jar javadoc
-DEB_ANT_BUILDFILE	:= debian/build.xml
+override_dh_auto_install:
+	mh_installpom -plibjhlabs-filters-java debian/pom.xml
+	mh_installjar -plibjhlabs-filters-java -l -njhlabs-filters debian/pom.xml jhlabs-filters.jar
 
-install/libjhlabs-filters-java::
-	install -m 644 -D jhlabs-filters.jar $(DEB_DESTDIR)/usr/share/java/jhlabs-filters-$(DEB_UPSTREAM_VERSION).jar
-	dh_link /usr/share/java/jhlabs-filters-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jhlabs-filters.jar
-
 get-orig-source:
 	-uscan --force-download

Modified: trunk/libjhlabs-filters-java/debian/watch
===================================================================
--- trunk/libjhlabs-filters-java/debian/watch	2011-03-05 17:39:11 UTC (rev 13385)
+++ trunk/libjhlabs-filters-java/debian/watch	2011-03-05 23:11:10 UTC (rev 13386)
@@ -1,3 +1,3 @@
 version=3
-http://ftp.us.xemacs.org/pub/mirrors/maven2/com/jhlabs/filters/([\d\.]+)/filters-([\d\.]+)-sources.jar \
+http://repo1.maven.org/maven2/com/jhlabs/filters/([\d][\d\.]+)/filters-([\d\.]+)-sources.jar \
   debian debian/orig-tar.sh

More information about the pkg-java-commits mailing list