tags 421988 patch
tags 424401 patch
tags 424806 patch
tags 424573 patch
thanks
Hi Stuart,
Since ming seems to be accumulating RC bugs and one of these bugs is now
causing build failures in dependent packages
(http://buildd.debian.org/fetch.cgi?pkg=gnash&arch=alpha&ver=0.7.2%2Bcvs20070518.1557-1&stamp=1179829245),
I've taken the liberty of preparing a 0-day NMU to fix these four bugs.
The NMU diff is attached; I believe the changes are almost all
self-explanatory (or explained adequately in the changelog), except perhaps
the change to png2swf for bug #421988. I considered several different fixes
for 421988:
- have ming dpkg-divert swftools -- this would be inappropriate because the
two programs under the name png2swf aren't commandline-compatible.
- have ming conflict with swftools -- inappropriate for the same reason.
- rename png2swf to img2swf (the usage() function already used this name
rather than png2swf) -- overly intrusive, and even though the code
*should* work for both png and gif images, in practice png2swf.c has a
(questionable) check for the filename extension of the source file
- stop shipping png2swf at all -- I gave more than a passing thought to this
because the code doesn't seem to be well-integrated and the command isn't
even mentioned in the generic manpage for the package, but I concluded
that this would be more intrusive than is appropriate in an NMU.
In the end I settled on just a distinguishing name for the binary and the
manpage.
The resulting NMU will be uploaded to incoming shortly.
BTW, the manpage doesn't look very good to me at all -- as I said, it
doesn't even mention some of the binaries it claims to be the manpage for,
and it provides *no* usage information whatsoever except for a generic
'--help' option. I would suggest that dropping this manpage is better than
shipping it (rewriting it to be useful would, of course, be best). I have
not done this because again, it didn't seem an appropriate change for an
NMU.
Cheers,
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
[EMAIL PROTECTED] http://www.debian.org/
diff -u ming-0.3.0/util/ming-config ming-0.3.0/util/ming-config
--- ming-0.3.0/util/ming-config
+++ ming-0.3.0/util/ming-config
@@ -1,6 +1,6 @@
#!/bin/sh
-prefix=/usr/local
+prefix=/usr
exec_prefix=${prefix}
usage()
diff -u ming-0.3.0/debian/changelog ming-0.3.0/debian/changelog
--- ming-0.3.0/debian/changelog
+++ ming-0.3.0/debian/changelog
@@ -1,3 +1,27 @@
+ming (1:0.3.0-11.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * High-urgency upload for RC bugfixes.
+ * Drop hard-coded dependency on obsolete package name giflib4g, the correct
+ dependency is already being picked up via shlibs. Closes: #424401.
+ * Drop the php4-ming package, because php4 is going away for lenny.
+ Closes: #424806.
+ * Move the libming-util programs from /usr/lib/ming/bin to /usr/bin;
+ these are end-user binaries, not helper binaries for the library, so
+ shipping them under /usr/lib is an FHS violation.
+ * Rename png2swf to png2swf-ming, to eliminate the file conflict with
+ swftools since the two programs don't have compatible commandline
+ syntax. Also fix the name displayed in png2swf's usage function,
+ which was inaccurate anyway. Closes: #421988.
+ * Take care to remove the build-php5 directory and the generated
+ libming-util.1 manpage in the clean target. Closes: #424573.
+ * Clean perl_ext before cleaning the toplevel dir, to avoid leaving
+ "Makefile.old" around as cruft in the diff.
+ * Fix up several manpage symlinks to match the binary names actually
+ being shipped.
+
+ -- Steve Langasek <[EMAIL PROTECTED]> Tue, 22 May 2007 04:00:31 -0700
+
ming (1:0.3.0-11) unstable; urgency=high
* Fix phpN-ming package to use new php config mechanism. (Closes #404159)
diff -u ming-0.3.0/debian/control ming-0.3.0/debian/control
--- ming-0.3.0/debian/control
+++ ming-0.3.0/debian/control
@@ -2,7 +2,7 @@
Section: libs
Priority: optional
Maintainer: Stuart R. Anderson <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5.0.37.2), docbook-to-man, swig, python-all-dev (>= 2.3.5-11), libungif4-dev, libpng12-dev, libz-dev, perl (>= 5.8.0), autotools-dev, flex, bison, libfreetype6-dev, ttf-dejavu, ttf-opensymbol, python-central (>= 0.5),php4-dev, php5-dev
+Build-Depends: debhelper (>= 5.0.37.2), docbook-to-man, swig, python-all-dev (>= 2.3.5-11), libungif4-dev, libpng12-dev, libz-dev, perl (>= 5.8.0), autotools-dev, flex, bison, libfreetype6-dev, ttf-dejavu, ttf-opensymbol, python-central (>= 0.5), php5-dev
XS-Python-Version: all
Standards-Version: 3.7.2
@@ -78,7 +78,7 @@
Package: libming-util
Section: devel
Architecture: any
-Depends: ${shlibs:Depends}, giflib4g
+Depends: ${shlibs:Depends}
Description: Library to generate SWF (Flash) Files - Utilities
Ming is an SWF (Flash) file format output library.
It is written in C, with wrappers for C++, Perl, Python,
@@ -95,7 +95,6 @@
gif2dbl - GIF converter
gif2mask - GIF Mask extractor
raw2adpcm - Audio Converter
- The utils are located in /usr/lib/libming/bin
.
Homepage: http://ming.sourceforge.net/
@@ -114,17 +113,6 @@
.
Homepage: http://ming.sourceforge.net/
-Package: php4-ming
-Architecture: any
-Depends: ${shlibs:Depends}, ${php:Depends}
-Description: Ming module for php4
- This package provides a module for Ming functions in PHP scripts.
- .
- PHP4 is an HTML-embedded scripting language. Much of its syntax is borrowed
- from C, Java and Perl with a couple of unique PHP-specific features thrown
- in. The goal of the language is to allow web developers to write
- dynamically generated pages quickly.
-
Package: php5-ming
Architecture: any
Depends: ${shlibs:Depends}, ${php:Depends}
diff -u ming-0.3.0/debian/rules.alt ming-0.3.0/debian/rules.alt
--- ming-0.3.0/debian/rules.alt
+++ ming-0.3.0/debian/rules.alt
@@ -36,26 +36,7 @@
config.status: configure
dh_testdir
# Add here commands to configure the package.
- CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --bindir=\$${prefix}/lib/libming/bin
- # PHP4
- rm -rf build-php4 && mkdir build-php4
- cp php_ext/* build-php4
- -cd build-php4 && phpize4
- cd build-php4 && ./configure --build=$(DEB_BUILD_GNU_TYPE) \
- --host=$(DEB_HOST_GNU_TYPE) \
- --prefix=/usr \
- --with-php-config=/usr/bin/php-config4 \
- --disable-rpath \
- --disable-static \
- --with-ming
- cd build-php4 && ( \
- test -f libtool.old || (mv libtool libtool.old && cp libtool.old libtool) ; \
- sed -e 's/^hardcode_direct.*$$/hardcode_direct=yes/g' libtool | \
- sed -e 's/^hardcode_minus_L.*$$/hardcode_minus_L=yes/g' | \
- sed -e 's/^hardcode_into_libs.*$$/hardcode_into_libs=no/g' | \
- sed -e 's/^hardcode_shlibpath_var.*$$/hardcode_shlibpath_var=no/g' >libtool.new ; \
- mv libtool.new libtool)
-
+ CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
# PHP5
rm -rf build-php5 && mkdir build-php5
cp php_ext/* build-php5
@@ -89,9 +70,6 @@
python=$$(echo $$python | sed "s/$(PYDEF)/python/"); \
(cd py_ext;$$python setup.py build;) \
done
- # PHP4
- cd build-php4 && $(MAKE) CFLAGS="$(CFLAGS)"
-
# PHP5
cd build-php5 && $(MAKE) CFLAGS="$(CFLAGS)"
@@ -167,9 +145,6 @@
(cd py_ext;$$python setup.py install --root=../debian/python-ming; )\
done
- # PHP4
- (ext=`/usr/bin/php-config4 --extension-dir`;mkdir -p debian/php4-ming/$${ext};install -m 644 -o root -g root build-php4/modules/ming.so debian/php4-ming/$${ext}/ming.so;)
-
# PHP5
(ext=`/usr/bin/php-config5 --extension-dir`;mkdir -p debian/php5-ming/$${ext};install -m 644 -o root -g root build-php5/modules/ming.so debian/php5-ming/$${ext}/ming.so;)
@@ -206,12 +181,9 @@
dh_makeshlibs
dh_installdeb
dh_shlibdeps
- echo "php:Depends=phpapi-`php-config4 --phpapi`" >> debian/php4-ming.substvars
echo "php:Depends=phpapi-`php-config5 --phpapi`" >> debian/php5-ming.substvars
dh_gencontrol
- # Hack to make the php4 package have an epoch, like it always has:
- #dh_gencontrol -v -pphp4-ming -u-v5:$(SOURCE_VERSION)
dh_md5sums
dh_builddeb
reverted:
--- ming-0.3.0/debian/php4-ming.postinst
+++ ming-0.3.0.orig/debian/php4-ming.postinst
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Source debconf library.
-#. /usr/share/debconf/confmodule
-
-#DEBHELPER#
-
-if [ "$1" != "configure" ]; then
- exit 0
-fi
-
-exit 0
reverted:
--- ming-0.3.0/debian/php4-ming.prerm
+++ ming-0.3.0.orig/debian/php4-ming.prerm
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-set -e
-
-#DEBHELPER#
-
-if [ "$1" != "remove" -a "$1" != "purge" ]; then
- exit 0
-fi
-
-#. /usr/share/debconf/confmodule
-
-exit 0
diff -u ming-0.3.0/debian/rules ming-0.3.0/debian/rules
--- ming-0.3.0/debian/rules
+++ ming-0.3.0/debian/rules
@@ -36,19 +36,7 @@
config.status: configure
dh_testdir
# Add here commands to configure the package.
- CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --bindir=\$${prefix}/lib/libming/bin
- # PHP4
- rm -rf build-php4 && mkdir build-php4
- cp php_ext/* build-php4
- -cd build-php4 && phpize4
- cd build-php4 && ./configure --build=$(DEB_BUILD_GNU_TYPE) \
- --host=$(DEB_HOST_GNU_TYPE) \
- --prefix=/usr \
- --with-php-config=/usr/bin/php-config4 \
- --disable-rpath \
- --disable-static \
- --with-ming
-
+ CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
# PHP5
rm -rf build-php5 && mkdir build-php5
cp php_ext/* build-php5
@@ -82,8 +70,6 @@
python=$$(echo $$python | sed "s/$(PYDEF)/python/"); \
(cd py_ext;$$python setup.py build;) \
done
- # PHP4
- cd build-php4 && $(MAKE) CFLAGS="$(CFLAGS)"
# PHP5
cd build-php5 && $(MAKE) CFLAGS="$(CFLAGS)"
@@ -102,10 +88,11 @@
clean:
dh_testdir
dh_testroot
- $(MAKE) clean
# Perl extension
-cd perl_ext && $(MAKE) realclean && rm SWF.h t/config.pl
+ $(MAKE) clean
+
# Python extension
-for python in $(PYVERS); do \
python=$$(echo $$python | sed "s/$(PYDEF)/python/"); \
@@ -117,6 +104,8 @@
rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
# Add here commands to clean up after the build process.
+ rm -rf build-php5
+ rm -f libming-util.1
-$(MAKE) distclean
dh_clean
@@ -160,26 +149,24 @@
(cd py_ext;$$python setup.py install --root=../debian/python-ming; )\
done
- # PHP4
- (ext=`/usr/bin/php-config4 --extension-dir`;mkdir -p debian/php4-ming/$${ext};install -m 644 -o root -g root build-php4/modules/ming.so debian/php4-ming/$${ext}/ming.so;)
- install -d debian/php4-ming/etc/php4/conf.d
- install -m 644 -o root -g root debian/ming.ini debian/php4-ming/etc/php4/conf.d/ming.ini
-
# PHP5
(ext=`/usr/bin/php-config5 --extension-dir`;mkdir -p debian/php5-ming/$${ext};install -m 644 -o root -g root build-php5/modules/ming.so debian/php5-ming/$${ext}/ming.so;)
install -d debian/php5-ming/etc/php5/conf.d
install -m 644 -o root -g root debian/ming.ini debian/php5-ming/etc/php5/conf.d/ming.ini
+ # rename to avoid conflict with swftools
+ mv debian/ming/usr/bin/png2swf debian/ming/usr/bin/png2swf-ming
+
# Documentation
install -d debian/ming/usr/share/man/man1
- ln -s libming-util.1.gz debian/ming/usr/share/man/man1/listaction2.1.gz
- ln -s libming-util.1.gz debian/ming/usr/share/man/man1/listaction2_d.1.gz
- ln -s libming-util.1.gz debian/ming/usr/share/man/man1/listswf2.1.gz
- ln -s libming-util.1.gz debian/ming/usr/share/man/man1/listswf2_d.1.gz
+ ln -s libming-util.1.gz debian/ming/usr/share/man/man1/listaction.1.gz
+ ln -s libming-util.1.gz debian/ming/usr/share/man/man1/listaction_d.1.gz
+ ln -s libming-util.1.gz debian/ming/usr/share/man/man1/listswf.1.gz
+ ln -s libming-util.1.gz debian/ming/usr/share/man/man1/listswf_d.1.gz
ln -s libming-util.1.gz debian/ming/usr/share/man/man1/png2dbl.1.gz
- ln -s libming-util.1.gz debian/ming/usr/share/man/man1/png2swf.1.gz
- ln -s libming-util.1.gz debian/ming/usr/share/man/man1/swftoperl2.1.gz
- ln -s libming-util.1.gz debian/ming/usr/share/man/man1/swftophp2.1.gz
+ ln -s libming-util.1.gz debian/ming/usr/share/man/man1/png2swf-ming.1.gz
+ ln -s libming-util.1.gz debian/ming/usr/share/man/man1/swftoperl.1.gz
+ ln -s libming-util.1.gz debian/ming/usr/share/man/man1/swftophp.1.gz
ln -s libming-util.1.gz debian/ming/usr/share/man/man1/swftopython.1.gz
dh_install -s
@@ -203,12 +190,9 @@
dh_makeshlibs
dh_installdeb
dh_shlibdeps
- echo "php:Depends=phpapi-`php-config4 --phpapi`" >> debian/php4-ming.substvars
echo "php:Depends=phpapi-`php-config5 --phpapi`" >> debian/php5-ming.substvars
dh_gencontrol
- # Hack to make the php4 package have an epoch, like it always has:
- #dh_gencontrol -v -pphp4-ming -u-v5:$(SOURCE_VERSION)
dh_md5sums
dh_builddeb
reverted:
--- ming-0.3.0/debian/php4-ming.dirs
+++ ming-0.3.0.orig/debian/php4-ming.dirs
@@ -1,2 +0,0 @@
-usr/lib/php4
-
reverted:
--- ming-0.3.0/debian/php4-ming.files
+++ ming-0.3.0.orig/debian/php4-ming.files
@@ -1 +0,0 @@
-usr/lib/php4/*/*
diff -u ming-0.3.0/debian/libming-util.dirs ming-0.3.0/debian/libming-util.dirs
--- ming-0.3.0/debian/libming-util.dirs
+++ ming-0.3.0/debian/libming-util.dirs
@@ -1,2 +1 @@
-usr/lib/libming/bin
usr/share/man/man1
diff -u ming-0.3.0/debian/libming-util.files ming-0.3.0/debian/libming-util.files
--- ming-0.3.0/debian/libming-util.files
+++ ming-0.3.0/debian/libming-util.files
@@ -1,2 +1,2 @@
-usr/lib/libming/bin/*
+usr/bin/*
usr/share/man/man1/*
only in patch2:
unchanged:
--- ming-0.3.0.orig/util/png2swf.c
+++ ming-0.3.0/util/png2swf.c
@@ -8,8 +8,8 @@
void usage()
{
- printf("img2swf - Converts an image in an SWF\n");
- printf("Usage: img2swf <image> <output> [<width> <height>]\n");
+ printf("png2swf-ming - Converts an image in an SWF\n");
+ printf("Usage: png2swf-ming <image> <output> [<width> <height>]\n");
exit(1);
}
