Hi Joe, I'm uploading an NMU mostly to fix the aclocal warning, and as I was at it, fixed some other bug reports and packaging issues. Please, upload directly to unstable before 7 days if you want to override this NMU.
On the other hand this is the tenth consecutive NMU to this package and no maintainer upload has been made since the end of 2003. Maybe it would be a good idea to move the maintainership of this package to the SDL team (CCed them), or at least orphan it? I've attached the debdiff. regards, guillem
diff -u smpeg-0.4.5+cvs20030824/debian/control smpeg-0.4.5+cvs20030824/debian/control --- smpeg-0.4.5+cvs20030824/debian/control +++ smpeg-0.4.5+cvs20030824/debian/control @@ -2,8 +2,8 @@ Section: libs Priority: optional Maintainer: Joe Drew <[EMAIL PROTECTED]> -Build-Depends: dpkg (>= 1.7.2), debhelper (>= 3.0.0), libsdl1.2-dev (>= 1.2.2-3.1), libgtk1.2-dev (>= 1.2.1), libglib1.2-dev -Standards-Version: 3.6.1 +Build-Depends: debhelper (>= 5), libsdl1.2-dev (>= 1.2.2-3.1), libgtk1.2-dev (>= 1.2.1), libglib1.2-dev +Standards-Version: 3.7.2 Package: libsmpeg0 Architecture: any @@ -25,7 +25,7 @@ Package: libsmpeg-dev Architecture: any Section: libdevel -Depends: libsmpeg0 (= ${Source-Version}), libsdl1.2-dev (>= 1.2.2-3.3) +Depends: libsmpeg0 (= ${binary:Version}), libsdl1.2-dev (>= 1.2.2-3.3) Description: SDL MPEG Player Library - development files SMPEG (SDL MPEG Player Library) is a free MPEG1 video player library with sound support. Video playback is based on the ubiquitous Berkeley MPEG diff -u smpeg-0.4.5+cvs20030824/debian/changelog smpeg-0.4.5+cvs20030824/debian/changelog --- smpeg-0.4.5+cvs20030824/debian/changelog +++ smpeg-0.4.5+cvs20030824/debian/changelog @@ -1,3 +1,32 @@ +smpeg (0.4.5+cvs20030824-1.10) unstable; urgency=low + + * Non-maintainer upload. + * Fix aclocal warnings in smpeg.m4 due to missing quotation. + (Closes: #310636, #418292) + * Update smpeg.m4 so that 'autoreconf -Wall' will not produce warnings + about deprecated macro usage. + * Fix typos in gtv.1 and plaympeg.1 manpages (secons -> seconds). + Thanks to A Costa <[EMAIL PROTECTED]>. (Closes: #302664, #350354) + * Reword the copyright file: (Closes: #290206) + - Add upstream author information. + - Use 'License' instead of 'Copyright'. + * Use binary:Version substvar instead of the deprecated Source-Version. + * Remove unneeded dpkg versioned Build-Depends. + * Switch to Standards-Version 3.7.2. + * Switch to debhelper compatibility level 5. + * Switch from DH_COMPAT to debian/compat. + * Remove uneeded INSTALL_PROGRAM usage. + * Add '-Wall' to CFLAGS. + * Pass CXXFLAGS to configure so that DEB_BUILD_OPTIONS are honoured. + * Use $(CURDIR) instead if `pwd`. + * Do not use a build stamp. + * Add build-arch and build-indep targets and make build depend on both. + * Create a new config.status target which handles the configure stage. + * Remove uneeded DEB_HOST_ARCH. + * Pass '--host' and '--build' options to configure to allow cross-compiling. + + -- Guillem Jover <[EMAIL PROTECTED]> Sun, 27 May 2007 04:06:31 +0300 + smpeg (0.4.5+cvs20030824-1.9) unstable; urgency=low * Build using the default g++ on s390. Closes: #343020. diff -u smpeg-0.4.5+cvs20030824/debian/rules smpeg-0.4.5+cvs20030824/debian/rules --- smpeg-0.4.5+cvs20030824/debian/rules +++ smpeg-0.4.5+cvs20030824/debian/rules @@ -1,33 +1,26 @@ #!/usr/bin/make -f -# debian/rules file for smpeg (uses debhelper V2) +# debian/rules file for smpeg # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# This is the debhelper compatability version to use. -export DH_COMPAT=2 +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) # Handle DEB_BUILD_OPTIONS -CFLAGS = -g -INSTALL_PROGRAM = /usr/bin/install -c +CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else CFLAGS += -O2 endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) -INSTALL_PROGRAM += -s -endif - -DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) CXX = g++ -build: build-stamp -build-stamp: +config.status: configure dh_testdir - + # Work around aclocal.m4 getting patched before others # which matters on slow buildds touch aclocal.m4 @@ -37,17 +30,28 @@ touch config.h.in touch stamp-h.in touch configure + + CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" CXX=$(CXX) ./configure \ + --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr \ + --enable-mmx=no \ + --enable-opengl-player=no - CFLAGS="$(CFLAGS)" CXX=$(CXX) ./configure --prefix=/usr --enable-mmx=no --enable-opengl-player=no +build-indep: +build-arch: config.status + dh_testdir + $(MAKE) - touch build-stamp + +build: build-arch build-indep clean: dh_testdir dh_testroot - rm -f build-stamp install-stamp + -$(MAKE) distclean + dh_clean install: DH_OPTIONS=-a @@ -56,7 +60,8 @@ dh_testroot dh_clean -k dh_installdirs - INSTALL_PROGRAM="$(INSTALL_PROGRAM)" $(MAKE) install prefix=`pwd`/debian/tmp/usr + + $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr dh_movefiles diff -u smpeg-0.4.5+cvs20030824/debian/copyright smpeg-0.4.5+cvs20030824/debian/copyright --- smpeg-0.4.5+cvs20030824/debian/copyright +++ smpeg-0.4.5+cvs20030824/debian/copyright @@ -5,10 +5,15 @@ -http://www.lokigames.com/development/smpeg.php3. +<http://www.lokigames.com/development/smpeg.php3>. -Copyright: +Upstream author: -SMPEG is offered under the GNU Library Public License (LGPL), the plaympeg -command line player and the gtk GUI player are licensed under the GNU General -Public License (GPL). + Copyright (C) 1999 Loki Entertainment Software + +License: + + SMPEG is offered under the GNU Library Public License (LGPL). + The plaympeg command line player and the gtk GUI player are licensed + under the GNU General Public License (GPL). The full text of the GPL and LGPL may be found on Debian systems in the files /usr/share/common-licenses/GPL and /usr/share/common-licenses/LGPL. + only in patch2: unchanged: --- smpeg-0.4.5+cvs20030824.orig/gtv.1 +++ smpeg-0.4.5+cvs20030824/gtv.1 @@ -15,7 +15,7 @@ The video player works best on a 16 bit color depth X11 display, it works on other color depths with reduced speed as well. You'll need a CPU with 300 MHz or more to play back an MPEG system stream with 25 frames -per secons (fps) at full speed. +per seconds (fps) at full speed. .SH "SEE ALSO" SMPEG home page at http://www.lokigames.com/development/smpeg.php3 only in patch2: unchanged: --- smpeg-0.4.5+cvs20030824.orig/debian/compat +++ smpeg-0.4.5+cvs20030824/debian/compat @@ -0,0 +1 @@ +5 only in patch2: unchanged: --- smpeg-0.4.5+cvs20030824.orig/plaympeg.1 +++ smpeg-0.4.5+cvs20030824/plaympeg.1 @@ -15,7 +15,7 @@ The video player works best on a 16 bit color depth X11 display, it works on other color depths with reduced speed as well. You'll need a CPU with 300 MHz or more to play back an MPEG system stream with 25 frames -per secons (fps) at full speed. +per seconds (fps) at full speed. .SH OPTIONS .TP only in patch2: unchanged: --- smpeg-0.4.5+cvs20030824.orig/smpeg.m4 +++ smpeg-0.4.5+cvs20030824/smpeg.m4 @@ -6,20 +6,25 @@ # stolen from Manish Singh # Shamelessly stolen from Owen Taylor -dnl AM_PATH_SMPEG([MINIMUM-VERSION, [ACTION-IF-FOUND [, -ACTION-IF-NOT-FOUND]]]) +dnl AM_PATH_SMPEG([MINIMUM-VERSION, [ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]]) dnl Test for SMPEG, and define SMPEG_CFLAGS and SMPEG_LIBS dnl -AC_DEFUN(AM_PATH_SMPEG, +AC_DEFUN([AM_PATH_SMPEG], [dnl dnl Get the cflags and libraries from the smpeg-config script dnl -AC_ARG_WITH(smpeg-prefix,[ --with-smpeg-prefix=PFX Prefix where SMPEG is installed (optional)], - smpeg_prefix="$withval", smpeg_prefix="") -AC_ARG_WITH(smpeg-exec-prefix,[ --with-smpeg-exec-prefix=PFX Exec prefix where SMPEG is installed (optional)], - smpeg_exec_prefix="$withval", smpeg_exec_prefix="") -AC_ARG_ENABLE(smpegtest, [ --disable-smpegtest Do not try to compile and run a test SMPEG program], - , enable_smpegtest=yes) +AC_ARG_WITH([smpeg-prefix], + AS_HELP_STRING([--with-smpeg-prefix=PFX], + [Prefix where SMPEG is installed (optional)]), + [smpeg_prefix="$withval"], [smpeg_prefix=""]) +AC_ARG_WITH([smpeg-exec-prefix], + AS_HELP_STRING([--with-smpeg-exec-prefix=PFX], + [Exec prefix where SMPEG is installed (optional)]), + [smpeg_exec_prefix="$withval"], [smpeg_exec_prefix=""]) +AC_ARG_ENABLE([smpegtest], + AS_HELP_STRING([--disable-smpegtest], + [Do not try to compile and run a test SMPEG program]), + [], [enable_smpegtest=yes]) if test x$smpeg_exec_prefix != x ; then smpeg_args="$smpeg_args --exec-prefix=$smpeg_exec_prefix" @@ -34,9 +39,9 @@ fi fi - AC_PATH_PROG(SMPEG_CONFIG, smpeg-config, no) - min_smpeg_version=ifelse([$1], ,0.2.7,$1) - AC_MSG_CHECKING(for SMPEG - version >= $min_smpeg_version) + AC_PATH_PROG([SMPEG_CONFIG], [smpeg-config], [no]) + min_smpeg_version=ifelse([$1], [], [0.2.7], [$1]) + AC_MSG_CHECKING([for SMPEG - version >= $min_smpeg_version]) no_smpeg="" if test "$SMPEG_CONFIG" = "no" ; then no_smpeg=yes @@ -60,7 +65,7 @@ dnl checks the results of smpeg-config to some extent dnl rm -f conf.smpegtest - AC_TRY_RUN([ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -117,16 +122,16 @@ } } -],, no_smpeg=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) +]])],[],[no_smpeg=yes], [echo $ac_n "cross compiling; assumed OK... $ac_c"]) CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" fi fi if test "x$no_smpeg" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) + AC_MSG_RESULT([yes]) + ifelse([$2], [], [:], [$2]) else - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) if test "$SMPEG_CONFIG" = "no" ; then echo "*** The smpeg-config script installed by SMPEG could not be found" echo "*** If SMPEG was installed in PREFIX, make sure PREFIX/bin is in" @@ -139,10 +144,11 @@ echo "*** Could not run SMPEG test program, checking why..." CFLAGS="$CFLAGS $SMPEG_CFLAGS $SDL_CFLAGS" LIBS="$LIBS $SMPEG_LIBS $SDL_LIBS" - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include <stdio.h> #include "smpeg.h" -], [ return 0; ], +]], + [[ return 0; ]])], [ echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding SMPEG or finding the wrong" echo "*** version of SMPEG. If it is not finding SMPEG, you'll need to set your" @@ -162,9 +168,9 @@ fi SMPEG_CFLAGS="" SMPEG_LIBS="" - ifelse([$3], , :, [$3]) + ifelse([$3], [], [:], [$3]) fi - AC_SUBST(SMPEG_CFLAGS) - AC_SUBST(SMPEG_LIBS) + AC_SUBST([SMPEG_CFLAGS]) + AC_SUBST([SMPEG_LIBS]) rm -f conf.smpegtest ])