This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository eigenbase-resgen.
commit cb158dc440a49b3cc2b1c9747d2eb1a965d0d569 Author: Damien Raude-Morvan <[email protected]> Date: Sun Dec 13 15:35:00 2009 +0000 Add javadoc links --- debian/README.source | 8 ++++++++ debian/changelog | 4 ++-- debian/control | 6 ++++-- debian/copyright | 9 +++++---- debian/install | 2 -- debian/patches/javadoc.diff | 18 ++++++++++++++++++ debian/patches/series | 1 + debian/rules | 9 +++++++++ 8 files changed, 47 insertions(+), 10 deletions(-) diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..15f8be5 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,8 @@ +Patch System +============ + +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +See /usr/share/doc/quilt/README.source for a detailed explanation. diff --git a/debian/changelog b/debian/changelog index 5291e5d..f7a8ce4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -eigenbase-resgen (1.3.0.11875-1) UNRELEASED; urgency=low +eigenbase-resgen (1.3.0.11875-1) unstable; urgency=low * Initial release. (Closes: #560237) - -- Damien Raude-Morvan <[email protected]> Sun, 06 Dec 2009 02:13:36 +0100 + -- Damien Raude-Morvan <[email protected]> Sun, 13 Dec 2009 16:16:07 +0100 diff --git a/debian/control b/debian/control index 56e42ce..a593334 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,9 @@ Source: eigenbase-resgen Section: java Priority: optional Maintainer: Damien Raude-Morvan <[email protected]> -Build-Depends: cdbs, debhelper (>= 7), default-jdk, ant -Build-Depends-Indep: libxerces2-java, junit, libeigenbase-resgen-java +Build-Depends: cdbs, debhelper (>= 7), default-jdk, ant, quilt +Build-Depends-Indep: libxerces2-java, junit, libeigenbase-resgen-java, + default-jdk-doc, junit-doc Standards-Version: 3.8.3 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/eigenbase-resgen Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/eigenbase-resgen @@ -24,6 +25,7 @@ Package: libeigenbase-resgen-java-doc Architecture: all Section: doc Depends: ${misc:Depends} +Recommends: default-jdk-doc, junit-doc Suggests: libeigenbase-resgen-java Description: Java i18n code generator from XML files - documentation Eigenbase Resource Generator helps you build and maintain internationalized diff --git a/debian/copyright b/debian/copyright index 4101afe..6eb6ab9 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,10 +4,11 @@ Maintainer: Julian Hyde <[email protected]> Source: http://eigenbase.sourceforge.net/download.html Files: * -Copyright: Copyright (C) 2005-2005 The Eigenbase Project -Copyright: Copyright (C) 2005-2005 Disruptive Tech -Copyright: Copyright (C) 2005-2005 LucidEra, Inc. -Copyright: Copyright (C) 2001-2005 Kana Software, Inc. and others. +Copyright: Copyright (C) 2005-2008 The Eigenbase Project +Copyright: Copyright (C) 2005-2008 Disruptive Tech +Copyright: Copyright (C) 2005-2008 LucidEra, Inc. +Copyright: Copyright (C) 2005-2008 Red Square, Inc. +Copyright: Copyright (C) 2000-2008 Kana Software, Inc. License: LGPL-2.1+ Files: debian/* diff --git a/debian/install b/debian/install deleted file mode 100644 index f77d6a3..0000000 --- a/debian/install +++ /dev/null @@ -1,2 +0,0 @@ -lib/eigenbase-resgen.jar usr/share/java -lib/eigenbase-xom.jar usr/share/java diff --git a/debian/patches/javadoc.diff b/debian/patches/javadoc.diff new file mode 100644 index 0000000..8f291ff --- /dev/null +++ b/debian/patches/javadoc.diff @@ -0,0 +1,18 @@ +Description: Fix link of Javadoc HTML documentation + to use local API from /usr/share/doc/ +Author: Damien Raude-Morvan <[email protected]> +Last-Update: 2009-12-13 +Forwarded: not-needed +--- a/build.xml ++++ b/build.xml +@@ -204,8 +204,8 @@ + <packageset dir="${src.dir}"> + <include name="**"/> + </packageset> +- <link href="http://java.sun.com/j2se/1.5.0/docs/api"/> +- <link href="http://www.junit.org/junit/javadoc/3.8.1"/> ++ <link href="/usr/share/doc/default-jdk-doc/api/"/> ++ <link href="/usr/share/doc/junit-doc/doc/api/"/> + </javadoc> + <copy file="${src.dir}/org/eigenbase/xom/Meta.xml" + todir="${javadoc.dir}/org/eigenbase/xom"/> diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..016aa02 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +javadoc.diff diff --git a/debian/rules b/debian/rules index d80f8e8..a244a3d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/class/ant.mk JAVA_HOME := /usr/lib/jvm/default-java @@ -10,5 +11,13 @@ DEB_JARS := xercesImpl junit eigenbase-resgen eigenbase-xom DEB_ANT_BUILD_TARGET := cleanBuild DEB_ANT_CLEAN_TARGET := clean +binary-post-install/libeigenbase-resgen-java:: + mv lib/eigenbase-resgen.jar lib/eigenbase-resgen-$(DEB_UPSTREAM_VERSION).jar + dh_install -plibeigenbase-resgen-java lib/eigenbase-resgen-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/ + dh_link -plibeigenbase-resgen-java /usr/share/java/eigenbase-resgen-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/eigenbase-resgen.jar + mv lib/eigenbase-xom.jar lib/eigenbase-xom-$(DEB_UPSTREAM_VERSION).jar + dh_install -plibeigenbase-resgen-java lib/eigenbase-xom-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/ + dh_link -plibeigenbase-resgen-java /usr/share/java/eigenbase-xom-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/eigenbase-xom.jar + get-orig-source: uscan --force-download -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eigenbase-resgen.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
