[pkg-java] r9347 - in trunk/tomcat6/debian: . poms
Ludovic Claude
ludovicc-guest at alioth.debian.org
Wed Jul 15 00:01:36 UTC 2009
Author: ludovicc-guest
Date: 2009-07-15 00:01:30 +0000 (Wed, 15 Jul 2009)
New Revision: 9347
Added:
trunk/tomcat6/debian/libservlet2.5-java.poms
trunk/tomcat6/debian/libtomcat6-java.poms
trunk/tomcat6/debian/maven.publishedRules
trunk/tomcat6/debian/maven.rules
trunk/tomcat6/debian/poms/
trunk/tomcat6/debian/poms/annotations-api.pom
trunk/tomcat6/debian/poms/catalina-ha.pom
trunk/tomcat6/debian/poms/catalina-tribes.pom
trunk/tomcat6/debian/poms/catalina.pom
trunk/tomcat6/debian/poms/el-api.pom
trunk/tomcat6/debian/poms/jasper-el.pom
trunk/tomcat6/debian/poms/jasper.pom
trunk/tomcat6/debian/poms/jsp-api.pom
trunk/tomcat6/debian/poms/juli.pom
trunk/tomcat6/debian/poms/servlet-api.pom
trunk/tomcat6/debian/poms/tomcat-coyote.pom
Removed:
trunk/tomcat6/debian/libservlet2.5-java.install
Modified:
trunk/tomcat6/debian/changelog
trunk/tomcat6/debian/control
trunk/tomcat6/debian/orig-tar.sh
trunk/tomcat6/debian/rules
Log:
* Add the Maven POM to the package
* Add a Build-Depends-Indep dependency on maven-repo-helper
* Use mh_installpom and mh_installjar to install the POM and the jar to the
Maven repository
Modified: trunk/tomcat6/debian/changelog
===================================================================
--- trunk/tomcat6/debian/changelog 2009-07-14 23:58:34 UTC (rev 9346)
+++ trunk/tomcat6/debian/changelog 2009-07-15 00:01:30 UTC (rev 9347)
@@ -1,3 +1,12 @@
+tomcat6 (6.0.20-3) experimental; urgency=low
+
+ * Add the Maven POM to the package
+ * Add a Build-Depends-Indep dependency on maven-repo-helper
+ * Use mh_installpom and mh_installjar to install the POM and the jar to the
+ Maven repository
+
+ -- Ludovic Claude <ludovic.claude at laposte.net> Tue, 14 Jul 2009 14:17:27 +0100
+
tomcat6 (6.0.20-2) unstable; urgency=low
* Expose tomcat-juli.jar as a library in /usr/share/java
Modified: trunk/tomcat6/debian/control
===================================================================
--- trunk/tomcat6/debian/control 2009-07-14 23:58:34 UTC (rev 9346)
+++ trunk/tomcat6/debian/control 2009-07-15 00:01:30 UTC (rev 9347)
@@ -5,7 +5,7 @@
Uploaders: Paul Cager <paul-debian at home.paulcager.org>,
Torsten Werner <twerner at debian.org>
Build-Depends: openjdk-6-jdk, ant-optional, debhelper (>= 6), quilt
-Build-Depends-Indep: libecj-java
+Build-Depends-Indep: maven-repo-helper, libecj-java
Standards-Version: 3.8.1
Homepage: http://tomcat.apache.org
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/tomcat6
Deleted: trunk/tomcat6/debian/libservlet2.5-java.install
===================================================================
--- trunk/tomcat6/debian/libservlet2.5-java.install 2009-07-14 23:58:34 UTC (rev 9346)
+++ trunk/tomcat6/debian/libservlet2.5-java.install 2009-07-15 00:01:30 UTC (rev 9347)
@@ -1,3 +0,0 @@
-output/build/lib/servlet-api-2.5.jar /usr/share/java
-output/build/lib/jsp-api-2.1.jar /usr/share/java
-output/build/lib/el-api-2.1.jar /usr/share/java
Added: trunk/tomcat6/debian/libservlet2.5-java.poms
===================================================================
--- trunk/tomcat6/debian/libservlet2.5-java.poms (rev 0)
+++ trunk/tomcat6/debian/libservlet2.5-java.poms 2009-07-15 00:01:30 UTC (rev 9347)
@@ -0,0 +1,3 @@
+debian/poms/servlet-api.pom --no-parent
+debian/poms/jsp-api.pom --no-parent
+debian/poms/el-api.pom --no-parent
Added: trunk/tomcat6/debian/libtomcat6-java.poms
===================================================================
--- trunk/tomcat6/debian/libtomcat6-java.poms (rev 0)
+++ trunk/tomcat6/debian/libtomcat6-java.poms 2009-07-15 00:01:30 UTC (rev 9347)
@@ -0,0 +1,9 @@
+debian/poms/annotations-api.pom
+debian/poms/catalina.pom
+debian/poms/catalina-ha.pom
+debian/poms/catalina-tribes.pom
+debian/poms/jasper.pom
+debian/poms/jasper-el.pom
+debian/poms/juli.pom
+debian/poms/tomcat-coyote.pom
+
Added: trunk/tomcat6/debian/maven.publishedRules
===================================================================
--- trunk/tomcat6/debian/maven.publishedRules (rev 0)
+++ trunk/tomcat6/debian/maven.publishedRules 2009-07-15 00:01:30 UTC (rev 9347)
@@ -0,0 +1,4 @@
+# Convert tomcat version of the standard apis to the javax apis
+s/org.apache.tomcat/javax.servlet/ servlet-api jar s/.*/2.5/
+s/org.apache.tomcat/javax.servlet/ jsp-api jar s/.*/2.1/
+s/org.apache.tomcat/javax.el/ el-api jar s/.*/2.1/
Added: trunk/tomcat6/debian/maven.rules
===================================================================
--- trunk/tomcat6/debian/maven.rules (rev 0)
+++ trunk/tomcat6/debian/maven.rules 2009-07-15 00:01:30 UTC (rev 9347)
@@ -0,0 +1,8 @@
+# Keep the version of the javax apis
+javax.servlet servlet-api jar *
+javax.servlet.jsp jsp-api jar *
+javax.el el-api jar *
+# Convert tomcat version of the standard apis to the javax apis
+s/org.apache.tomcat/javax.servlet/ servlet-api jar s/.*/2.5/
+s/org.apache.tomcat/javax.servlet/ jsp-api jar s/.*/2.1/
+s/org.apache.tomcat/javax.el/ el-api jar s/.*/2.1/
Property changes on: trunk/tomcat6/debian/orig-tar.sh
___________________________________________________________________
Modified: svn:executable
-
+ *
Added: trunk/tomcat6/debian/poms/annotations-api.pom
===================================================================
--- trunk/tomcat6/debian/poms/annotations-api.pom (rev 0)
+++ trunk/tomcat6/debian/poms/annotations-api.pom 2009-07-15 00:01:30 UTC (rev 9347)
@@ -0,0 +1,24 @@
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>annotations-api</artifactId>
+ <version>6.0.20</version>
+ <description>Annotations Package</description>
+</project>
\ No newline at end of file
Added: trunk/tomcat6/debian/poms/catalina-ha.pom
===================================================================
--- trunk/tomcat6/debian/poms/catalina-ha.pom (rev 0)
+++ trunk/tomcat6/debian/poms/catalina-ha.pom 2009-07-15 00:01:30 UTC (rev 9347)
@@ -0,0 +1,56 @@
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>catalina-ha</artifactId>
+ <version>6.0.20</version>
+ <description>Tomcat High Availability Implementation</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>coyote</artifactId>
+ <version>6.0.20</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>6.0.20</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>juli</artifactId>
+ <version>6.0.20</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tribes</artifactId>
+ <version>6.0.20</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>catalina</artifactId>
+ <version>6.0.20</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
Added: trunk/tomcat6/debian/poms/catalina-tribes.pom
===================================================================
--- trunk/tomcat6/debian/poms/catalina-tribes.pom (rev 0)
+++ trunk/tomcat6/debian/poms/catalina-tribes.pom 2009-07-15 00:01:30 UTC (rev 9347)
@@ -0,0 +1,32 @@
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tribes</artifactId>
+ <version>6.0.20</version>
+ <description>Tomcat Group Communication Package</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>juli</artifactId>
+ <version>6.0.20</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
Added: trunk/tomcat6/debian/poms/catalina.pom
===================================================================
--- trunk/tomcat6/debian/poms/catalina.pom (rev 0)
+++ trunk/tomcat6/debian/poms/catalina.pom 2009-07-15 00:01:30 UTC (rev 9347)
@@ -0,0 +1,52 @@
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>catalina</artifactId>
+ <version>6.0.20</version>
+ <description>Tomcat Servlet Engine Core Classes and Standard implementations</description>
+ <dependencies>
+ <!--
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>coyote</artifactId>
+ <version>6.0.20</version>
+ <scope>compile</scope>
+ </dependency>
+ -->
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>6.0.20</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>juli</artifactId>
+ <version>6.0.20</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>annotations-api</artifactId>
+ <version>6.0.20</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
Added: trunk/tomcat6/debian/poms/el-api.pom
===================================================================
--- trunk/tomcat6/debian/poms/el-api.pom (rev 0)
+++ trunk/tomcat6/debian/poms/el-api.pom 2009-07-15 00:01:30 UTC (rev 9347)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>2.1</version>
+</project>
\ No newline at end of file
Added: trunk/tomcat6/debian/poms/jasper-el.pom
===================================================================
--- trunk/tomcat6/debian/poms/jasper-el.pom (rev 0)
+++ trunk/tomcat6/debian/poms/jasper-el.pom 2009-07-15 00:01:30 UTC (rev 9347)
@@ -0,0 +1,33 @@
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>jasper-el</artifactId>
+ <version>6.0.20</version>
+ <description>Jasper Expression Language Impl</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>el-api</artifactId>
+ <version>6.0.20</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
+
Added: trunk/tomcat6/debian/poms/jasper.pom
===================================================================
--- trunk/tomcat6/debian/poms/jasper.pom (rev 0)
+++ trunk/tomcat6/debian/poms/jasper.pom 2009-07-15 00:01:30 UTC (rev 9347)
@@ -0,0 +1,68 @@
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>jasper</artifactId>
+ <version>6.0.20</version>
+ <description>Tomcats JSP Parser</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>6.0.20</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>juli</artifactId>
+ <version>6.0.20</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>6.0.20</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>catalina</artifactId>
+ <version>6.0.20</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>el-api</artifactId>
+ <version>6.0.20</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>jasper-jdt</artifactId>
+ <version>6.0.20</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>jasper-el</artifactId>
+ <version>6.0.20</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
Added: trunk/tomcat6/debian/poms/jsp-api.pom
===================================================================
--- trunk/tomcat6/debian/poms/jsp-api.pom (rev 0)
+++ trunk/tomcat6/debian/poms/jsp-api.pom 2009-07-15 00:01:30 UTC (rev 9347)
@@ -0,0 +1,6 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+</project>
Added: trunk/tomcat6/debian/poms/juli.pom
===================================================================
--- trunk/tomcat6/debian/poms/juli.pom (rev 0)
+++ trunk/tomcat6/debian/poms/juli.pom 2009-07-15 00:01:30 UTC (rev 9347)
@@ -0,0 +1,24 @@
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>juli</artifactId>
+ <version>6.0.20</version>
+ <description>Tomcat Core Logging Package</description>
+</project>
Added: trunk/tomcat6/debian/poms/servlet-api.pom
===================================================================
--- trunk/tomcat6/debian/poms/servlet-api.pom (rev 0)
+++ trunk/tomcat6/debian/poms/servlet-api.pom 2009-07-15 00:01:30 UTC (rev 9347)
@@ -0,0 +1,6 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+</project>
Added: trunk/tomcat6/debian/poms/tomcat-coyote.pom
===================================================================
--- trunk/tomcat6/debian/poms/tomcat-coyote.pom (rev 0)
+++ trunk/tomcat6/debian/poms/tomcat-coyote.pom 2009-07-15 00:01:30 UTC (rev 9347)
@@ -0,0 +1,44 @@
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>coyote</artifactId>
+ <version>6.0.20</version>
+ <description>Tomcat Connectors and HTTP parser</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>catalina</artifactId>
+ <version>6.0.20</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>6.0.20</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>juli</artifactId>
+ <version>6.0.20</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
Modified: trunk/tomcat6/debian/rules
===================================================================
--- trunk/tomcat6/debian/rules 2009-07-14 23:58:34 UTC (rev 9346)
+++ trunk/tomcat6/debian/rules 2009-07-15 00:01:30 UTC (rev 9347)
@@ -21,7 +21,10 @@
T_VER := $(shell dpkg-parsechangelog | egrep '^Version:' \
| cut -f 2 -d ' ' | cut -f 2 -d ' '|sed 's/-[^-]*$$//')
-T_JARS := jasper-el annotations-api catalina-tribes tomcat-i18n-fr tomcat-i18n-es tomcat-i18n-ja tomcat-coyote jasper catalina-ha catalina-ant catalina
+T_JARS := tomcat-i18n-fr tomcat-i18n-es tomcat-i18n-ja catalina-ant
+T_MAVENIZED_JARS := jasper-el annotations-api catalina-tribes tomcat-coyote jasper catalina-ha catalina
+# Version for the POMs available on the sonatype repository
+P_VER := 6.0.16
ANT_ARGS := -Dcompile.debug=true \
-Dant.build.javac.source=1.5 \
@@ -67,29 +70,30 @@
binary-indep: build install
dh_testdir
dh_testroot
- mv $(BLDLIB)/servlet-api.jar $(BLDLIB)/servlet-api-2.5.jar
- mv $(BLDLIB)/jsp-api.jar $(BLDLIB)/jsp-api-2.1.jar
- mv $(BLDLIB)/el-api.jar $(BLDLIB)/el-api-2.1.jar
- for i in $(T_JARS); do \
- mv $(BLDLIB)/$$i.jar $(BLDLIB)/$$i-$(T_VER).jar; done
dh_installchangelogs
dh_installdocs
dh_installman -ptomcat6-user debian/tomcat6-instance-create.1
dh_installexamples
dh_installinit --error-handler=true -- defaults 92 08
dh_installcron
+ mh_installpoms -plibtomcat6-java
+ for i in $(T_MAVENIZED_JARS); do \
+ mh_installjar -plibtomcat6-java -l debian/poms/$$i.pom $(BLDLIB)/$$i.jar; done
+ mh_installjar -plibtomcat6-java -l debian/poms/juli.pom $(BLDBIN)/tomcat-juli.jar
for i in $(T_JARS); do \
+ mv $(BLDLIB)/$$i.jar $(BLDLIB)/$$i-$(T_VER).jar && \
dh_install -plibtomcat6-java \
$(BLDLIB)/$$i-$(T_VER).jar usr/share/java && \
dh_link -plibtomcat6-java usr/share/java/$$i-$(T_VER).jar \
usr/share/java/$$i.jar && \
dh_link -ptomcat6-common usr/share/java/$$i-$(T_VER).jar \
usr/share/tomcat6/lib/$$i.jar; done
- dh_install -plibtomcat6-java $(BLDBIN)/tomcat-juli.jar usr/share/java
- dh_link -plibtomcat6-java usr/share/java/tomcat-juli.jar \
- usr/share/java/tomcat-juli-$(T_VER).jar
dh_install --exclude=.bat --exclude=Thumbs.db
dh_link
+ mh_installpoms -plibservlet2.5-java
+ mh_installjar -plibservlet2.5-java debian/poms/servlet-api.pom output/build/lib/servlet-api.jar /usr/share/java/servlet-api-2.5.jar
+ mh_installjar -plibservlet2.5-java debian/poms/jsp-api.pom output/build/lib/jsp-api.jar /usr/share/java/jsp-api-2.1.jar
+ mh_installjar -plibservlet2.5-java debian/poms/el-api.pom output/build/lib/el-api.jar /usr/share/java/el-api-2.1.jar
chmod a+x debian/tomcat6-common/usr/share/tomcat6/bin/*.sh
chmod a+x debian/tomcat6-user/usr/bin/tomcat6-instance-create
chmod a+x debian/tomcat6-user/usr/share/tomcat6/skel/bin/*.sh
@@ -107,4 +111,28 @@
get-orig-source:
-uscan --upstream-version 0
+get-orig-pom:
+ wget -O debian/poms/annotations-api.pom http://repository.sonatype.org/service/local/repositories/central/content/org/apache/tomcat/annotations-api/$(P_VER)/annotations-api-$(P_VER).pom
+ perl -p -i -e 's/<version>$(P_VER)/<version>$(T_VER)/' debian/poms/annotations-api.pom
+ wget -O debian/poms/catalina.pom http://repository.sonatype.org/service/local/repositories/central/content/org/apache/tomcat/catalina/$(P_VER)/catalina-$(P_VER).pom
+ perl -p -i -e 's/<version>$(P_VER)/<version>$(T_VER)/' debian/poms/catalina.pom
+ wget -O debian/poms/catalina-ha.pom http://repository.sonatype.org/service/local/repositories/central/content/org/apache/tomcat/catalina-ha/$(P_VER)/catalina-ha-$(P_VER).pom
+ perl -p -i -e 's/<version>$(P_VER)/<version>$(T_VER)/' debian/poms/catalina-ha.pom
+ wget -O debian/poms/tomcat-coyote.pom http://repository.sonatype.org/service/local/repositories/central/content/org/apache/tomcat/coyote/$(P_VER)/coyote-$(P_VER).pom
+ perl -p -i -e 's/<version>$(P_VER)/<version>$(T_VER)/' debian/poms/tomcat-coyote.pom
+ wget -O debian/poms/dbcp.pom http://repository.sonatype.org/service/local/repositories/central/content/org/apache/tomcat/dbcp/$(P_VER)/dbcp-$(P_VER).pom
+ perl -p -i -e 's/<version>$(P_VER)/<version>$(T_VER)/' debian/poms/dbcp.pom
+ wget -O debian/poms/jasper.pom http://repository.sonatype.org/service/local/repositories/central/content/org/apache/tomcat/jasper/$(P_VER)/jasper-$(P_VER).pom
+ perl -p -i -e 's/<version>$(P_VER)/<version>$(T_VER)/' debian/poms/jasper.pom
+ wget -O debian/poms/jasper-el.pom http://repository.sonatype.org/service/local/repositories/central/content/org/apache/tomcat/jasper-el/$(P_VER)/jasper-el-$(P_VER).pom
+ perl -p -i -e 's/<version>$(P_VER)/<version>$(T_VER)/' debian/poms/jasper-el.pom
+ wget -O debian/poms/juli.pom http://repository.sonatype.org/service/local/repositories/central/content/org/apache/tomcat/juli/$(P_VER)/juli-$(P_VER).pom
+ perl -p -i -e 's/<version>$(P_VER)/<version>$(T_VER)/' debian/poms/juli.pom
+ wget -O debian/poms/catalina-tribes.pom http://repository.sonatype.org/service/local/repositories/central/content/org/apache/tomcat/tribes/$(P_VER)/tribes-$(P_VER).pom
+ perl -p -i -e 's/<version>$(P_VER)/<version>$(T_VER)/' debian/poms/catalina-tribes.pom
+ wget -O debian/poms/servlet-api.pom http://repository.sonatype.org/service/local/repositories/central/content/javax/servlet/servlet-api/2.5/servlet-api-2.5.pom
+ wget -O debian/poms/jsp-api.pom http://repository.sonatype.org/service/local/repositories/central/content/javax/servlet/jsp/jsp-api/2.1/jsp-api-2.1.pom
+ wget -O debian/poms/el-api.pom http://repository.sonatype.org/service/local/repositories/central/content/javax/el/el-api/1.0/el-api-1.0.pom
+ perl -p -i -e 's/<version>1\.0/<version>2.1/' debian/poms/el-api.pom
+
.PHONY: build clean binary-indep binary-arch binary install get-orig-source
Property changes on: trunk/tomcat6/debian/rules
___________________________________________________________________
Modified: svn:executable
-
+ *
More information about the pkg-java-commits
mailing list