Allow dots in filenames

Bump debian Standards-Version
Fixed xfont-base and adduser dependencies
Moved build-arch rules to build-indep rules

diff --git a/debian/changelog b/debian/changelog
index ea6644990ab2ffa454c4e428c976bda4f0bd8ed5..0cefde669649c0d40b095e4311e66f4587283a0e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+oomailing (0.2) UNRELEASED; urgency=low
+
+  * Allow dots in filenames 
+
+ -- Jean-Michel Vourgère <jmv_deb@nirgal.com>  Mon, 08 Jun 2009 14:27:41 +0200
+
 oomailing (0.1) UNRELEASED; urgency=low
 
   * Initial release.

diff --git a/debian/control b/debian/control
index c4eb93d60c2a993f5c74b802b6843a4461f0b625..5e3128833e7af437496c158ae2d5def92e09b775 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,13 @@ Section: misc
 Priority: optional
 Maintainer: Jean-Michel Vourgère <jmv_deb@nirgal.com>
 Build-Depends: debhelper (>> 3.0.0)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.1
 
 Package: oomailing
 Section: misc
 Architecture: all
-Depends: openoffice.org, xvfb, xfonts-base, sudo
+Depends: openoffice.org, xvfb, sudo, adduser
+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.

diff --git a/debian/rules b/debian/rules
index 8808be99566d134c0d1a47c45cf45ca79ce271b1..1e7f2e3abce49db010616d0f223c9c19b622036b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -24,10 +24,6 @@ install: build
 
 # Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
        dh_testdir
        dh_testroot
        dh_install -X.svn
@@ -57,5 +53,9 @@ binary-arch: build install
        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/mvoomail b/mvoomail
index f9b6d17cdbb31e78d79a9732695df1f952b9a6b4..2b86e94f3ee19e039273b3d4ba061f2a09f13bc8 100755 (executable)
--- a/mvoomail
+++ b/mvoomail
@@ -19,11 +19,11 @@ if [[ $# != 2 ]]; then
        exitusage Need two parameters
 fi
 
-if ! echo "$1" | grep -q "^[A-Za-z0-9]*$"; then
+if ! echo "$1" | grep -qG "^[A-Za-z0-9.]*$"; then
        exitusage SECURITY ERROR: Base file name can only contain alphanumerical characters
 fi
 
-basefilename=$1.odt
+basefilename=$1
 target=$2
 
 test -r /tmp/$basefilename || exitusage "Can't read file /tmp/$basefilename"