[pkg-java] r17820 - in trunk/libjgrapht-java/branch_0.8/debian: . patches

Sun Mar 2 02:10:37 UTC 2014

Author: tmancill
Date: 2014-03-02 02:10:37 +0000 (Sun, 02 Mar 2014)
New Revision: 17820

Added:
   trunk/libjgrapht-java/branch_0.8/debian/libjgrapht0.8-java.poms
   trunk/libjgrapht-java/branch_0.8/debian/patches/
   trunk/libjgrapht-java/branch_0.8/debian/patches/disable_external_icons.patch
   trunk/libjgrapht-java/branch_0.8/debian/patches/series
   trunk/libjgrapht-java/branch_0.8/debian/pom.xml
Modified:
   trunk/libjgrapht-java/branch_0.8/debian/changelog
   trunk/libjgrapht-java/branch_0.8/debian/compat
   trunk/libjgrapht-java/branch_0.8/debian/control
   trunk/libjgrapht-java/branch_0.8/debian/rules
Log:
add maven artifacts (#740360)

add patch to disable fetching icons in README.html
general package freshening


Modified: trunk/libjgrapht-java/branch_0.8/debian/changelog
===================================================================

--- trunk/libjgrapht-java/branch_0.8/debian/changelog	2014-02-27 23:11:44 UTC (rev 17819)
+++ trunk/libjgrapht-java/branch_0.8/debian/changelog	2014-03-02 02:10:37 UTC (rev 17820)
@@ -1,3 +1,15 @@
+libjgrapht0.8-java (0.8.3-4) unstable; urgency=medium
+
+  * Team upload.
+  * Add maven artifacts (Closes: #740360)
+    - Thanks to Matthew Vernon.
+  * Bump Standards-Version to 3.9.5 (no changes required).
+  * Bump dependency to DH 9.
+  * Disable fetching of remote icons in README.html.
+    This addresses a lintian error regarding user privacy.
+
+ -- tony mancill <tmancill at debian.org>  Sat, 01 Mar 2014 15:42:59 -0800
+
 libjgrapht0.8-java (0.8.3-3) unstable; urgency=low
 
   * Upload to unstable.

Modified: trunk/libjgrapht-java/branch_0.8/debian/compat
===================================================================
--- trunk/libjgrapht-java/branch_0.8/debian/compat	2014-02-27 23:11:44 UTC (rev 17819)
+++ trunk/libjgrapht-java/branch_0.8/debian/compat	2014-03-02 02:10:37 UTC (rev 17820)
@@ -1 +1 @@
-5
+9

Modified: trunk/libjgrapht-java/branch_0.8/debian/control
===================================================================
--- trunk/libjgrapht-java/branch_0.8/debian/control	2014-02-27 23:11:44 UTC (rev 17819)
+++ trunk/libjgrapht-java/branch_0.8/debian/control	2014-03-02 02:10:37 UTC (rev 17820)
@@ -3,9 +3,10 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Giovanni Mascellani <gio at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), ant, default-jdk, junit4,
+Build-Depends: cdbs, debhelper (>= 9), ant, default-jdk, junit4,
  libjgraph-java, javahelper
-Standards-Version: 3.9.4
+Build-Depends-Indep: maven-repo-helper
+Standards-Version: 3.9.5
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libjgrapht-java/branch_0.8
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libjgrapht-java/branch_0.8
 Homepage: http://jgrapht.sourceforge.net/

Added: trunk/libjgrapht-java/branch_0.8/debian/libjgrapht0.8-java.poms
===================================================================
--- trunk/libjgrapht-java/branch_0.8/debian/libjgrapht0.8-java.poms	                        (rev 0)
+++ trunk/libjgrapht-java/branch_0.8/debian/libjgrapht0.8-java.poms	2014-03-02 02:10:37 UTC (rev 17820)
@@ -0,0 +1,28 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+#   --ignore: ignore this POM and its artifact if any
+#   --ignore-pom: don't install the POM. To use on POM files that are created
+#     temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+#   --no-parent: remove the <parent> tag from the POM
+#   --package=<package>: an alternative package to use when installing this POM
+#      and its artifact
+#   --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+#      of the version for the package.
+#   --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+#      during a clean operation with mh_cleanpom or mh_installpom
+#   --artifact=<path>: path to the build artifact associated with this POM,
+#      it will be installed when using the command mh_install. [mh_install]
+#   --java-lib: install the jar into /usr/share/java to comply with Debian
+#      packaging guidelines
+#   --usj-name=<name>: name to use when installing the library in /usr/share/java
+#   --usj-version=<version>: version to use when installing the library in /usr/share/java
+#   --no-usj-versionless: don't install the versionless link in /usr/share/java
+#   --dest-jar=<path>: the destination for the real jar.
+#     It will be installed with mh_install. [mh_install]
+#   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+#   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+#     Empty by default. [mh_install]
+#
+debian/pom.xml --has-package-version

Added: trunk/libjgrapht-java/branch_0.8/debian/patches/disable_external_icons.patch
===================================================================
--- trunk/libjgrapht-java/branch_0.8/debian/patches/disable_external_icons.patch	                        (rev 0)
+++ trunk/libjgrapht-java/branch_0.8/debian/patches/disable_external_icons.patch	2014-03-02 02:10:37 UTC (rev 17820)
@@ -0,0 +1,22 @@
+diff --git a/README.html b/README.html
+index 3e50b23..15770e7 100644
+--- a/README.html
++++ b/README.html
+@@ -638,17 +638,10 @@
+   <table border="0" cellpadding="0" cellspacing="0" style=
+   "border-collapse: collapse" width="100%">
+     <tr>
+-      <td width="10%" align="left"><a href=
+-      "http://validator.w3.org/check/referer"><img src=
+-      "http://www.w3.org/Icons/valid-html401" border="0" alt="Valid HTML 4.01!"
+-      height="31" width="88"></a></td>
+ 
+       <td width="80%" align="center"><small>© Copyright 2003-2008, by Barak
+       Naveh and Contributors. All rights reserved.</small></td>
+ 
+-      <td width="10%" align="right">
+-<a href="http://sourceforge.net/projects/jgrapht"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=86459&type=12" width="120" height="30" border="0" alt="Get JGraphT at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a>
+-</td>
+     </tr>
+   </table><br>
+ </body>

Added: trunk/libjgrapht-java/branch_0.8/debian/patches/series
===================================================================
--- trunk/libjgrapht-java/branch_0.8/debian/patches/series	                        (rev 0)
+++ trunk/libjgrapht-java/branch_0.8/debian/patches/series	2014-03-02 02:10:37 UTC (rev 17820)
@@ -0,0 +1 @@
+disable_external_icons.patch

Added: trunk/libjgrapht-java/branch_0.8/debian/pom.xml
===================================================================
--- trunk/libjgrapht-java/branch_0.8/debian/pom.xml	                        (rev 0)
+++ trunk/libjgrapht-java/branch_0.8/debian/pom.xml	2014-03-02 02:10:37 UTC (rev 17820)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.jgrapht</groupId>
+	<artifactId>jgrapht</artifactId>
+	<packaging>pom</packaging>
+	<name>JGraphT - Parent</name>
+	<version>0.8</version>
+	<description>A Java class library for graph-theory data structures and algorithms.</description>
+	<url>http://www.jgrapht.org</url>
+	<licenses>
+		<license>
+			<name>GNU Lesser General Public License Version 2.1, February 1999</name>
+			<url>http://jgrapht.sourceforge.net/LGPL.html</url>
+			<distribution>repo</distribution>
+		</license>
+		<license>
+			<name>Eclipse Public License (EPL) 1.0</name>
+			<url>http://www.eclipse.org/legal/epl-v10.html</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+</project>

Modified: trunk/libjgrapht-java/branch_0.8/debian/rules
===================================================================
--- trunk/libjgrapht-java/branch_0.8/debian/rules	2014-02-27 23:11:44 UTC (rev 17819)
+++ trunk/libjgrapht-java/branch_0.8/debian/rules	2014-03-02 02:10:37 UTC (rev 17820)
@@ -11,13 +11,23 @@
 
 DEB_JARS := /usr/share/java/jgraph.jar
 
-SOVERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | cut -f 1,2 -d. )
+SOVERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | cut -f 1,2 -d.)
 
 ANT_ARGS := -Dproject.jar=debian/libjgrapht$(SOVERSION)-java/usr/share/java/jgrapht-$(DEB_UPSTREAM_VERSION).jar -Djavadoc.dir=debian/libjgrapht$(SOVERSION)-java-doc/usr/share/doc/libjgrapht$(SOVERSION)-java/apidoc
 
 install/libjgrapht$(SOVERSION)-java::
-	dh_link -plibjgrapht$(SOVERSION)-java /usr/share/java/jgrapht-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jgrapht$(SOVERSION).jar
 	jh_classpath -c"$(DEB_JARS)" debian/libjgrapht$(SOVERSION)-java/usr/share/java/jgrapht-$(DEB_UPSTREAM_VERSION).jar
 
 get-orig-source:
 	uscan --force-download --download-version $(DEB_UPSTREAM_VERSION) --rename
+
+binary-post-install/$(DEB_SOURCE_PACKAGE)::
+	mh_installpoms -p$(DEB_SOURCE_PACKAGE)
+	mh_installjar -p$(DEB_SOURCE_PACKAGE) -l debian/pom.xml \
+          --usj-version=0.8.3 \
+          --no-usj-versionless \
+	  debian/libjgrapht$(SOVERSION)-java/usr/share/java/jgrapht-$(DEB_UPSTREAM_VERSION).jar
+	dh_link -plibjgrapht$(SOVERSION)-java /usr/share/java/jgrapht-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jgrapht$(SOVERSION).jar
+
+clean::
+	mh_clean


