tag 461794 patch tag 483767 patch tag 484414 patch thanks Hi,
The following is the diff for my nas 1.9.1-2.1 NMU.
diff -u nas-1.9.1/debian/rules nas-1.9.1/debian/rules
--- nas-1.9.1/debian/rules
+++ nas-1.9.1/debian/rules
@@ -20,13 +20,13 @@
# Make include symlinks
( cd include/audio; for file in ../../lib/audio/*.h; do ln -s $$file .;
done )
xmkmf -a
- make LDFLAGS="-s"
+ $(MAKE) LDFLAGS="-s"
touch build
clean:
FOO=bar; echo $$FOO
$(checkdir)
- -make clean
+ [ ! -f Makefile ] || $(MAKE) clean
find . -name Makefile -exec rm -f {} \;
find . -name '*~' -exec rm -f {} \;
# Clear up include symlinks
@@ -39,7 +39,7 @@
rm -f config/libtool libtool
rm -rf config/autom4te.cache
# So so ugly, but works.
- echo -e "#!/bin/sh\necho $(DEB_BUILD_GNU_TYPE)" > config/config.guess
+ printf "#!/bin/sh\necho %s\n" "$(DEB_BUILD_GNU_TYPE)" >
config/config.guess
chmod +x config/config.guess
binary-indep: checkroot
diff -u nas-1.9.1/debian/po/sv.po nas-1.9.1/debian/po/sv.po
--- nas-1.9.1/debian/po/sv.po
+++ nas-1.9.1/debian/po/sv.po
@@ -1,3 +1,4 @@
+# translation of nas_1.9.1-2_sv.po to swedish
#
# Translators, if you are not familiar with the PO format, gettext
# documentation is worth reading, especially sections dedicated to
@@ -11,17 +12,19 @@
#
# Developers do not need to manually edit POT or PO files.
#
+# Martin Bagge <[EMAIL PROTECTED]>, 2008.
msgid ""
msgstr ""
-"Project-Id-Version: nas 1.7-3\n"
+"Project-Id-Version: nas_1.9.1-2_sv\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
"POT-Creation-Date: 2007-09-22 09:00+0200\n"
-"PO-Revision-Date: 2006-01-19 11:56+0100\n"
-"Last-Translator: Daniel Nylander <[EMAIL PROTECTED]>\n"
-"Language-Team: Swedish <[EMAIL PROTECTED]>\n"
+"PO-Revision-Date: 2008-05-30 23:37+0200\n"
+"Last-Translator: Martin Bagge <[EMAIL PROTECTED]>\n"
+"Language-Team: swedish <[EMAIL PROTECTED]>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
#. Type: boolean
#. Description
@@ -33,10 +36,6 @@
#. Description
#: ../nas.templates:2001
#, fuzzy
-#| msgid ""
-#| "The NAS server will by default open the audio device configured on your "
-#| "system at startup, and then keep it open until it is stopped. This will "
-#| "stop any audio clients that are not NAS aware from using the audio device."
msgid ""
"By default, the NAS server will open the configured audio device at startup, "
"and then keep it open until the server is stopped. This will stop any non-"
@@ -54,17 +53,12 @@
"The daemon can be configured to release the audio device when it is not "
"using it, with some delay after the application completes before the device "
"is available."
-msgstr ""
+msgstr "Demonen kan st�llas in att sl�ppa ljudenheten n�r den inte anv�nds. En
viss f�rdr�jning kan f�rekomma efter att programmet avslutas innan
enheten �r tillg�nglig."
#. Type: boolean
#. Description
#: ../nas.templates:2001
#, fuzzy
-#| msgid ""
-#| "An alternative to this is to use the \"audiooss\" program (in the package "
-#| "of the same name) to wrap any programs that use /dev/dsp directly - it "
-#| "will intercept most uses of /dev/dsp and make the equivalent nas calls "
-#| "instead."
msgid ""
"An alternative is to use the \"audiooss\" package to wrap any programs that "
"use /dev/dsp to make them use equivalent NAS calls."
@@ -84,9 +78,6 @@
#. Description
#: ../nas.templates:3001
#, fuzzy
-#| msgid ""
-#| "The nas server will by default change the mixer settings at startup as "
-#| "follows:"
msgid ""
"If you choose this option, the NAS server will change the mixer settings at "
"startup as follows:"
@@ -98,9 +89,6 @@
#. Description
#: ../nas.templates:3001
#, fuzzy, no-c-format
-#| msgid ""
-#| " * set PCM volume to 50%\n"
-#| " * change the record input device to LINE"
msgid ""
" - set PCM volume to 50%;\n"
" - change the record input device to LINE."
@@ -111,26 +98,0 @@
-#~ msgid ""
-#~ "nasd can be configured to release the audio device when it is not "
-#~ "actively using it. There will almost always be a slight delay between the "
-#~ "application using nas finishing and the audio device becoming available "
-#~ "for other uses; this is due to the latency inherent in the design of nas "
-#~ "and so cannot really be changed."
-#~ msgstr ""
-#~ "nasd kan konfigureras att sl�ppa ljudenheten n�r den inte anv�nds aktivt. "
-#~ "Det kommer dock finnas en mindre f�rdr�jning n�r programmet som anv�nder "
-#~ "nas sl�pper taget och att ljudenheten ska bli tillg�nglig f�r annan "
-#~ "anv�ndning; det �r p� grund av �rvd latens i designen av nas och den kan "
-#~ "egentligen inte �ndras p�."
-
-#~ msgid ""
-#~ "Should nasd release the audio device? (It is recommended to select this "
-#~ "option unless you have special requirements.)"
-#~ msgstr ""
-#~ "Ska nasd sl�ppa ljudenheten? (Det rekommenderas att v�lja detta "
-#~ "alternativ om du inte har speciella krav.)"
-
-#~ msgid ""
-#~ "Do you want it to do this? (Most people are expected to disable this "
-#~ "option)"
-#~ msgstr ""
-#~ "Vill du g�ra det h�r? (De flesta f�rv�ntas att st�nga av den h�r "
-#~ "funktionen)"
diff -u nas-1.9.1/debian/changelog nas-1.9.1/debian/changelog
--- nas-1.9.1/debian/changelog
+++ nas-1.9.1/debian/changelog
@@ -1,3 +1,23 @@
+nas (1.9.1-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/rules:
+ + Don't ignore make errors on clean
+ + Replaced some make calls with $(MAKE)
+ + Fixed bashism (Closes: #484414)
+ * debian/control:
+ + Added Homepage field
+ + B-D on xutils-dev instead of the obsolete package xutils
+ * debian/watch: added
+ * debian/po:
+ + sv.po: Updated Swedish translation (Closes: #483767)
+ - Thanks to Martin Bagge <[EMAIL PROTECTED]>
+ + nl.po: Updated Dutch translation (Closes: #461794)
+ - Thanks to Vincent Zweije <[EMAIL PROTECTED]>
+ * Makefile: check if the makefile exists before trying to $(MAKE) clean
+
+ -- Raphael Geissert <[EMAIL PROTECTED]> Tue, 01 Jul 2008 16:33:41 -0500
+
nas (1.9.1-2) unstable; urgency=low
* Add LSB formatted dependency info in the nas init script. Thanks to
diff -u nas-1.9.1/debian/control nas-1.9.1/debian/control
--- nas-1.9.1/debian/control
+++ nas-1.9.1/debian/control
@@ -2,8 +2,9 @@
Section: sound
Priority: optional
Maintainer: Steve McIntyre <[EMAIL PROTECTED]>
-Build-Depends: libxp-dev, libxau-dev, libsm-dev, libice-dev, libx11-dev,
libxt-dev, libxaw7-dev, xutils, bison, flex, file, po-debconf
-Standards-Version: 3.7.2.0
+Build-Depends: libxp-dev, libxau-dev, libsm-dev, libice-dev, libx11-dev,
libxt-dev, libxaw7-dev, xutils-dev, bison, flex, file, po-debconf
+Standards-Version: 3.7.3.0
+Homepage: http://radscan.com/nas.html
Package: libaudio2
Priority: optional
only in patch2:
unchanged:
--- nas-1.9.1.orig/debian/watch
+++ nas-1.9.1/debian/watch
@@ -0,0 +1,3 @@
+version=3
+
+http://sf.net/nas/nas-(.+)(?:\.src)\.tar\.gz
signature.asc
Description: This is a digitally signed message part.
