--- neutrino-0.8.4.orig/id3/mp3file.c +++ neutrino-0.8.4/id3/mp3file.c @@ -26,6 +26,7 @@ #include #include #include "nomad-id3-util.h" +#include "../libnomad/nomad-util.h" /* * The following code is extracted from gtkpod, which in turn --- neutrino-0.8.4.orig/id3/nomad-id3-filename.c +++ neutrino-0.8.4/id3/nomad-id3-filename.c @@ -29,6 +29,8 @@ #include "nomad-id3-filename.h" +#include "nomad-id3-util.h" + static const gchar *chomp_strings[] = { /* What a decoder is it that puts !s at the end of every filename * and a N01Songtitle thing at the beginning of the file??? */ --- neutrino-0.8.4.orig/src/Makefile.in +++ neutrino-0.8.4/src/Makefile.in @@ -47,7 +47,7 @@ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = stamp-neutrinomarshal.c stamp-neutrinomarshal.h am__installdirs = "$(DESTDIR)$(bindir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) @@ -277,10 +277,7 @@ neutrino-main.c EXTRA_DIST = neutrinomarshal.list -MAINTAINERCLEANFILES = \ - $(BUILT_SOURCES) \ - stamp-neutrinomarshal.c \ - stamp-neutrinomarshal.h +MAINTAINERCLEANFILES = $(BUILT_SOURCES) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am --- neutrino-0.8.4.orig/data/neutrino.desktop.in +++ neutrino-0.8.4/data/neutrino.desktop.in @@ -1,6 +1,8 @@ [Desktop Entry] -_Name=Nomad Jukebox Manager +_Name=Neutrino +_GenericName=Nomad Jukebox Manager _Comment=Upload, Download, and Edit tracks on your Creative Nomad / D.A.P Jukebox +Icon=/usr/share/neutrino/pixmaps/rhythmbox-library.png Exec=neutrino Terminal=0 Type=Application --- neutrino-0.8.4.orig/data/Makefile.in +++ neutrino-0.8.4/data/Makefile.in @@ -44,7 +44,7 @@ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = neutrino.schemas SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ --- neutrino-0.8.4.orig/debian/docs +++ neutrino-0.8.4/debian/docs @@ -0,0 +1,2 @@ +README +TODO --- neutrino-0.8.4.orig/debian/control +++ neutrino-0.8.4/debian/control @@ -0,0 +1,14 @@ +Source: neutrino +Section: gnome +Priority: optional +Maintainer: Debian QA Group +Build-Depends: libnjb-dev (>> 2.2), libgnomeui-dev, libxml-parser-perl, scrollkeeper, debhelper +Standards-Version: 3.6.2.2 + +Package: neutrino +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: GNOME shell for managing your Creative Labs Nomad Jukebox + Neutrino is a GNOME shell for managing your Creative Labs Nomad + Jukebox or D.A.P Jukebox. The jukebox code was derived from that of + GNOMAD, a GTK+ shell with similar goals. --- neutrino-0.8.4.orig/debian/rules +++ neutrino-0.8.4/debian/rules @@ -0,0 +1,40 @@ +#!/usr/bin/make -f + +build: build-stamp +build-stamp: + ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc + $(MAKE) + touch $@ + +install: build + dh_clean -k + $(MAKE) DESTDIR=$(PWD)/debian/neutrino install + +clean: + rm -f build-stamp + dh_clean + -$(MAKE) distclean + rm -f data/neutrino.desktop \ + intltool-extract intltool-merge intltool-update + +binary-indep: + +binary-arch: install + dh_gconf -a + dh_installchangelogs -a ChangeLog + dh_installdeb -a + dh_installdocs -a + dh_installexamples -a + dh_installman -a + dh_compress -a + dh_fixperms -a + dh_strip -a + dh_makeshlibs -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch + +.PHONY: build install clean binary-indep binary-arch binary --- neutrino-0.8.4.orig/debian/watch +++ neutrino-0.8.4/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://heanet.dl.sourceforge.net/sourceforge/neutrino/ neutrino-(.*)\.tar\.gz debian uupdate --- neutrino-0.8.4.orig/debian/changelog +++ neutrino-0.8.4/debian/changelog @@ -0,0 +1,93 @@ +neutrino (0.8.4-6) unstable; urgency=low + + * QA Group upload orphaning this package + + -- Andrew Pollock Thu, 27 Apr 2006 22:48:08 -0700 + +neutrino (0.8.4-5) unstable; urgency=low + + * Use dh_gconf. Closes: #340519. + * Update the copyright file. + * Update the watch file. + * Update the Debian policy to version 3.6.2.2. No changes necessary. + + -- Shaun Jackman Sun, 9 Apr 2006 13:29:15 -0600 + +neutrino (0.8.4-4) unstable; urgency=low + + * Fix for 64-bit architectures. Closes: #324048. + Thanks to Dann Frazier . + + -- Shaun Jackman Tue, 23 Aug 2005 14:37:22 -0700 + +neutrino (0.8.4-3) unstable; urgency=low + + * Add a versioned dependency for libnjb-dev (>> 2.2). Closes: #323883. + + -- Shaun Jackman Fri, 19 Aug 2005 10:01:56 -0700 + +neutrino (0.8.4-2) unstable; urgency=low + + * Update the watch file. + + -- Shaun Jackman Tue, 16 Aug 2005 14:07:13 -0700 + +neutrino (0.8.4-1) unstable; urgency=low + + * New upstream release. + * Fix the crash at startup with the Nomad Zen Xtra. Closes: #320277. + * Update the watch file. + + -- Shaun Jackman Tue, 16 Aug 2005 13:18:46 -0700 + +neutrino (0.8.2-1) unstable; urgency=low + + * New upstream release. + * Build using libnjb4. + * Rebuild without libhowl0 (closes: #300979). + + -- Shaun Jackman Mon, 14 Mar 2005 15:07:44 -0800 + +neutrino (0.7.3-5) unstable; urgency=low + + * Patch libegg (closes: #287808). + * Recompile against libnjb2. + + -- Shaun Jackman Thu, 30 Dec 2004 00:39:40 -0800 + +neutrino (0.7.3-4) unstable; urgency=low + + * Add libxml-parser-perl to the build dependencies (closes: #284970). For + true, this time. + + -- Shaun Jackman Fri, 17 Dec 2004 10:19:03 -0800 + +neutrino (0.7.3-3) unstable; urgency=low + + * Add libxml-parser-perl to the build dependencies (closes: #284970) because + intltool requires it. Perhaps this can be run in advance to avoid the + dependency. + + -- Shaun Jackman Sun, 12 Dec 2004 19:53:58 -0800 + +neutrino (0.7.3-2) unstable; urgency=low + + * Undefine GTK_DISABLE_DEPRECATED in all the files that use a + deprecated API (closes: #281549). + * Remove libgdk-pixbuf-dev from the build dependencies. + + -- Shaun Jackman Mon, 6 Dec 2004 16:28:00 -0800 + +neutrino (0.7.3-1) unstable; urgency=low + + * New upstream release. + * Move from experimental to unstable. + + -- Shaun Jackman Fri, 3 Sep 2004 09:45:18 -0700 + +neutrino (0.7.2-1) experimental; urgency=low + + * Initial Release. + + -- Shaun Jackman Mon, 24 May 2004 22:24:46 -0700 + --- neutrino-0.8.4.orig/debian/manpages +++ neutrino-0.8.4/debian/manpages @@ -0,0 +1 @@ +debian/neutrino.1 --- neutrino-0.8.4.orig/debian/compat +++ neutrino-0.8.4/debian/compat @@ -0,0 +1 @@ +4 --- neutrino-0.8.4.orig/debian/copyright +++ neutrino-0.8.4/debian/copyright @@ -0,0 +1,28 @@ +This package was debianized by Shaun Jackman on +2004-05-24. + +It was downloaded from http://neutrino.sourceforge.net/ + +Upstream Author: David A Knight + +Copyright: + +Copyright 2003 David A Knight +Copyright 2002 Marco Pesenti Gritti +Copyright 2001 Cedric Tefft +Copyright 2001 Linus Walleij +Copyright 2001 Eazel, Inc. + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +On Debian systems, the complete text of the GNU General Public +License can be found in /usr/share/common-licenses/GPL +or obtained from the Free Software Foundation. --- neutrino-0.8.4.orig/debian/neutrino.1 +++ neutrino-0.8.4/debian/neutrino.1 @@ -0,0 +1,126 @@ +.TH NEUTRINO "1" "May 2004" "neutrino 0.7.3" "User Commands" +.SH NAME +neutrino \- transfer files to and from a Creative Labs Nomad Jukebox +.SH SYNOPSIS +.B neutrino +[\fIOPTION\fR]... +.SH DESCRIPTION +Neutrino is a GNOME shell for managing your Creative Labs Nomad +Jukebox or DAP Jukebox. The jukebox code was derived from that of +GNOMAD, a GTK+ shell with similar goals. +.SH OPTIONS +.TP +\fB\-\-load\-modules\fR=\fIMODULE1\fR,MODULE2,... +Dynamic modules to load +.SS "Help options" +.TP +-?, \fB\-\-help\fR +Show this help message +.TP +\fB\-\-usage\fR +Display brief usage message +.SS "Application options" +.TP +\fB\-q\fR, \fB\-\-quit\fR +Close the Neutrino server down +.TP +\fB\-\-oaf\-ior\-fd\fR=\fIFD\fR +File descriptor to print IOR on +.TP +\fB\-\-oaf\-activate\-iid\fR=\fIIID\fR +IID to activate +.TP +\fB\-\-oaf\-private\fR +Prevent registering of server with OAF +.SS "GTK+" +.TP +\fB\-\-gdk\-debug\fR=\fIFLAGS\fR +Gdk debugging flags to set +.TP +\fB\-\-gdk\-no\-debug\fR=\fIFLAGS\fR +Gdk debugging flags to unset +.TP +\fB\-\-display\fR=\fIDISPLAY\fR +X display to use +.TP +\fB\-\-screen\fR=\fISCREEN\fR +X screen to use +.TP +\fB\-\-sync\fR +Make X calls synchronous +.TP +\fB\-\-name\fR=\fINAME\fR +Program name as used by the window +manager +.TP +\fB\-\-class\fR=\fICLASS\fR +Program class as used by the window +manager +.HP +\fB\-\-gxid\-host\fR=\fIHOST\fR +.HP +\fB\-\-gxid\-port\fR=\fIPORT\fR +.TP +\fB\-\-gtk\-debug\fR=\fIFLAGS\fR +Gtk+ debugging flags to set +.TP +\fB\-\-gtk\-no\-debug\fR=\fIFLAGS\fR +Gtk+ debugging flags to unset +.TP +\fB\-\-g\-fatal\-warnings\fR +Make all warnings fatal +.TP +\fB\-\-gtk\-module\fR=\fIMODULE\fR +Load an additional Gtk module +.SS "Bonobo activation Support" +.TP +\fB\-\-oaf\-ior\-fd\fR=\fIFD\fR +File descriptor to print IOR on +.TP +\fB\-\-oaf\-activate\-iid\fR=\fIIID\fR +IID to activate +.TP +\fB\-\-oaf\-private\fR +Prevent registering of server with OAF +.SS "GNOME Library" +.TP +\fB\-\-disable\-sound\fR +Disable sound server usage +.TP +\fB\-\-enable\-sound\fR +Enable sound server usage +.TP +\fB\-\-espeaker\fR=\fIHOSTNAME\fR:PORT +Host:port on which the sound server +to use is running +.TP +\fB\-\-version\fR +0.7.3 +.SS "Session management" +.TP +\fB\-\-sm\-client\-id\fR=\fIID\fR +Specify session management ID +.TP +\fB\-\-sm\-config\-prefix\fR=\fIPREFIX\fR +Specify prefix of saved configuration +.TP +\fB\-\-sm\-disable\fR +Disable connection to session manager +.SS "GNOME GUI Library" +.HP +\fB\-\-disable\-crash\-dialog\fR +.SH AUTHOR +Written by David A Knight. + +This manual page was written by Shaun Jackman +for the Debian system. +.SH "REPORTING BUGS" +Report bugs to David A Knight . +.SH COPYRIGHT +Copyright 2003 David A Knight + +This is free software; see the source for copying conditions. There is +NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR +PURPOSE. +.SH "SEE ALSO" +http://neutrino.sourceforge.net/ --- neutrino-0.8.4.orig/libnomad/Makefile.in +++ neutrino-0.8.4/libnomad/Makefile.in @@ -46,7 +46,7 @@ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = stamp-nomadmarshal.c stamp-nomadmarshal.h LTLIBRARIES = $(noinst_LTLIBRARIES) libnomad_la_DEPENDENCIES = am__objects_1 = nomadmarshal.lo @@ -250,10 +250,7 @@ libnomad_la_LDFLAGS = -export-dynamic libnomad_la_LIBADD = $(NJB_LDFLAGS) EXTRA_DIST = nomadmarshal.list -MAINTAINERCLEANFILES = \ - $(BUILT_SOURCES) \ - stamp-nomadmarshal.c \ - stamp-nomadmarshal.h +MAINTAINERCLEANFILES = $(BUILT_SOURCES) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am