[pkg-java] r12022 - in trunk/ognl/debian: . source

Damien Raude-Morvan drazzib at alioth.debian.org
Mon Apr 5 21:58:58 UTC 2010 

Author: drazzib
Date: 2010-04-05 21:58:48 +0000 (Mon, 05 Apr 2010)
New Revision: 12022

Added:
   trunk/ognl/debian/libognl-java-doc.install
   trunk/ognl/debian/source/
   trunk/ognl/debian/source/format
Removed:
   trunk/ognl/debian/README.source
   trunk/ognl/debian/libognl-java-doc.docs
Modified:
   trunk/ognl/debian/changelog
   trunk/ognl/debian/control
   trunk/ognl/debian/libognl-java-doc.doc-base.api
   trunk/ognl/debian/libognl-java-doc.doc-base.dev
   trunk/ognl/debian/libognl-java-doc.doc-base.lang
   trunk/ognl/debian/rules
Log:
* 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

Deleted: trunk/ognl/debian/README.source
===================================================================
--- trunk/ognl/debian/README.source	2010-04-05 21:57:39 UTC (rev 12021)
+++ trunk/ognl/debian/README.source	2010-04-05 21:58:48 UTC (rev 12022)
@@ -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.

Modified: trunk/ognl/debian/changelog
===================================================================
--- trunk/ognl/debian/changelog	2010-04-05 21:57:39 UTC (rev 12021)
+++ trunk/ognl/debian/changelog	2010-04-05 21:58:48 UTC (rev 12022)
@@ -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 <drazzib at debian.org>  Mon, 05 Apr 2010 23:56:52 +0200
+
 ognl (2.7.3-2) unstable; urgency=low
 
   * Maven POMs:

Modified: trunk/ognl/debian/control
===================================================================
--- trunk/ognl/debian/control	2010-04-05 21:57:39 UTC (rev 12021)
+++ trunk/ognl/debian/control	2010-04-05 21:58:48 UTC (rev 12022)
@@ -3,10 +3,10 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Trygve Laugstøl <trygvis at inamo.no>, Damien Raude-Morvan <drazzib at debian.org>
-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

Modified: trunk/ognl/debian/libognl-java-doc.doc-base.api
===================================================================
--- trunk/ognl/debian/libognl-java-doc.doc-base.api	2010-04-05 21:57:39 UTC (rev 12021)
+++ trunk/ognl/debian/libognl-java-doc.doc-base.api	2010-04-05 21:58:48 UTC (rev 12022)
@@ -5,6 +5,6 @@
 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/*
 

Modified: trunk/ognl/debian/libognl-java-doc.doc-base.dev
===================================================================
--- trunk/ognl/debian/libognl-java-doc.doc-base.dev	2010-04-05 21:57:39 UTC (rev 12021)
+++ trunk/ognl/debian/libognl-java-doc.doc-base.dev	2010-04-05 21:58:48 UTC (rev 12022)
@@ -5,8 +5,8 @@
 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

Modified: trunk/ognl/debian/libognl-java-doc.doc-base.lang
===================================================================
--- trunk/ognl/debian/libognl-java-doc.doc-base.lang	2010-04-05 21:57:39 UTC (rev 12021)
+++ trunk/ognl/debian/libognl-java-doc.doc-base.lang	2010-04-05 21:58:48 UTC (rev 12022)
@@ -5,8 +5,8 @@
 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

Deleted: trunk/ognl/debian/libognl-java-doc.docs
===================================================================
--- trunk/ognl/debian/libognl-java-doc.docs	2010-04-05 21:57:39 UTC (rev 12021)
+++ trunk/ognl/debian/libognl-java-doc.docs	2010-04-05 21:58:48 UTC (rev 12022)
@@ -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

Copied: trunk/ognl/debian/libognl-java-doc.install (from rev 11983, trunk/ognl/debian/libognl-java-doc.docs)
===================================================================
--- trunk/ognl/debian/libognl-java-doc.install	                        (rev 0)
+++ trunk/ognl/debian/libognl-java-doc.install	2010-04-05 21:58:48 UTC (rev 12022)
@@ -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/

Modified: trunk/ognl/debian/rules
===================================================================
--- trunk/ognl/debian/rules	2010-04-05 21:57:39 UTC (rev 12021)
+++ trunk/ognl/debian/rules	2010-04-05 21:58:48 UTC (rev 12022)
@@ -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

Added: trunk/ognl/debian/source/format
===================================================================
--- trunk/ognl/debian/source/format	                        (rev 0)
+++ trunk/ognl/debian/source/format	2010-04-05 21:58:48 UTC (rev 12022)
@@ -0,0 +1 @@
+3.0 (quilt)

More information about the pkg-java-commits mailing list