Please unblock sbox-dtc 1.11-5
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi,
This update is mainly done because of a debconf translation update. As
there was some new lintian warnings, I did also improved the package
itself. The interdiff is attached!
Thomas Goirand
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFJBf9yl4M9yZjvmkkRAoZQAJ9fymcrmXZATlhB6mhtvSe3/ceYggCg7yyB
7LM9w4LfWScHovaZgSQ2Ft4=
=U6e9
-----END PGP SIGNATURE-----
diff -u sbox-dtc-1.11/debian/rules sbox-dtc-1.11/debian/rules
--- sbox-dtc-1.11/debian/rules
+++ sbox-dtc-1.11/debian/rules
@@ -13,7 +13,7 @@
dh_testdir
dh_testroot
rm -f build-stamp
- -$(MAKE) clean DESTDIR=$(CURDIR)/debian/tmp
+ [ ! -f Makefile ] || $(MAKE) clean DESTDIR=$(CURDIR)/debian/tmp
dh_clean
install: build
diff -u sbox-dtc-1.11/debian/changelog sbox-dtc-1.11/debian/changelog
--- sbox-dtc-1.11/debian/changelog
+++ sbox-dtc-1.11/debian/changelog
@@ -1,3 +1,20 @@
+sbox-dtc (1.11-5) unstable; urgency=low
+
+ * Added a missing || true for the db_input call in the debian/config script.
+
+ -- Thomas Goirand <thomas@goirand.fr> Wed, 22 Oct 2008 04:52:30 +0800
+
+sbox-dtc (1.11-4) unstable; urgency=low
+
+ * Added Debconf template translation to Swedish, thanks to Martin Bagge
+ <brother@bsnet.se> (Closes: #500125).
+ * Bumped to Standards-Version: 3.8.0.
+ * Added year to copyright, so it removes a Lintian error.
+ * Added [ ! -f Makefile ] || to the debian/rules
+ * Added set -e in the debian/config script.
+
+ -- Thomas Goirand <thomas@goirand.fr> Sat, 18 Oct 2008 02:04:28 +0800
+
sbox-dtc (1.11-3) unstable; urgency=low
* Added nl.po Duch template translation from Bart Cornelis
diff -u sbox-dtc-1.11/debian/control sbox-dtc-1.11/debian/control
--- sbox-dtc-1.11/debian/control
+++ sbox-dtc-1.11/debian/control
@@ -2,14 +2,14 @@
Section: web
Priority: optional
Maintainer: Thomas Goirand <thomas@goirand.fr>
-Build-Depends: debhelper (>= 4), libapr1-dev, po-debconf, libdotconf-dev
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 4), libapr1-dev, libdotconf-dev, po-debconf
+Standards-Version: 3.8.0
Package: sbox-dtc
Section: web
Priority: optional
Architecture: any
-Depends: debconf, libdotconf1.0, passwd
+Depends: debconf, libdotconf1.0, passwd, ${shlibs:Depends}
Recommends: apache2 | httpd-cgi
Description: A CGI wrapper script for chrooted environment for hosting
Sbox is a CGI wrapper script that allows Web site hosting
diff -u sbox-dtc-1.11/debian/config sbox-dtc-1.11/debian/config
--- sbox-dtc-1.11/debian/config
+++ sbox-dtc-1.11/debian/config
@@ -1,9 +1,11 @@
#!/bin/sh
+set -e
+
. /usr/share/debconf/confmodule
db_version 2.0
-db_input medium sbox-dtc/conf_use_dtc_dtcgrp
+db_input medium sbox-dtc/conf_use_dtc_dtcgrp || true
db_go
diff -u sbox-dtc-1.11/debian/copyright sbox-dtc-1.11/debian/copyright
--- sbox-dtc-1.11/debian/copyright
+++ sbox-dtc-1.11/debian/copyright
@@ -5,8 +5,8 @@
License:
- Copyright (C) Lincoln D. Stein <lstein@cshl.org>
- Copyright (C) Thomas Goirand <thomas@goirand.fr>
+ Copyright (C) 1997-1998 Lincoln D. Stein <lstein@cshl.org>
+ Copyright (C) 2005-2008 Thomas Goirand <thomas@goirand.fr>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
only in patch2:
unchanged:
--- sbox-dtc-1.11.orig/debian/watch
+++ sbox-dtc-1.11/debian/watch
@@ -0,0 +1,2 @@
+version=3
+ftp://ftp.gplhost.com/debian/dists/etch/main/source/sbox-dtc_(.*).dsc
only in patch2:
unchanged:
--- sbox-dtc-1.11.orig/debian/po/sv.po
+++ sbox-dtc-1.11/debian/po/sv.po
@@ -0,0 +1,39 @@
+# translation of sbox-dtc.po to swedish
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the DTC package.
+#
+# Martin Bagge <brother@bsnet.se>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: sbox-dtc\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-11-26 04:32+0100\n"
+"PO-Revision-Date: 2008-09-25 12:32+0100\n"
+"Last-Translator: Martin Bagge <brother@bsnet.se>\n"
+"Language-Team: swedish <debian-l10n-swedish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Use dtc:dtcgrp for the sbox binary?"
+msgstr "Ska dtc:dtcgrp användas för sbox binären?"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"Under Debian, apache or apache2 runs under www-data:www-data. This is ok if "
+"running only apache, but if using sbox-dtc together with the DTC control "
+"panel, you need to have sbox chown to dtc:dtcgrp. In that case, you want "
+"create the dtc user and dtcgrp group, and chown the sbox binary to dtc:"
+"dtcgrp, otherwise you don't."
+msgstr ""
+"I Debian körs apache och apache2 med användare och grupp www-data. Om du "
+"bara kör apache är detta helt okej men och du kör sbox-dtc tillsammans med "
+"DTC kontrollpanelen så måste sbox vara inställd på dtc:dtcgrp.I det fallet "
+"vill du skapa användaren dtc och gruppen dtcgrp samt ändra inställningen på "
+"sbox-binären - i övriga fall vill du inte göra detta."
Reply to: