Author: gg0-guest
Date: 2010-02-22 19:39:40 +0000 (Mon, 22 Feb 2010)
New Revision: 11682

Added:
   trunk/avalon-framework/debian/poms/
   trunk/avalon-framework/debian/poms/pom.xml
   trunk/avalon-framework/debian/poms/pom_api.xml
   trunk/avalon-framework/debian/poms/pom_impl.xml
Modified:
   trunk/avalon-framework/debian/changelog
   trunk/avalon-framework/debian/control
   trunk/avalon-framework/debian/copyright
   trunk/avalon-framework/debian/rules
Log:
added maven support

Modified: trunk/avalon-framework/debian/changelog
===================================================================
--- trunk/avalon-framework/debian/changelog     2010-02-22 00:17:12 UTC (rev 
11681)
+++ trunk/avalon-framework/debian/changelog     2010-02-22 19:39:40 UTC (rev 
11682)
@@ -1,3 +1,14 @@
+avalon-framework (4.2.0-6) unstable; urgency=low
+
+  * Added Maven support
+  * Standards-Version to 3.8.4
+  * Removed Arnaud Vandyck from Uploaders
+  * d/copyright:
+    - converted to DEP-5 format
+    - added debian/pom.xml section
+
+ -- Gabriele Giacone <1o5g4...@gmail.com>  Mon, 22 Feb 2010 20:20:48 +0100
+
 avalon-framework (4.2.0-5) unstable; urgency=low
 
   * Moved some Build-Depends-Indep to Build-Depends, since they were

Modified: trunk/avalon-framework/debian/control
===================================================================
--- trunk/avalon-framework/debian/control       2010-02-22 00:17:12 UTC (rev 
11681)
+++ trunk/avalon-framework/debian/control       2010-02-22 19:39:40 UTC (rev 
11682)
@@ -2,11 +2,10 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers 
<pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <av...@debian.org>, Michael Koch <konque...@gmx.de>,
- Niels Thykier <ni...@thykier.net>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant-optional
+Uploaders: Michael Koch <konque...@gmx.de>, Niels Thykier <ni...@thykier.net>
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant-optional, 
maven-repo-helper
 Build-Depends-Indep: liblog4j1.2-java, liblogkit-java, libxalan2-java, junit
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://excalibur.apache.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/avalon-framework
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/avalon-framework

Modified: trunk/avalon-framework/debian/copyright
===================================================================
--- trunk/avalon-framework/debian/copyright     2010-02-22 00:17:12 UTC (rev 
11681)
+++ trunk/avalon-framework/debian/copyright     2010-02-22 19:39:40 UTC (rev 
11682)
@@ -1,22 +1,27 @@
-This package was debianized by Takashi Okamoto <t...@debian.org> on
-Tue,  2 Oct 2001 22:22:51 +0900.
+Format-Specification: http://dep.debian.net/deps/dep5/
+Name: avalon-framework
+Maintainer: Federico Barbieri <f...@apache.org>,
+ Charles Benett <char...@benett1.demon.co.uk>, Peter Donald 
<dona...@apache.org>,
+ Pierpaolo Fumagalli <p...@apache.org>, Serge Knystautas <ser...@lokitech.com>,
+ Roberto Lo Giacco <rlogia...@mail.com>, Berin Loritsch <blorit...@apache.org>,
+ Stefano Mazzocchi <stef...@apache.org>, Leo Simons <m...@leosimons.com>
+Source: http://excalibur.apache.org/
 
-It was downloaded from <http://excalibur.apache.org/>.
+Copyright: 1997-2004, The Apache Software Foundation
+License: Apache Software License version 2.0
+ On Debian systems the full text of the Apache Software License version
+ 2.0 can be found in the `/usr/share/common-licenses/Apache-2.0' file.
 
-Upstream Authors:
+Files: debian/*
+Copyright: 2001, Takashi Okamoto <t...@debian.org>
+License: Apache Software License version 2.0
+ On Debian systems the full text of the Apache Software License version
+ 2.0 can be found in the `/usr/share/common-licenses/Apache-2.0' file.
 
-        Federico Barbieri         f...@apache.org
-        Charles Benett            char...@benett1.demon.co.uk
-        Peter Donald              dona...@apache.org
-        Pierpaolo Fumagalli       p...@apache.org
-        Serge Knystautas          ser...@lokitech.com
-        Roberto Lo Giacco         rlogia...@mail.com
-        Berin Loritsch            blorit...@apache.org
-        Stefano Mazzocchi         stef...@apache.org
-        Leo Simons                m...@leosimons.com
-
-Copyright: 1997-2004 The Apache Software Foundation.
-License: Apache 2.0
-
-On Debian systems, the complete text of the Apache 2.0 License
-can be found in `/usr/share/common-licenses/Apache-2.0'.
+Files: debian/poms/*
+Copyright: The Apache Software Foundation
+License: Apache Software License version 2.0
+ pom files have been downloaded from
+ <https://svn.apache.org/repos/asf/excalibur/trunk/framework/>
+ On Debian systems the full text of the Apache Software License version
+ 2.0 can be found in the `/usr/share/common-licenses/Apache-2.0' file.

Added: trunk/avalon-framework/debian/poms/pom.xml
===================================================================
--- trunk/avalon-framework/debian/poms/pom.xml                          (rev 0)
+++ trunk/avalon-framework/debian/poms/pom.xml  2010-02-22 19:39:40 UTC (rev 
11682)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<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>
+  <name>Avalon Framework [modules]</name>
+  <groupId>org.apache.avalon</groupId>
+  <artifactId>avalon-framework</artifactId>
+  <description>Avalon Framework</description>
+  <version>4.2.0</version>
+  <inceptionYear>1997</inceptionYear>
+  <packaging>pom</packaging>
+  <modules>
+    <module>api</module>
+    <module>impl</module>
+  </modules>
+  <scm>
+    
<connection>scm:svn:http://svn.apache.org/repos/asf/excalibur/trunk/framework</connection>
+    <url>http://svn.apache.org/viewcvs.cgi/excalibur/trunk/framework</url>
+    
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/excalibur/trunk/avalon-framework</developerConnection>
+  </scm>
+</project>

Added: trunk/avalon-framework/debian/poms/pom_api.xml
===================================================================
--- trunk/avalon-framework/debian/poms/pom_api.xml                              
(rev 0)
+++ trunk/avalon-framework/debian/poms/pom_api.xml      2010-02-22 19:39:40 UTC 
(rev 11682)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<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";>
+  <parent>
+    <groupId>org.apache.excalibur</groupId>
+    <artifactId>excalibur-parent</artifactId>
+    <version>4-SNAPSHOT</version>
+    <relativePath>pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <name>Avalon Framework API</name>
+  <groupId>org.apache.avalon.framework</groupId>
+  <artifactId>avalon-framework-api</artifactId>
+  <version>4.2.0</version>
+  <packaging>bundle</packaging>
+  <description>Avalon Framework API</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.avalon.logkit</groupId>
+      <artifactId>avalon-logkit</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <artifactId>junit</artifactId>
+      <groupId>junit</groupId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+  <scm>
+    
<connection>scm:svn:http://svn.apache.org/repos/asf/excalibur/trunk/framework/api</connection>
+    <url>http://svn.apache.org/viewcvs.cgi/excalibur/trunk/framework/api</url>
+    
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/excalibur/trunk/avalon-framework/avalon-framework-api</developerConnection>
+  </scm>
+</project>

Added: trunk/avalon-framework/debian/poms/pom_impl.xml
===================================================================
--- trunk/avalon-framework/debian/poms/pom_impl.xml                             
(rev 0)
+++ trunk/avalon-framework/debian/poms/pom_impl.xml     2010-02-22 19:39:40 UTC 
(rev 11682)
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<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";>
+  <parent>
+    <groupId>org.apache.excalibur</groupId>
+    <artifactId>excalibur-parent</artifactId>
+    <version>4-SNAPSHOT</version>
+    <relativePath>pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <name>Avalon Framework Implementation</name>
+  <groupId>org.apache.avalon.framework</groupId>
+  <artifactId>avalon-framework-impl</artifactId>
+  <version>4.2.0</version>
+  <packaging>bundle</packaging>
+  <description>Avalon Framework Implementation</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.avalon.framework</groupId>
+      <artifactId>avalon-framework-api</artifactId>
+    </dependency>
+    <dependency>
+      <artifactId>commons-logging</artifactId>
+      <groupId>commons-logging</groupId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <artifactId>log4j</artifactId>
+      <groupId>log4j</groupId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.logkit</groupId>
+      <artifactId>avalon-logkit</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <artifactId>junit</artifactId>
+      <groupId>junit</groupId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <artifactId>jmock</artifactId>
+      <groupId>jmock</groupId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+  <scm>
+    
<connection>scm:svn:http://svn.apache.org/repos/asf/excalibur/trunk/framework/impl</connection>
+    <url>http://svn.apache.org/viewcvs.cgi/excalibur/trunk/framework/impl</url>
+    
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/excalibur/trunk/avalon-framework/avalon-framework-impl</developerConnection>
+  </scm>
+</project>

Modified: trunk/avalon-framework/debian/rules
===================================================================
--- trunk/avalon-framework/debian/rules 2010-02-22 00:17:12 UTC (rev 11681)
+++ trunk/avalon-framework/debian/rules 2010-02-22 19:39:40 UTC (rev 11682)
@@ -14,9 +14,15 @@
 DEB_ANT_BUILD_TARGET := jar doc
 DEB_ANT_CHECK_TARGET := test-all
 
+POMS := debian/poms/pom.xml debian/poms/pom_api.xml debian/poms/pom_impl.xml
+
 install/libavalon-framework-java::
-       install -m 644 dist/avalon-framework.jar 
debian/$(cdbs_curpkg)/usr/share/java/avalon-framework-$(VERSION).jar
-       ln -s avalon-framework-$(VERSION).jar 
debian/$(cdbs_curpkg)/usr/share/java/avalon-framework.jar
+       # Install poms and jar
+       for pom in $(POMS); do \
+               mh_installpom -v -o -plibavalon-framework-java $$pom; \
+               mh_installjar -plibavalon-framework-java -l $$pom \
+                       -navalon-framework -i${VERSION} 
dist/avalon-framework.jar; \
+       done
 
 install/libavalon-framework-java-doc::
        # remove the zero byte file to fix lintian warning


_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits

Reply via email to