diffstat for nas_1.9.3-5 nas_1.9.3-SprezzOS1 config/NetAudio.tmpl | 4 ---- debian/watch | 2 ++ lib/audio/Imakefile | 8 ++++---- nas-1.9.3/debian/changelog | 12 ++++++++++++ nas-1.9.3/debian/control | 5 +++-- server/os/aulog.c | 2 +- 6 files changed, 22 insertions(+), 11 deletions(-) reverted: --- nas-1.9.3/server/os/aulog.c +++ nas-1.9.3.orig/server/os/aulog.c @@ -37,7 +37,7 @@ if (NasConfig.DoDaemon) { /* daemons use syslog */ openlog("nas", LOG_PID, LOG_DAEMON); + syslog(LOG_DEBUG, buf); - syslog(LOG_DEBUG, "%s", buf); closelog(); } else { errfd = stderr; reverted: --- nas-1.9.3/config/NetAudio.tmpl +++ nas-1.9.3.orig/config/NetAudio.tmpl @@ -53,10 +53,6 @@ /* CDEBUGFLAGS=/Zi */ #endif /* WIN32 */ -/* Some recent xorg breakage? We do not need to preprocess man pages. */ -#undef DontPreprocessManPages -#define DontPreprocessManPages YES - /* * Older X11 systems used to define SharedLibX and friends if the * installed X11 system was built with shared libs. Newer X11's use diff -u nas-1.9.3/debian/changelog nas-1.9.3/debian/changelog --- nas-1.9.3/debian/changelog +++ nas-1.9.3/debian/changelog @@ -1,3 +1,15 @@ +nas (1.9.3-SprezzOS1) unstable; urgency=low + + * SprezzOS build + + -- Nick Black Mon, 14 Jan 2013 15:43:09 -0500 + +nas (1.9.3-SprezzOS1) unstable; urgency=low + + * SprezzOS build + + -- Nick Black Sun, 06 Jan 2013 18:06:38 -0500 + nas (1.9.3-5) unstable; urgency=low * Remove Conflicts: nas-lib from libaudio2. diff -u nas-1.9.3/debian/control nas-1.9.3/debian/control --- nas-1.9.3/debian/control +++ nas-1.9.3/debian/control @@ -1,9 +1,10 @@ Source: nas Section: sound Priority: optional -Maintainer: Steve McIntyre <93sam@debian.org> +Maintainer: Nick Black +XSBC-Original-Maintainer: Steve McIntyre <93sam@debian.org> Build-Depends: autotools-dev, libxau-dev, libsm-dev, libice-dev, libx11-dev, libxt-dev, libxaw7-dev, xutils-dev, bison, flex, file, po-debconf, dpkg-dev (>= 1.16.0) -Standards-Version: 3.9.2.0 +Standards-Version: 3.9.4 Package: libaudio2 Priority: optional reverted: --- nas-1.9.3/lib/audio/Imakefile +++ nas-1.9.3.orig/lib/audio/Imakefile @@ -79,7 +79,7 @@ COMPAT_OBJS = AuGetBest.o #endif /* ProjectX < 5 */ + EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\" - EDB_DEFINES = -DERRORDB=\"/usr/share/libaudio2/AuErrorDB\" DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES) CONN_DEFINES = ConnectionFlags @@ -137,11 +137,11 @@ BuildIncludes($(HEADERS),audio,..) InstallMultiple($(HEADERS),$(INCDIR)) #if ProjectX >= 5 +InstallNonExecFile(AuErrorDB,$(LIBDIR)) -InstallNonExecFile(AuErrorDB,/usr/share/libaudio2) #else install:: $(MKDIRHIER) $(LIBDIR) +InstallNonExec(AuErrorDB,$(LIBDIR)) -InstallNonExec(AuErrorDB,/usr/share/libaudio2) #endif #if defined(HPArchitecture) && !defined(LinuxArchitecture) && !defined(GNUArchitecture) && !defined(DarwinArchitecture) @@ -151,7 +151,7 @@ #endif #if defined(LinuxArchitecture) || defined(GNUArchitecture) || defined(SunArchitecture) || defined(__FreeBSD_kernel__) || defined(DarwinArchitecture) +REQUIREDLIBS = -L$(USRLIBDIR) -lXt $(XAULIB) -lm -REQUIREDLIBS = -L$(USRLIBDIR) -lXt $(XAULIB) -lm $(LDFLAGS_DEF) #endif #if defined(cygwinArchitecture) only in patch2: unchanged: --- nas-1.9.3.orig/debian/watch +++ nas-1.9.3/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/nas/nas-([\d\.]+)\.src\.tar\..*