New version that does not depend on xvfb (no longer needed)
authorJean-Michel Nirgal Vourgère <jmv@nirgal.com>
Fri, 14 Oct 2011 08:39:56 +0000 (08:39 +0000)
committerJean-Michel Nirgal Vourgère <jmv@nirgal.com>
Fri, 14 Oct 2011 08:39:56 +0000 (08:39 +0000)
debian/changelog
debian/control
debian/oomailing.init
debian/rules
debian/source/format [new file with mode: 0644]
debian/xvfb.init [deleted file]

index af3df34249ed51d84d373c2027c098eab379d40b..8dba2c39e22a24d8c251b7befdbe4a473c96d10a 100644 (file)
@@ -1,3 +1,9 @@
+oomailing (0.4) UNRELEASED; urgency=low
+
+  * No longer depending on xvfb, since this is no longer needed in debian 6
+
+ -- Jean-Michel Vourgère <jmv_deb@nirgal.com>  Fri, 14 Oct 2011 09:30:10 +0200
+
 oomailing (0.3) UNRELEASED; urgency=low
 
   * Bumped debhelper version
index 0917dda602282c826ae077da5803e507e4193a5c..5108ba0db2f29d49ee9b4e1e1b865a76583b41dd 100644 (file)
@@ -2,14 +2,14 @@ Source: oomailing
 Section: misc
 Priority: optional
 Maintainer: Jean-Michel Vourgère <jmv_deb@nirgal.com>
-Build-Depends: debhelper (>= 5)
-Standards-Version: 3.8.1
+Build-Depends: debhelper (>= 7)
+Standards-Version: 3.9.1
 
 Package: oomailing
-Section: misc
 Architecture: all
-Depends: openoffice.org, xvfb, sudo, adduser, ${misc:Depends}
+Depends: openoffice.org, sudo, adduser, ${misc:Depends}
 Recommends: xfonts-base
-Description: Openoffice mailing server
- Create an openoffice instance running on a virtual X frame buffer.
- It listen on a port for mailmerge commands.
+Description: Openoffice mail generation server
+ Create an openoffice instance running in background.
+ It listens on a udp port for mailmerge commands.
+ It generates odt/pdf files.
index ea295f08024a5a2d89707a8625d57215b12c7762..dbb9b62abaeb4b725cf46df95851d0071de79076 100755 (executable)
@@ -1,20 +1,20 @@
 #! /bin/sh
 ### BEGIN INIT INFO
 # Provides:          oomailing
-# Required-Start:    $remote_fs $syslog xvfb
-# Required-Stop:     $remote_fs $syslog xvfb
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Starts openoffice in server mode
 # Description:       Starts an openoffice instance listening for commands on
-#        UDP port 2002, using a virtual X server running on display :99
-#        see xvfb
+#        UDP port 2002
 ### END INIT INFO
 
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 binpath=/usr/bin/soffice
 binpathsub=/usr/lib/openoffice/program/soffice.bin
-param="-nologo -nodefault -invisible -display :99 -accept=socket,host=localhost,port=2002;urp;"
+param="-nologo -nodefault -invisible -accept=socket,host=localhost,port=2002;urp;"
+# -display :99 was used with xvfb, no longer necessary with debian 6
 
 test -f $binpath || exit 0
 
index 1e7f2e3abce49db010616d0f223c9c19b622036b..0489187bde6d55365f6142c515ed4f5c0d23fa3d 100755 (executable)
@@ -5,57 +5,58 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-build: build-stamp
-build-stamp:
-       dh_testdir
-       touch build-stamp
-
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp
-       dh_clean
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k
-       dh_installdirs
-
-# Build architecture-independent files here.
-binary-indep: build install
-       dh_testdir
-       dh_testroot
-       dh_install -X.svn
-#      dh_installdebconf
-       dh_installdocs
-       dh_installexamples
-       dh_installmenu
-#      dh_installlogrotate
-#      dh_installemacsen
-#      dh_installpam
-#      dh_installmime
-       dh_installinit --name=xvfb --update-rcd-params='defaults 90'
-       dh_installinit --name=oomailing --update-rcd-params='defaults 91'
-       dh_installcron
-#      dh_installman
-       dh_installinfo
-       dh_installchangelogs
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
-#      dh_makeshlibs
-       dh_installdeb
-#      dh_perl
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+%:
+       dh $@
+#build: build-stamp
+#build-stamp:
+#      dh_testdir
+#      touch build-stamp
+#
+#clean:
+#      dh_testdir
+#      dh_testroot
+#      rm -f build-stamp
+#      dh_clean
+#
+#install: build
+#      dh_testdir
+#      dh_testroot
+#      dh_clean -k
+#      dh_installdirs
+#
+## Build architecture-independent files here.
+#binary-indep: build install
+#      dh_testdir
+#      dh_testroot
+#      dh_install -X.svn
+##     dh_installdebconf
+#      dh_installdocs
+#      dh_installexamples
+#      dh_installmenu
+##     dh_installlogrotate
+##     dh_installemacsen
+##     dh_installpam
+##     dh_installmime
+#      dh_installinit --name=oomailing --update-rcd-params='defaults 91'
+#      dh_installcron
+##     dh_installman
+#      dh_installinfo
+#      dh_installchangelogs
+#      dh_link
+#      dh_strip
+#      dh_compress
+#      dh_fixperms
+##     dh_makeshlibs
+#      dh_installdeb
+##     dh_perl
+#      dh_shlibdeps
+#      dh_gencontrol
+#      dh_md5sums
+#      dh_builddeb
+#
+## Build architecture-dependent files here.
+#binary-arch: build install
+## We have nothing to do by default.
+#
+#binary: binary-indep binary-arch
+#.PHONY: build clean binary-indep binary-arch binary install
diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..89ae9db
--- /dev/null
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/debian/xvfb.init b/debian/xvfb.init
deleted file mode 100755 (executable)
index cbb9d74..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          xvfb
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Starts a virtual X server
-# Description:       Starts a virtual X server running on display :99
-### END INIT INFO
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-binpath=/usr/bin/Xvfb
-param=:99
-
-test -f $binpath || exit 0
-
-case "$1" in
-  start)
-    echo -n "Starting virtual X server: Xvfb"
-    start-stop-daemon --start --quiet --exec $binpath --background -- $param
-    echo "."
-    ;;
-  stop)
-    echo -n "Stopping virtual X server: Xvfb"
-    start-stop-daemon --stop --retry TERM/1/TERM/1/TERM/4/KILL --quiet --exec $binpath
-    echo "."
-    ;;
-  restart|force-reload)
-    echo -n "Restarting virtual X server: Xvfb"
-    start-stop-daemon --stop --retry TERM/1/TERM/1/TERM/4/KILL --quiet --exec $binpath
-    start-stop-daemon --start --quiet --exec $binpath --background -- $param
-    echo "."
-    ;;
-  *)
-    echo "Usage: /etc/init.d/xvfb {start|stop|restart|force-reload}"
-    exit 1
-esac
-
-exit 0