From: <suc...@us...> - 2006-06-06 01:57:36
|
Revision: 40 Author: sucknblow Date: 2006-06-03 20:54:19 -0700 (Sat, 03 Jun 2006) ViewCVS: http://svn.sourceforge.net/pmplib/?rev=40&view=rev Log Message: ----------- Remove unnecessary packaging files. Don't include the Win32 libraries in the "make dist-bzip2" target, since we're not worrying about the Cygwin build. Modified Paths: -------------- trunk/debian/control trunk/debian/rules trunk/frontend/easypmp/cui/Makefile.am trunk/lib/gmi/Makefile.am trunk/lib/playlist/Makefile.am trunk/lib/pmp_iriverplus2/Makefile.am trunk/lib/pmp_iriverplus2/pmp_iriverplus2.c trunk/lib/pmp_irivnavi/Makefile.am trunk/lib/pmp_portalplayer1/Makefile.am Removed Paths: ------------- trunk/debian/postinst trunk/debian/postrm trunk/debian/preinst trunk/debian/prerm Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2006-06-04 02:27:26 UTC (rev 39) +++ trunk/debian/control 2006-06-04 03:54:19 UTC (rev 40) @@ -1,6 +1,6 @@ Source: pmplib Section: sound -Priority: optional +Priority: extra Maintainer: Martin Ellis <mar...@kd...> Build-Depends: debhelper (>= 4.0.0), libvorbis-dev, libid3tag0-dev, libmozjs-dev Standards-Version: 3.6.2 Deleted: trunk/debian/postinst =================================================================== --- trunk/debian/postinst 2006-06-04 02:27:26 UTC (rev 39) +++ trunk/debian/postinst 2006-06-04 03:54:19 UTC (rev 40) @@ -1,42 +0,0 @@ -#! /bin/sh -# postinst script for easypmp -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * <postinst> `configure' <most-recently-configured-version> -# * <old-postinst> `abort-upgrade' <new version> -# * <conflictor's-postinst> `abort-remove' `in-favour' <package> -# <new-version> -# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' -# <failed-install-package> <version> `removing' -# <conflicting-package> <version> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package -# - -case "$1" in - configure) - - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - Deleted: trunk/debian/postrm =================================================================== --- trunk/debian/postrm 2006-06-04 02:27:26 UTC (rev 39) +++ trunk/debian/postrm 2006-06-04 03:54:19 UTC (rev 40) @@ -1,38 +0,0 @@ -#! /bin/sh -# postrm script for easypmp -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * <postrm> `remove' -# * <postrm> `purge' -# * <old-postrm> `upgrade' <new-version> -# * <new-postrm> `failed-upgrade' <old-version> -# * <new-postrm> `abort-install' -# * <new-postrm> `abort-install' <old-version> -# * <new-postrm> `abort-upgrade' <old-version> -# * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - - - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 Deleted: trunk/debian/preinst =================================================================== --- trunk/debian/preinst 2006-06-04 02:27:26 UTC (rev 39) +++ trunk/debian/preinst 2006-06-04 03:54:19 UTC (rev 40) @@ -1,38 +0,0 @@ -#! /bin/sh -# preinst script for easypmp -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * <new-preinst> `install' -# * <new-preinst> `install' <old-version> -# * <new-preinst> `upgrade' <old-version> -# * <old-preinst> `abort-upgrade' <new-version> -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - install|upgrade) - ;; - - abort-upgrade) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - Deleted: trunk/debian/prerm =================================================================== --- trunk/debian/prerm 2006-06-04 02:27:26 UTC (rev 39) +++ trunk/debian/prerm 2006-06-04 03:54:19 UTC (rev 40) @@ -1,38 +0,0 @@ -#! /bin/sh -# prerm script for easypmp -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * <prerm> `remove' -# * <old-prerm> `upgrade' <new-version> -# * <new-prerm> `failed-upgrade' <old-version> -# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version> -# * <deconfigured's-prerm> `deconfigure' `in-favour' -# <package-being-installed> <version> `removing' -# <conflicting-package> <version> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - remove|upgrade|deconfigure) - ;; - failed-upgrade) - ;; - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2006-06-04 02:27:26 UTC (rev 39) +++ trunk/debian/rules 2006-06-04 03:54:19 UTC (rev 40) @@ -20,7 +20,7 @@ config.status: configure dh_testdir - LDFLAGS="$(LDFLAGS) -Wl,-z,defs" ./configure \ + CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" ./configure \ --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr \ Modified: trunk/frontend/easypmp/cui/Makefile.am =================================================================== --- trunk/frontend/easypmp/cui/Makefile.am 2006-06-04 02:27:26 UTC (rev 39) +++ trunk/frontend/easypmp/cui/Makefile.am 2006-06-04 03:54:19 UTC (rev 40) @@ -17,9 +17,10 @@ util.h \ main.c +easypmp_CPPFLAGS = -I$(srcdir)/../common AM_CFLAGS = @CFLAGS@ -INCLUDES = @INCLUDES@ -I../common +INCLUDES = @INCLUDES@ AM_LDFLAGS = @LDFLAGS@ easypmp_CFLAGS = -DPMP_JSPL_DIR="\"$(prefix)/share/pmp/jspl\"" Modified: trunk/lib/gmi/Makefile.am =================================================================== --- trunk/lib/gmi/Makefile.am 2006-06-04 02:27:26 UTC (rev 39) +++ trunk/lib/gmi/Makefile.am 2006-06-04 03:54:19 UTC (rev 40) @@ -16,7 +16,5 @@ $(top_builddir)/lib/filepath/libfilepath.la \ -no-undefined -EXTRA_DIST = contrib - AM_CFLAGS = @CFLAGS@ INCLUDES = @INCLUDES@ Modified: trunk/lib/playlist/Makefile.am =================================================================== --- trunk/lib/playlist/Makefile.am 2006-06-04 02:27:26 UTC (rev 39) +++ trunk/lib/playlist/Makefile.am 2006-06-04 03:54:19 UTC (rev 40) @@ -27,10 +27,10 @@ $(JS_LIBS) EXTRA_DIST = \ - sample/artist.jspl \ - sample/artists.jspl \ - sample/top_ranking.jspl \ - contrib + jspl/artist.jspl \ + jspl/artists.jspl \ + jspl/playlist.js \ + jspl/top_ranking.jspl AM_CFLAGS = @CFLAGS@ INCLUDES = @INCLUDES@ Modified: trunk/lib/pmp_iriverplus2/Makefile.am =================================================================== --- trunk/lib/pmp_iriverplus2/Makefile.am 2006-06-04 02:27:26 UTC (rev 39) +++ trunk/lib/pmp_iriverplus2/Makefile.am 2006-06-04 03:54:19 UTC (rev 40) @@ -25,7 +25,7 @@ iriverplus2_la_LDFLAGS = \ -no-undefined -module -avoid-version \ - -export-symbols ../pmp/pmp_plugin.sym + -export-symbols $(top_srcdir)/lib/pmp/pmp_plugin.sym iriverplus2_la_LIBADD = \ $(top_builddir)/lib/ucs2/libucs2.la \ Modified: trunk/lib/pmp_iriverplus2/pmp_iriverplus2.c =================================================================== --- trunk/lib/pmp_iriverplus2/pmp_iriverplus2.c 2006-06-04 02:27:26 UTC (rev 39) +++ trunk/lib/pmp_iriverplus2/pmp_iriverplus2.c 2006-06-04 03:54:19 UTC (rev 40) @@ -24,6 +24,9 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif/*HAVE_CONFIG_H*/ +#ifdef HAVE_STRING_H +#include <string.h> +#endif/*HAVE_STRING_H*/ #include <os.h> #include <stdio.h> Modified: trunk/lib/pmp_irivnavi/Makefile.am =================================================================== --- trunk/lib/pmp_irivnavi/Makefile.am 2006-06-04 02:27:26 UTC (rev 39) +++ trunk/lib/pmp_irivnavi/Makefile.am 2006-06-04 03:54:19 UTC (rev 40) @@ -15,7 +15,7 @@ irivnavi_la_LDFLAGS = \ -no-undefined -module -avoid-version \ - -export-symbols ../pmp/pmp_plugin.sym + -export-symbols $(top_srcdir)/lib/pmp/pmp_plugin.sym irivnavi_la_LIBADD = \ $(top_builddir)/lib/ucs2/libucs2.la \ Modified: trunk/lib/pmp_portalplayer1/Makefile.am =================================================================== --- trunk/lib/pmp_portalplayer1/Makefile.am 2006-06-04 02:27:26 UTC (rev 39) +++ trunk/lib/pmp_portalplayer1/Makefile.am 2006-06-04 03:54:19 UTC (rev 40) @@ -29,7 +29,7 @@ portalplayer1_la_LDFLAGS = \ -no-undefined -module -avoid-version \ - -export-symbols ../pmp/pmp_plugin.sym + -export-symbols $(top_srcdir)/lib/pmp/pmp_plugin.sym portalplayer1_la_LIBADD = \ $(top_builddir)/lib/ucs2/libucs2.la \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |