[pkg-java] r10800 - trunk/logback/debian

Sun Oct 11 16:38:20 UTC 2009

Author: drazzib
Date: 2009-10-11 16:38:20 +0000 (Sun, 11 Oct 2009)
New Revision: 10800

Added:
   trunk/logback/debian/liblogback-java-doc.doc-base.api
   trunk/logback/debian/liblogback-java-doc.doc-base.manual
   trunk/logback/debian/liblogback-java-doc.install
   trunk/logback/debian/liblogback-java.poms
   trunk/logback/debian/maven.rules
Removed:
   trunk/logback/debian/liblogback-java-doc.doc-base
   trunk/logback/debian/liblogback-java-doc.docs
Modified:
   trunk/logback/debian/changelog
   trunk/logback/debian/control
   trunk/logback/debian/copyright
   trunk/logback/debian/rules
Log:
* Bump Standards-Version to 3.8.3 (no changes needed)
* Documentation:
  - Move api documentation to /usr/share/doc/liblogback-java/api/
  - Register Logback manual with doc-base
* Maven POMs:
  - Add a Build-Depends-Indep dependency on maven-repo-helper
  - Use mh_installpoms and mh_installjar to install the POM and the jar to the
   Maven repository

Modified: trunk/logback/debian/changelog
===================================================================

--- trunk/logback/debian/changelog	2009-10-11 15:51:33 UTC (rev 10799)
+++ trunk/logback/debian/changelog	2009-10-11 16:38:20 UTC (rev 10800)
@@ -1,13 +1,20 @@
-logback (0.9.17-1) UNRELEASED; urgency=low
+logback (0.9.17-1) unstable; urgency=low
 
   * New upstream release.
   * Set Maintainer field to Debian Java Team
   * Add myself as Uploaders
   * Build-Depends on default-jdk instead of default-jdk-builddep
     because we don't build a native GCJ package.
-  * Bump Standards-Version to 3.8.2 (no changes needed)
+  * Bump Standards-Version to 3.8.3 (no changes needed)
+  * Documentation:
+    - Move api documentation to /usr/share/doc/liblogback-java/api/
+    - Register Logback manual with doc-base
+  * Maven POMs:
+    - Add a Build-Depends-Indep dependency on maven-repo-helper
+    - Use mh_installpoms and mh_installjar to install the POM and the jar to the
+     Maven repository
 
- -- Damien Raude-Morvan <drazzib at drazzib.com>  Wed, 12 Aug 2009 01:17:47 +0200
+ -- Damien Raude-Morvan <drazzib at debian.org>  Fri, 25 Sep 2009 00:19:01 +0200
 
 logback (0.9.15-1) unstable; urgency=low
 

Modified: trunk/logback/debian/control
===================================================================
--- trunk/logback/debian/control	2009-10-11 15:51:33 UTC (rev 10799)
+++ trunk/logback/debian/control	2009-10-11 16:38:20 UTC (rev 10800)
@@ -1,11 +1,11 @@
 Source: logback
 Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Damien Raude-Morvan <drazzib at drazzib.com>
-Standards-Version: 3.8.2
+Uploaders: Damien Raude-Morvan <drazzib at debian.org>
+Standards-Version: 3.8.3
 Section: java
 Priority: optional
 Build-Depends: default-jdk, ant, debhelper (>= 5), cdbs
-Build-Depends-Indep: janino, glassfish-javaee, libslf4j-java
+Build-Depends-Indep: janino, glassfish-javaee, libslf4j-java, maven-repo-helper
 Homepage: http://logback.qos.ch/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/logback
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/logback

Modified: trunk/logback/debian/copyright
===================================================================
--- trunk/logback/debian/copyright	2009-10-11 15:51:33 UTC (rev 10799)
+++ trunk/logback/debian/copyright	2009-10-11 16:38:20 UTC (rev 10800)
@@ -60,7 +60,7 @@
   of the copyright holder.
 
 Files: debian/*
-Copyright: 2008 Damien Raude-Morvan <drazzib at drazzib.com>
+Copyright: 2008-2009 Damien Raude-Morvan <drazzib at debian.org>
 License: LGPL-2.1+
   On Debian systems the full text of the GNU Lesser General Public License can be found
   in the `/usr/share/common-licenses/LGPL-2.1' file.

Deleted: trunk/logback/debian/liblogback-java-doc.doc-base
===================================================================
--- trunk/logback/debian/liblogback-java-doc.doc-base	2009-10-11 15:51:33 UTC (rev 10799)
+++ trunk/logback/debian/liblogback-java-doc.doc-base	2009-10-11 16:38:20 UTC (rev 10800)
@@ -1,9 +0,0 @@
-Document: liblogback-java-doc
-Title: API Javadoc for Logback
-Author: Logback developers
-Abstract: This is the API Javadoc provided by the Logback library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/liblogback-java-doc/api/index.html
-Files: /usr/share/doc/liblogback-java-doc/api/*

Copied: trunk/logback/debian/liblogback-java-doc.doc-base.api (from rev 10194, trunk/logback/debian/liblogback-java-doc.doc-base)
===================================================================
--- trunk/logback/debian/liblogback-java-doc.doc-base.api	                        (rev 0)
+++ trunk/logback/debian/liblogback-java-doc.doc-base.api	2009-10-11 16:38:20 UTC (rev 10800)
@@ -0,0 +1,9 @@
+Document: liblogback-java-api
+Title: API Javadoc for Logback
+Author: Logback developers
+Abstract: This is the API Javadoc provided by the Logback library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/liblogback-java/api/index.html
+Files: /usr/share/doc/liblogback-java/api/*

Added: trunk/logback/debian/liblogback-java-doc.doc-base.manual
===================================================================
--- trunk/logback/debian/liblogback-java-doc.doc-base.manual	                        (rev 0)
+++ trunk/logback/debian/liblogback-java-doc.doc-base.manual	2009-10-11 16:38:20 UTC (rev 10800)
@@ -0,0 +1,9 @@
+Document: liblogback-java-manual
+Title: Manual for Logback
+Author: Logback developers
+Abstract: This is the Manual provided by the Logback library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/liblogback-java/manual/index.html
+Files: /usr/share/doc/liblogback-java/manual/*

Deleted: trunk/logback/debian/liblogback-java-doc.docs
===================================================================
--- trunk/logback/debian/liblogback-java-doc.docs	2009-10-11 15:51:33 UTC (rev 10799)
+++ trunk/logback/debian/liblogback-java-doc.docs	2009-10-11 16:38:20 UTC (rev 10800)
@@ -1,2 +0,0 @@
-dist/api/
-docs/manual/

Copied: trunk/logback/debian/liblogback-java-doc.install (from rev 10194, trunk/logback/debian/liblogback-java-doc.docs)
===================================================================
--- trunk/logback/debian/liblogback-java-doc.install	                        (rev 0)
+++ trunk/logback/debian/liblogback-java-doc.install	2009-10-11 16:38:20 UTC (rev 10800)
@@ -0,0 +1,2 @@
+dist/api/ /usr/share/doc/liblogback-java/
+docs/manual/ /usr/share/doc/liblogback-java/

Added: trunk/logback/debian/liblogback-java.poms
===================================================================
--- trunk/logback/debian/liblogback-java.poms	                        (rev 0)
+++ trunk/logback/debian/liblogback-java.poms	2009-10-11 16:38:20 UTC (rev 10800)
@@ -0,0 +1,3 @@
+pom.xml
+logback-core/pom.xml
+logback-classic/pom.xml

Added: trunk/logback/debian/maven.rules
===================================================================
--- trunk/logback/debian/maven.rules	                        (rev 0)
+++ trunk/logback/debian/maven.rules	2009-10-11 16:38:20 UTC (rev 10800)
@@ -0,0 +1 @@
+junit junit jar s/3\..*/3.x/

Modified: trunk/logback/debian/rules
===================================================================
--- trunk/logback/debian/rules	2009-10-11 15:51:33 UTC (rev 10799)
+++ trunk/logback/debian/rules	2009-10-11 16:38:20 UTC (rev 10800)
@@ -16,13 +16,13 @@
 DEB_ANT_ARGS         := -Ddeb.package=$(DEB_SOURCE_PACKAGE) -Ddeb.version=$(DEB_UPSTREAM_VERSION)
 
 binary-post-install/liblogback-java::
-	dh_install dist/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)-core.jar usr/share/java
-	dh_install dist/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)-classic.jar usr/share/java
-	#dh_install dist/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)-access.jar usr/share/java
-	dh_link usr/share/java/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)-core.jar usr/share/java/$(DEB_SOURCE_PACKAGE)-core.jar
-	dh_link usr/share/java/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)-classic.jar usr/share/java/$(DEB_SOURCE_PACKAGE)-classic.jar
-	#dh_link usr/share/java/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)-access.jar usr/share/java/$(DEB_SOURCE_PACKAGE)-access.jar
+	mh_installpoms -pliblogback-java
+	mh_installjar -pliblogback-java -l logback-core/pom.xml dist/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)-core.jar
+	mh_installjar -pliblogback-java -l logback-classic/pom.xml dist/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)-classic.jar
 
+clean::
+	-rm -rf debian/tmp
+
 get-orig-source:
 	uscan --force-download
 	mkdir orig_tmp


