This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository ognl.
commit 02119efc62e0ce4d761d327c7be40e06b079e518 Author: Damien Raude-Morvan <[email protected]> Date: Mon Apr 5 21:58:48 2010 +0000 * libognl-java-doc: Install doc inside /usr/share/doc/libognl-java/ * Bump Standards-Version to 3.8.4: no changes needed * Switch to 3.0 (quilt) source format - debian/control: remove B-D on quilt - debian/rules: remove quilt.mk - debian/source/format: add format - debian/README.source: removed --- debian/README.source | 5 ----- debian/changelog | 12 ++++++++++++ debian/control | 4 ++-- debian/libognl-java-doc.doc-base.api | 4 ++-- debian/libognl-java-doc.doc-base.dev | 6 +++--- debian/libognl-java-doc.doc-base.lang | 6 +++--- debian/libognl-java-doc.docs | 5 ----- debian/libognl-java-doc.install | 5 +++++ debian/rules | 1 - debian/source/format | 1 + 10 files changed, 28 insertions(+), 21 deletions(-) diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index 76d29b5..0000000 --- a/debian/README.source +++ /dev/null @@ -1,5 +0,0 @@ -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 5797fc1..c1a9f01 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +ognl (2.7.3-3) unstable; urgency=low + + * libognl-java-doc: Install doc inside /usr/share/doc/libognl-java/ + * Bump Standards-Version to 3.8.4: no changes needed + * Switch to 3.0 (quilt) source format + - debian/control: remove B-D on quilt + - debian/rules: remove quilt.mk + - debian/source/format: add format + - debian/README.source: removed + + -- Damien Raude-Morvan <[email protected]> Mon, 05 Apr 2010 23:56:52 +0200 + ognl (2.7.3-2) unstable; urgency=low * Maven POMs: diff --git a/debian/control b/debian/control index febfef6..37397f1 100644 --- a/debian/control +++ b/debian/control @@ -3,10 +3,10 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Trygve Laugstøl <[email protected]>, Damien Raude-Morvan <[email protected]> -Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant, quilt +Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant Build-Depends-Indep: libjavassist-java, junit4, docbook-xsl, docbook-xml, ant-optional, libxalan2-java, javacc, fop, maven-repo-helper -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Homepage: http://www.opensymphony.com/ognl/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/ognl Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/ognl diff --git a/debian/libognl-java-doc.doc-base.api b/debian/libognl-java-doc.doc-base.api index 1838768..e50f29c 100644 --- a/debian/libognl-java-doc.doc-base.api +++ b/debian/libognl-java-doc.doc-base.api @@ -5,6 +5,6 @@ Abstract: This is the API Javadoc provided by the OGNL library. Section: Programming Format: HTML -Index: /usr/share/doc/libognl-java-doc/api/index.html -Files: /usr/share/doc/libognl-java-doc/api/* +Index: /usr/share/doc/libognl-java/api/index.html +Files: /usr/share/doc/libognl-java/api/* diff --git a/debian/libognl-java-doc.doc-base.dev b/debian/libognl-java-doc.doc-base.dev index 1d51de7..7118870 100644 --- a/debian/libognl-java-doc.doc-base.dev +++ b/debian/libognl-java-doc.doc-base.dev @@ -5,8 +5,8 @@ Abstract: This is the Developer Guide provided by the OGNL library. Section: Programming Format: HTML -Index: /usr/share/doc/libognl-java-doc/DeveloperGuide/index.html -Files: /usr/share/doc/libognl-java-doc/DeveloperGuide/* +Index: /usr/share/doc/libognl-java/DeveloperGuide/index.html +Files: /usr/share/doc/libognl-java/DeveloperGuide/* Format: PDF -Files: /usr/share/doc/libognl-java-doc/DeveloperGuide.pdf +Files: /usr/share/doc/libognl-java/DeveloperGuide.pdf diff --git a/debian/libognl-java-doc.doc-base.lang b/debian/libognl-java-doc.doc-base.lang index e436b2e..bda00cc 100644 --- a/debian/libognl-java-doc.doc-base.lang +++ b/debian/libognl-java-doc.doc-base.lang @@ -5,8 +5,8 @@ Abstract: This is the Language Guide provided by the OGNL library. Section: Programming Format: HTML -Index: /usr/share/doc/libognl-java-doc/LanguageGuide/index.html -Files: /usr/share/doc/libognl-java-doc/LanguageGuide/* +Index: /usr/share/doc/libognl-java/LanguageGuide/index.html +Files: /usr/share/doc/libognl-java/LanguageGuide/* Format: PDF -Files: /usr/share/doc/libognl-java-doc/LanguageGuide.pdf +Files: /usr/share/doc/libognl-java/LanguageGuide.pdf diff --git a/debian/libognl-java-doc.docs b/debian/libognl-java-doc.docs deleted file mode 100644 index 929dd92..0000000 --- a/debian/libognl-java-doc.docs +++ /dev/null @@ -1,5 +0,0 @@ -dist/docs/html/LanguageGuide -dist/docs/html/DeveloperGuide -dist/docs/pdf/DeveloperGuide.pdf -dist/docs/pdf/LanguageGuide.pdf -dist/docs/api diff --git a/debian/libognl-java-doc.install b/debian/libognl-java-doc.install new file mode 100644 index 0000000..9b080a0 --- /dev/null +++ b/debian/libognl-java-doc.install @@ -0,0 +1,5 @@ +dist/docs/html/LanguageGuide /usr/share/doc/libognl-java/ +dist/docs/html/DeveloperGuide /usr/share/doc/libognl-java/ +dist/docs/pdf/DeveloperGuide.pdf /usr/share/doc/libognl-java/ +dist/docs/pdf/LanguageGuide.pdf /usr/share/doc/libognl-java/ +dist/docs/api /usr/share/doc/libognl-java/ diff --git a/debian/rules b/debian/rules index f6ea945..de7fcce 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,6 @@ #!/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 diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ognl.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
