new translation, fix braino

git-svn-id: svn://svn.1ts.org/debian/trunk@516 cbed1d16-5ef5-0310-b6a1-d4a37b08ba1f

diff --git a/zephyr/debian/changelog b/zephyr/debian/changelog
index b3279720a831a3d440f37d1706ea603aac9d7175..23a71e863712746c28c9d3e19045ca773fbec75e 100644 (file)
--- a/zephyr/debian/changelog
+++ b/zephyr/debian/changelog
@@ -1,8 +1,13 @@
-zephyr (3.0.2-1) UNRELEASED; urgency=low
+zephyr (3.0.2-1) unstable; urgency=low
 
   * New upstream release.
+  * Actually insulate the postinst from the rc script failing.
+    Closes: #638260
+  * Install a Danish debconf tranlation, thanks to Joe Dalton.
+    Closes: #621365
+  * Update Standards-Version.
 
- -- Karl Ramm <kcr@1ts.org>  Mon, 30 Jan 2012 00:50:52 -0500
+ -- Karl Ramm <kcr@debian.org>  Mon, 30 Jan 2012 11:18:54 -0500
 
 zephyr (3.0.1-1) unstable; urgency=low
 

diff --git a/zephyr/debian/control b/zephyr/debian/control
index e2741bb0fbae1e804d7161f18b53a982d49e81c7..f13d6ba6901db669bf592aba67d1bc3a01ebbdb9 100644 (file)
--- a/zephyr/debian/control
+++ b/zephyr/debian/control
@@ -6,7 +6,7 @@ Uploaders: Sam Hartman <hartmans@debian.org>
 Build-Depends: debhelper (>= 7), libc-ares-dev, libkrb5-dev (>= 1.2.2-4), comerr-dev, ss-dev,
                libreadline-dev | libreadline5-dev, libx11-dev, libxt-dev, x11proto-core-dev, libncurses5-dev,
               bison, libhesiod-dev, autotools-dev, libtool, autoconf, lsb-release
-Standards-Version: 3.9.1.0
+Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.1ts.org/debian/branches/zephyr-reloaded/zephyr
 
 Package: libzephyr4

diff --git a/zephyr/debian/po/da.po b/zephyr/debian/po/da.po
new file mode 100644 (file)
index 0000000..7259c26
--- /dev/null
+++ b/zephyr/debian/po/da.po
@@ -0,0 +1,48 @@
+# Danish translation zephyr.
+# Copyright (C) 2011 zephyr & nedenstående oversættere.
+# This file is distributed under the same license as the zephyr package.
+# Joe Hansen <joedalton2@yahoo.dk>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: zephyr VERSION\n"
+"Report-Msgid-Bugs-To: Source: zephyr@packages.debian.org\n"
+"POT-Creation-Date: 2007-12-05 09:47+0530\n"
+"PO-Revision-Date: 2011-04-03 17:30+01:00\n"
+"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
+"Language-Team: Danish <debian-l10n-danish@lists.debian.org> \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
+msgid "Zephyr servers:"
+msgstr "Zephyrservere:"
+
+#. Type: string
+#. Description
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
+msgid ""
+"Please specify the full names of the Zephyr servers, as a space-separated "
+"list."
+msgstr ""
+"Angiv venligst det fulde navn på Zephyrserverne som en mellemrumsadskilt "
+"liste."
+
+#. Type: string
+#. Description
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
+msgid ""
+"The list configured on clients can be a subset of the list configured on "
+"servers."
+msgstr ""
+"Listen konfigureret på klienter kan være et undersæt af listen konfigureret "
+"på servere."
+
+#. Type: string
+#. Description
+#: ../zephyr-clients.templates:2001
+msgid "This can be left empty if Hesiod is used to advertise Zephyr servers."
+msgstr "Denne kan efterlades tom hvis Hesiod bruges til at annoncere Zephyrservere."

diff --git a/zephyr/debian/rules b/zephyr/debian/rules
index 71dc4d4d91f50e591cb62eec138dd50926d0466a..7a6e6de8088006cf1b6087234860dd19e485fd37 100755 (executable)
--- a/zephyr/debian/rules
+++ b/zephyr/debian/rules
@@ -59,8 +59,10 @@ configure-stamp: stash-stamp
        $(foreach VARIETY,$(BUILD_VARIETALS),(cd $(VARIETY) && CFLAGS="$(CFLAGS)" ../configure $(CONFIGURE_$(VARIETY)) $(CONFIGURE_ROOT));)
        touch configure-stamp
 
-build: configure-stamp build-stamp
-build-stamp:
+build: build-stamp
+build-arch: build-stamp
+build-indep: build-stamp
+build-stamp: configure-stamp
        dh_testdir
 
        # Add here commands to compile the package.

diff --git a/zephyr/debian/source/options b/zephyr/debian/source/options
new file mode 100644 (file)
index 0000000..7423a2d
--- /dev/null
+++ b/zephyr/debian/source/options
@@ -0,0 +1 @@
+single-debian-patch

diff --git a/zephyr/debian/zephyr-clients.postinst b/zephyr/debian/zephyr-clients.postinst
index e358728eefcc50dcdacdd6b493c85db752507000..3efe762f118be5cd8750effccb9a560e0d4cb74b 100644 (file)
--- a/zephyr/debian/zephyr-clients.postinst
+++ b/zephyr/debian/zephyr-clients.postinst
@@ -70,9 +70,9 @@ esac
 if [ -x "/etc/init.d/zhm" ]; then
        # this script does not necessarily fail if these do
         if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-                invoke-rc.d zhm restart
+                invoke-rc.d zhm restart || true
         else
-                /etc/init.d/zhm restart
+                /etc/init.d/zhm restart || true
         fi
 fi