updated deb files for new version

GeoKnow · Jan 5, 2015 · 75cb4e4 · 75cb4e4
1 parent 3d6d70f
commit 75cb4e4
Show file tree

Hide file tree

Showing 14 changed files with 48 additions and 41 deletions.
diff --git a/deb-package/debian/README b/deb-package/debian/README
@@ -3,4 +3,4 @@ The Debian Package geoknow-generator-ui
 
 Comments regarding the Package
 
- -- Vadim Zaslawski <vadim.zaslawski@ontos.com>  Wed, 21 Aug 2013 15:01:15 +0200
+ -- Alejandra Garcia-Rojas M <alejandra.garciarojas@ontos.com>  Mon, 05 Jan 2015 22:50:23 +0100
diff --git a/deb-package/debian/README.Debian b/deb-package/debian/README.Debian
@@ -1,4 +1,6 @@
 geoknow-generator-ui for Debian
 -------------------------------
 
- -- Vadim Zaslawski <[email protected]>  Wed, 21 Aug 2013 15:01:15 +0200
+<possible notes regarding this package - if none, delete this file>
+
+ -- Alejandra Garcia-Rojas M <[email protected]>  Mon, 05 Jan 2015 22:50:23 +0100
diff --git a/deb-package/debian/README.source b/deb-package/debian/README.source
@@ -6,4 +6,5 @@ manual section 4.14. You WILL either need to modify or delete this file>
 
 
 
+ -- Alejandra Garcia-Rojas M <[email protected]>  Mon, 05 Jan 2015 22:50:23 +0100
 
diff --git a/deb-package/debian/changelog b/deb-package/debian/changelog
@@ -5,4 +5,4 @@ geoknow-generator-ui (1.1.0) ldstack-nightly; urgency=low
   * Implements graph level access control
   * Requires spring batch admin generator for running batch processes
 
- -- Alejandra Garcia Rojas M <[email protected]>  Tue, 25 Nov 2014 17:11:12 +0200
+ -- Alejandra Garcia-Rojas M <[email protected]>  Mon, 05 Jan 2015 22:50:23 +0100
diff --git a/deb-package/debian/compat b/deb-package/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/deb-package/debian/control b/deb-package/debian/control
@@ -1,16 +1,16 @@
 Source: geoknow-generator-ui
 Section: web
 Priority: extra
-Maintainer: Alejandra Garcia Rojas M <[email protected]>
+Maintainer: Alejandra Garcia-Rojas M <[email protected]>
 Build-Depends: debhelper (>= 8.0.0)
 Standards-Version: 3.9.4
-Homepage: http://stack.linkeddata.org/
+Homepage: http://stack.linkeddata.org/documentation/users-guide/geoknow-generator/
 #Vcs-Git: git://git.debian.org/collab-maint/geoknow-generator-ui.git
 #Vcs-Browser: http://git.debian.org/?p=collab-maint/geoknow-generator-ui.git;a=summary
 
 Package: geoknow-generator-ui
 Architecture: all
-Depends: tomcat7, ${misc:Depends}
+Depends: tomcat7, spring-batch-admin-geoknow, ${misc:Depends}
 Description: Workbench to integrate tools of project GeoKnow.
  The GeoKnow Generator provides workbench that integrates of tools
  developed within [GeoKnow project](http://geoknow.eu/),

diff --git a/deb-package/debian/copyright b/deb-package/debian/copyright
@@ -1,15 +1,14 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: geoknow-generator-ui
-Source: http://github.com/GeoKnow/GeoKnowGeneratorUI/
+Source: <url://example.com>
 
 Files: *
-Copyright: 2013 Alejandra Garcia Rojas Martinez <[email protected]>
-           2013 Jon Jay Le Grange <[email protected]>
-		   2013 Vadim Zaslawski <[email protected]>
+Copyright: <years> <put author's name and email here>
+           <years> <likewise for another author>
 License: Apache-2.0
 
 Files: debian/*
-Copyright: 2013 Vadim Zaslawski <vadim.zaslawski@ontos.com>
+Copyright: 2015 Alejandra Garcia-Rojas M <alejandra.garciarojas@ontos.com>
 License: Apache-2.0
 
 License: Apache-2.0
@@ -27,3 +26,8 @@ License: Apache-2.0
  .
  On Debian systems, the complete text of the Apache version 2.0 license
  can be found in "/usr/share/common-licenses/Apache-2.0".
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.
+# Please avoid to pick license terms that are more restrictive than the
+# packaged work, as it may make Debian's contributions unacceptable upstream.
diff --git a/deb-package/debian/dirs b/deb-package/debian/dirs
@@ -0,0 +1,2 @@
+/etc/generator
+/etc/generator/batch-jobs
diff --git a/deb-package/debian/init.d.ex b/deb-package/debian/init.d.ex
@@ -1,8 +1,8 @@
 #!/bin/sh
 ### BEGIN INIT INFO
 # Provides:          geoknow-generator-ui
-# Required-Start:    $network $local_fs
-# Required-Stop:
+# Required-Start:    $local_fs $network $remote_fs $syslog
+# Required-Stop:     $local_fs $network $remote_fs $syslog
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: <Enter a short description of the software>
@@ -11,19 +11,21 @@
 #                    <...>
 ### END INIT INFO
 
-# Author: Vadim Zaslawski <[email protected]>
+# Author: Alejandra Garcia-Rojas M <[email protected]>
+
+# Do NOT "set -e"
 
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC=geoknow-generator-ui             # Introduce a short description here
-NAME=geoknow-generator-ui             # Introduce the short server's name here
-DAEMON=/usr/sbin/geoknow-generator-ui # Introduce the server's location here
-DAEMON_ARGS=""             # Arguments to run the daemon with
+DESC="geoknow-generator-ui"
+NAME=geoknow-generator-ui
+DAEMON=/usr/sbin/geoknow-generator-ui
+DAEMON_ARGS=""
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 
 # Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
+[ -x "$DAEMON" ] || exit 0
 
 # Read configuration variable file if it is present
 [ -r /etc/default/$NAME ] && . /etc/default/$NAME
@@ -32,7 +34,8 @@ SCRIPTNAME=/etc/init.d/$NAME
 . /lib/init/vars.sh
 
 # Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
+# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
+# and status_of_proc is working.
 . /lib/lsb/init-functions
 
 #
@@ -104,13 +107,13 @@ do_reload() {
 
 case "$1" in
   start)
-    [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME"
-    do_start
-    case "$?" in
+	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+	do_start
+	case "$?" in
 		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
 		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
 	esac
-  ;;
+	;;
   stop)
 	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
 	do_stop
@@ -120,8 +123,8 @@ case "$1" in
 	esac
 	;;
   status)
-       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-       ;;
+	status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+	;;
   #reload|force-reload)
 	#
 	# If do_reload() is not implemented then leave this commented out
@@ -148,7 +151,7 @@ case "$1" in
 		esac
 		;;
 	  *)
-	  	# Failed to stop
+		# Failed to stop
 		log_end_msg 1
 		;;
 	esac

diff --git a/deb-package/debian/install b/deb-package/debian/install
@@ -1 +1 @@
-generator.war var/lib/tomcat7/webapps
+generator.war var/lib/tomcat7/webapps
diff --git a/deb-package/debian/manpage.1.ex b/deb-package/debian/manpage.1.ex
@@ -1,10 +1,10 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
-.\" (C) Copyright 2013 Vadim Zaslawski <vadim.zaslawski@ontos.com>,
+.\" (C) Copyright 2015 Alejandra Garcia-Rojas M <alejandra.garciarojas@ontos.com>,
 .\"
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH GEOKNOW-GENERATOR-UI SECTION "August 21, 2013"
+.TH GEOKNOW-GENERATOR-UI SECTION "January  5, 2015"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:

diff --git a/deb-package/debian/manpage.sgml.ex b/deb-package/debian/manpage.sgml.ex
@@ -20,12 +20,12 @@ manpage.1: manpage.sgml
   <!ENTITY dhfirstname "<firstname>FIRSTNAME</firstname>">
   <!ENTITY dhsurname   "<surname>SURNAME</surname>">
   <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>August 21, 2013</date>">
+  <!ENTITY dhdate      "<date>January  5, 2015</date>">
   <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
        allowed: see man(7), man(1). -->
   <!ENTITY dhsection   "<manvolnum>SECTION</manvolnum>">
-  <!ENTITY dhemail     "<email>vadim.zaslawski@ontos.com</email>">
-  <!ENTITY dhusername  "Vadim Zaslawski">
+  <!ENTITY dhemail     "<email>alejandra.garciarojas@ontos.com</email>">
+  <!ENTITY dhusername  "Alejandra Garcia-Rojas M">
   <!ENTITY dhucpackage "<refentrytitle>GEOKNOW-GENERATOR-UI</refentrytitle>">
   <!ENTITY dhpackage   "geoknow-generator-ui">
 

diff --git a/deb-package/debian/manpage.xml.ex b/deb-package/debian/manpage.xml.ex
@@ -48,8 +48,8 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
   <!ENTITY dhfirstname "FIRSTNAME">
   <!ENTITY dhsurname   "SURNAME">
   <!-- dhusername could also be set to "&dhfirstname; &dhsurname;". -->
-  <!ENTITY dhusername  "Vadim Zaslawski">
-  <!ENTITY dhemail     "vadim.zaslawski@ontos.com">
+  <!ENTITY dhusername  "Alejandra Garcia-Rojas M">
+  <!ENTITY dhemail     "alejandra.garciarojas@ontos.com">
   <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
        allowed: see man(7), man(1) and
        http://www.tldp.org/HOWTO/Man-Page/q2.html. -->

diff --git a/deb-package/debian/rules b/deb-package/debian/rules
@@ -1,10 +1,5 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1