You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2014/03/17 12:05:00 UTC

[15/40] git commit: MARMOTTA-431: refined some details of the .deb package

MARMOTTA-431: refined some details of the .deb package


Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/f7d7371c
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/f7d7371c
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/f7d7371c

Branch: refs/heads/ldp
Commit: f7d7371c3fd8e2cc3d45c2ff90c8291cd911dc07
Parents: da93ae3
Author: Sergio Fernández <wi...@apache.org>
Authored: Tue Feb 18 15:27:02 2014 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Tue Feb 18 15:27:02 2014 +0100

----------------------------------------------------------------------
 launchers/marmotta-webapp/pom.xml                  | 14 ++++++++++++++
 launchers/marmotta-webapp/src/deb/control/control  |  8 ++++++--
 launchers/marmotta-webapp/src/deb/control/postinst |  2 +-
 launchers/marmotta-webapp/src/deb/control/postrm   |  4 +++-
 launchers/marmotta-webapp/src/deb/control/preinst  |  2 +-
 launchers/marmotta-webapp/src/deb/control/prerm    |  4 +++-
 launchers/marmotta-webapp/src/deb/pkg/README       |  1 +
 launchers/marmotta-webapp/src/deb/pkg/changelog    |  5 +++++
 launchers/marmotta-webapp/src/deb/pkg/copyright    |  8 ++++++++
 9 files changed, 42 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/f7d7371c/launchers/marmotta-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
index 84dc039..d9cda1e 100644
--- a/launchers/marmotta-webapp/pom.xml
+++ b/launchers/marmotta-webapp/pom.xml
@@ -122,6 +122,7 @@
             <plugin>
                 <artifactId>jdeb</artifactId>
                 <groupId>org.vafer</groupId>
+                <!--<version>1.1-SNAPSHOT</version>-->
                 <version>1.0.1</version>
                 <executions>
                     <execution>
@@ -134,6 +135,16 @@
                             <controlDir>${basedir}/src/deb/control</controlDir>
                             <dataSet>
                                 <data>
+                                    <src>${basedir}/src/deb/pkg</src>
+                                    <type>directory</type>
+                                    <mapper>
+                                        <type>perm</type>
+                                        <prefix>usr/share/doc/marmotta</prefix>
+                                        <user>root</user>
+                                        <group>root</group>
+                                    </mapper>
+                                </data>
+                                <data>
                                     <src>${basedir}/src/deb/home</src>
                                     <type>directory</type>
                                     <mapper>
@@ -164,6 +175,9 @@
                                     </mapper>
                                 </data>
                             </dataSet>
+                            <signPackage>true</signPackage>
+                            <key>5531369F</key>
+                            <timestamped>true</timestamped>
                             <verbose>false</verbose>
                         </configuration>
                     </execution>

http://git-wip-us.apache.org/repos/asf/marmotta/blob/f7d7371c/launchers/marmotta-webapp/src/deb/control/control
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/deb/control/control b/launchers/marmotta-webapp/src/deb/control/control
index 68c23b8..d90993d 100644
--- a/launchers/marmotta-webapp/src/deb/control/control
+++ b/launchers/marmotta-webapp/src/deb/control/control
@@ -3,6 +3,10 @@ Version: [[version]]
 Section: java
 Priority: extra
 Architecture: all
-Description: [[description]]
-Maintainer: wikier@apache.org
+Distribution: ldstack-nightly
+Maintainer: Sergio Fernández <wi...@apache.org>
 Depends: tomcat7 (>=7.0.30-1)
+Description: Apache Marmotta is an Open Platform for Linked Data
+ The goal of Apache Marmotta is to provide an open implementation of a Linked 
+ Data Platform that can be used, extended and deployed easily by organizations 
+ who want to publish Linked Data or build custom applications on Linked Data.

http://git-wip-us.apache.org/repos/asf/marmotta/blob/f7d7371c/launchers/marmotta-webapp/src/deb/control/postinst
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/deb/control/postinst b/launchers/marmotta-webapp/src/deb/control/postinst
index ca20fc2..8cb3f30 100644
--- a/launchers/marmotta-webapp/src/deb/control/postinst
+++ b/launchers/marmotta-webapp/src/deb/control/postinst
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 echo $(date) >> var/lib/marmotta/marmotta.txt
 

http://git-wip-us.apache.org/repos/asf/marmotta/blob/f7d7371c/launchers/marmotta-webapp/src/deb/control/postrm
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/deb/control/postrm b/launchers/marmotta-webapp/src/deb/control/postrm
index 58cbe36..ced87d6 100644
--- a/launchers/marmotta-webapp/src/deb/control/postrm
+++ b/launchers/marmotta-webapp/src/deb/control/postrm
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 operation="$1"
 
@@ -14,5 +14,7 @@ case "$operation" in
     ;;
 esac
 
+service tomcat7 start
+
 exit 0
 

http://git-wip-us.apache.org/repos/asf/marmotta/blob/f7d7371c/launchers/marmotta-webapp/src/deb/control/preinst
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/deb/control/preinst b/launchers/marmotta-webapp/src/deb/control/preinst
index b6c4e6e..de2ed73 100644
--- a/launchers/marmotta-webapp/src/deb/control/preinst
+++ b/launchers/marmotta-webapp/src/deb/control/preinst
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 service tomcat7 stop
 

http://git-wip-us.apache.org/repos/asf/marmotta/blob/f7d7371c/launchers/marmotta-webapp/src/deb/control/prerm
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/deb/control/prerm b/launchers/marmotta-webapp/src/deb/control/prerm
index 500fb1e..120736e 100644
--- a/launchers/marmotta-webapp/src/deb/control/prerm
+++ b/launchers/marmotta-webapp/src/deb/control/prerm
@@ -1,4 +1,6 @@
-#!/bin/sh
+#!/bin/sh -e
+
+service tomcat7 stop
 
 exit 0
 

http://git-wip-us.apache.org/repos/asf/marmotta/blob/f7d7371c/launchers/marmotta-webapp/src/deb/pkg/README
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/deb/pkg/README b/launchers/marmotta-webapp/src/deb/pkg/README
new file mode 100644
index 0000000..f8b46d5
--- /dev/null
+++ b/launchers/marmotta-webapp/src/deb/pkg/README
@@ -0,0 +1 @@
+Apache Marmotta Web Application

http://git-wip-us.apache.org/repos/asf/marmotta/blob/f7d7371c/launchers/marmotta-webapp/src/deb/pkg/changelog
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/deb/pkg/changelog b/launchers/marmotta-webapp/src/deb/pkg/changelog
new file mode 100644
index 0000000..5d6d389
--- /dev/null
+++ b/launchers/marmotta-webapp/src/deb/pkg/changelog
@@ -0,0 +1,5 @@
+marmotta (3.2.0-SNAPSHOT) ldstack-nightly; urgency=low
+
+  * First Marmotta Webapp Debian package
+
+ -- Sergio Fernandez <wi...@apache.org>  Tue, 18 Feb 2014 14:36:00 +0100

http://git-wip-us.apache.org/repos/asf/marmotta/blob/f7d7371c/launchers/marmotta-webapp/src/deb/pkg/copyright
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/deb/pkg/copyright b/launchers/marmotta-webapp/src/deb/pkg/copyright
new file mode 100644
index 0000000..6113bf8
--- /dev/null
+++ b/launchers/marmotta-webapp/src/deb/pkg/copyright
@@ -0,0 +1,8 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Apache Marmotta
+Upstream-Contact: Sergio Fernández <wi...@apache.org>
+Source: http://marmotta.apache.org
+
+Files: *
+Copyright: 2012-2014 The Apache Software Foundation
+License: Apache