[SCM] Openide utilities library branch, master, updated. debian/6.7.1-1-19-gbdf2378
Giovanni Mascellani
gmascellani-guest at alioth.debian.org
Wed Nov 25 14:16:03 UTC 2009
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Openide utilities library".
The branch, master has been updated
via bdf2378006cfcb33537ab18f6a8f01651fc82315 (commit)
via 88eda6a7f6e93ac964f61186d1ea3978c6f7dc79 (commit)
via 535330186467f4fb2aa8b774260e06f06bab9adf (commit)
via 9603ff966a86df6edeeec9bb8d34529b0b074346 (commit)
from 93e09b6192823930891a4bbfb2c369921b82a782 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit bdf2378006cfcb33537ab18f6a8f01651fc82315
Merge: 88eda6a7f6e93ac964f61186d1ea3978c6f7dc79 9603ff966a86df6edeeec9bb8d34529b0b074346 535330186467f4fb2aa8b774260e06f06bab9adf
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Wed Nov 25 15:15:02 2009 +0100
Merge branches 'debian', 'patch/javadoc' and 'patch/build.xml'
commit 88eda6a7f6e93ac964f61186d1ea3978c6f7dc79
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Wed Nov 25 15:14:22 2009 +0100
Debian branch polished
commit 535330186467f4fb2aa8b774260e06f06bab9adf
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Wed Nov 25 15:12:23 2009 +0100
build.xml patch branch polished
commit 9603ff966a86df6edeeec9bb8d34529b0b074346
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Wed Nov 25 15:09:58 2009 +0100
Javadoc patch branch created
-----------------------------------------------------------------------
Summary of changes:
build.xml | 33 ++-------------------------------
debian/README.Debian | 8 --------
debian/README.source | 10 ----------
debian/changelog | 15 ---------------
debian/compat | 1 -
debian/control | 25 -------------------------
debian/copyright | 17 -----------------
debian/doc-base | 7 -------
debian/docs | 1 -
debian/gbp.conf | 7 -------
debian/pom.xml | 12 ------------
debian/rules | 11 -----------
debian/watch | 2 --
src/org/openide/util/package.html | 2 +-
14 files changed, 3 insertions(+), 148 deletions(-)
diff --git a/build.xml b/build.xml
index ea5241d..aaa1376 100644
--- a/build.xml
+++ b/build.xml
@@ -41,37 +41,8 @@ Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-->
-<project name="openide.util" default="dist" basedir=".">
+<project name="openide.util" default="netbeans" basedir=".">
- <path id="classpath">
- </path>
-
- <target name="init">
- <mkdir dir="build"/>
- <mkdir dir="dist"/>
- </target>
-
- <target name="clean">
- <delete dir="build"/>
- <delete dir="dist"/>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="src" classpathref="classpath" destdir="build"
- target="1.5" source="1.5" debug="on" encoding="UTF-8">
- </javac>
- </target>
-
- <target name="javadoc" depends="init">
- <mkdir dir="dist/docs"/>
- <javadoc sourcepath="src" destdir="dist/docs"/>
- </target>
-
- <target name="dist" depends="compile, javadoc">
- <copy todir="build/META-INF">
- <fileset dir="src/META-INF"/>
- </copy>
- <jar destfile="dist/openide-util.jar" basedir="build" manifest="manifest.mf"/>
- </target>
+ <import file="../nbbuild/templates/projectized.xml"/>
</project>
diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index a07f081..0000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,8 +0,0 @@
-openide-util for Debian
------------------------
-
-This package should be part of the netbeans packaging. Because at the moment
-netbeans is not maintained in Debian, this library has been independently packaged
-in order to be available for other packages as a slender dependency.
-
- -- Giovanni Mascellani <mascellani at poisson.phc.unipi.it> Fri, 13 Nov 2009 23:40:45 +0100
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 171ec6a..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,10 +0,0 @@
-openide-util for Debian
------------------------
-
-The source tarball for openide-util just a copy of the openide.util directory
-from the Netbeans IDE source .zip.
-
-It can be downloaded from:
-
-http://netbeans.org/downloads/zip.html
-
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index f6e544a..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,15 +0,0 @@
-openide-util (6.7.1-2) unstable; urgency=low
-
- * Custom POM added
- * Adding javadoc documentation (also to doc-base)
- * debian/control: long description fixed (closes: #557308)
- * debian/README.source: link added
- * debian/control: link to old homepage removed
-
- -- Giovanni Mascellani <mascellani at poisson.phc.unipi.it> Tue, 24 Nov 2009 17:03:07 +0100
-
-openide-util (6.7.1-1) unstable; urgency=low
-
- * Initial release (Closes: #556169)
-
- -- Giovanni Mascellani <mascellani at poisson.phc.unipi.it> Fri, 13 Nov 2009 23:40:45 +0100
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 7f8f011..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/debian/control b/debian/control
deleted file mode 100644
index 84c4bf3..0000000
--- a/debian/control
+++ /dev/null
@@ -1,25 +0,0 @@
-Source: openide-util
-Section: java
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
-Build-Depends: cdbs, debhelper (>= 7), ant
-Build-Depends-Indep: openjdk-6-jdk | default-jdk, maven-repo-helper
-Standards-Version: 3.8.3
-Vcs-Git: git://git.debian.org/git/pkg-java/openide-util.git
-Vcs-Browser: http://git.debian.org/?p=pkg-java/openide-util.git
-
-Package: libopenide-util-java
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre | java2-runtime
-Description: OpenIde utility library
- OpenIde util is a collection of miscellaneous libraries from Netbeans, a
- powerful IDE for many languages. Some of the capabilities are:
- * Register and then lookup instances of services;
- * Manage pools of thread workers, in order to do asynchronous
- computations;
- * Provide enhanced support for manipulation of Enumeration objects;
- * Other tools, mainly related with Netbeans software.
- .
- These libraries are independently packaged in order to be used by other
- independent software as well.
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index a3c380d..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,17 +0,0 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: Openide utilities library
-Maintainer: Sun Microsystems, Inc.
-Source: http://openide.netbeans.org/
-
-Files: *
-Copyright: © 1997 - 2009 Sun Microsystems, Inc.
-License: CDDL | GPL-2
- On Debian GNU/Linux system you can find the complete text of the
- GPL-2 license in '/usr/share/common-licenses/GPL-2'. The text of
- the CDDL license can be found at http://www.sun.com/cddl/cddl.html.
-
-Files: debian/*
-Copyright: © 2009 Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
-License: GPL-3+
- On Debian GNU/Linux system you can find the complete text of the
- GPL-3 license in '/usr/share/common-licenses/GPL-3'
diff --git a/debian/doc-base b/debian/doc-base
deleted file mode 100644
index 1a85506..0000000
--- a/debian/doc-base
+++ /dev/null
@@ -1,7 +0,0 @@
-Document: openide-util-javadoc
-Title: OpenIDE util Javadoc documentation
-Section: Programming/Java
-
-Format: HTML
-Index: /usr/share/doc/libopenide-util-java/docs/index.html
-Files: /usr/share/doc/libopenide-util-java/docs/*.html
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 47e50e0..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-dist/docs
diff --git a/debian/gbp.conf b/debian/gbp.conf
deleted file mode 100644
index 7c036eb..0000000
--- a/debian/gbp.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-
-[DEFAULT]
-cleaner = fakeroot debian/rules clean
-upstream-branch = upstream
-debian-branch = master
-pristine-tar = True
-
diff --git a/debian/pom.xml b/debian/pom.xml
deleted file mode 100644
index 3a996c6..0000000
--- a/debian/pom.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.netbeans</groupId>
- <artifactId>openide-util</artifactId>
- <version>6.7.1</version>
- <packaging>jar</packaging>
-
- <name>OpenIde utility library</name>
- <description>OpenIde util is a collection of miscellaneous libraries from
- Netbeans, a powerful IDE for many languages.</description>
-</project>
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index fedfafc..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
-
-install/libopenide-util-java::
- mh_installjar -plibopenide-util-java -l debian/pom.xml dist/openide-util.jar
- mh_installpom -plibopenide-util-java debian/pom.xml
-
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index be5a348..0000000
--- a/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-# Watch file missing, because this package is part of a larger suite (netbeans)
-# and it's not distributed independently.
diff --git a/src/org/openide/util/package.html b/src/org/openide/util/package.html
index b3b42a7..5a7b628 100644
--- a/src/org/openide/util/package.html
+++ b/src/org/openide/util/package.html
@@ -44,7 +44,7 @@
A set of
-<a href="doc-files/api.html">utility classes</a>
+<a href="http://top/org/openide/util/doc-files/api.html">utility classes</a>
covering a few general infrastructure points in the Open APIs.
hooks/post-receive
--
Openide utilities library
More information about the pkg-java-commits
mailing list