r306 - in /packages/ming/trunk/debian: changelog control copyright patches/02_php_ext patches/03_py_ext patches/series rules

anderson at users.alioth.debian.org anderson at users.alioth.debian.org
Sat Dec 27 15:23:11 UTC 2008


Author: anderson
Date: Sat Dec 27 15:23:11 2008
New Revision: 306

URL: http://svn.debian.org/wsvn/pkg-flash/?sc=1&rev=306
Log:
Version 0.4.2 in experimental. Feedback appreciated.

Added:
    packages/ming/trunk/debian/patches/02_php_ext
    packages/ming/trunk/debian/patches/03_py_ext
Modified:
    packages/ming/trunk/debian/changelog
    packages/ming/trunk/debian/control
    packages/ming/trunk/debian/copyright
    packages/ming/trunk/debian/patches/series
    packages/ming/trunk/debian/rules

Modified: packages/ming/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-flash/packages/ming/trunk/debian/changelog?rev=306&op=diff
==============================================================================
--- packages/ming/trunk/debian/changelog (original)
+++ packages/ming/trunk/debian/changelog Sat Dec 27 15:23:11 2008
@@ -1,6 +1,20 @@
+ming (1:0.4.2-2) experimental; urgency=low
+
+  * Inline the text of the PHP license for completeness,
+    and policy conformance.
+  * Note that the new version should also fix a FTBFS. Closes: #497749
+
+ -- Stuart R. Anderson <anderson at netsweng.com>  Fri, 26 Dec 2008 10:46:49 -0500
+
+ming (1:0.4.2-1) experimental; urgency=low
+
+  * New upstream release 0.4.2. Closes: #509401
+
+ -- Stuart R. Anderson <anderson at netsweng.com>  Mon, 22 Dec 2008 10:19:04 -0500
+
 ming (1:0.4.0.beta5.cvs20080518-1) experimental; urgency=low
 
-  * Update to new upstream versions. Closes: #466122 
+  * Update to new upstream versions. Closes: #466122
 
  -- Stuart R. Anderson <anderson at netsweng.com>  Mon, 19 May 2008 16:25:07 -0400
 

Modified: packages/ming/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-flash/packages/ming/trunk/debian/control?rev=306&op=diff
==============================================================================
--- packages/ming/trunk/debian/control (original)
+++ packages/ming/trunk/debian/control Sat Dec 27 15:23:11 2008
@@ -2,17 +2,17 @@
 Section: libs
 Priority: optional
 Maintainer: Stuart R. Anderson <anderson at netsweng.com>
-Build-Depends: debhelper (>= 5.0.37.2), docbook-to-man, swig, python-all-dev (>= 2.3.5-11), libungif4-dev, libgif-dev, libpng12-dev, libz-dev, perl (>= 5.10.0), autotools-dev, flex, bison, libfreetype6-dev, ttf-dejavu, ttf-opensymbol, python-central (>= 0.5), php5-dev, automake1.9
+Build-Depends: debhelper (>= 5.0.37.2), docbook-to-man, swig, python-all-dev (>= 2.3.5-11), libgif-dev, libpng12-dev, libz-dev, perl (>= 5.10.0), autotools-dev, flex, bison, libfreetype6-dev, ttf-dejavu, ttf-opensymbol, python-central (>= 0.5), php5-dev, php5-cli, automake, quilt
 XS-Python-Version: all
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Homepage: http://ming.sourceforge.net/
 
-Package: libming0
+Package: libming1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: libming (<= 0.2a.cvs20020110-1)
-Replaces: libming (<= 0.2a.cvs20020110-1)
+Conflicts: libming (<= 0.2a.cvs20020110-1), libming0
+Replaces: libming (<= 0.2a.cvs20020110-1), libming0
 Description: Library to generate SWF (Flash) Files
  Ming is an SWF (Flash) file format output library.
  It is written in C, with wrappers for C++, Perl, Python,
@@ -24,7 +24,7 @@
 Package: libming-dev
 Section: libdevel
 Architecture: any
-Depends: libming0
+Depends: libming1
 Description: Library to generate SWF (Flash) Files (development files)
  Ming is an SWF (Flash) file format output library.
  It is written in C, with wrappers for C++, Perl, Python,
@@ -61,7 +61,7 @@
 Package: libswf-perl
 Architecture: any
 Section: perl
-Depends: libming0, ${shlibs:Depends}, ${perl:Depends}
+Depends: libming1, ${shlibs:Depends}, ${perl:Depends}
 Suggests: libming-fonts-openoffice
 Description: Ming (SWF) module for Perl
  Ming is an SWF (Flash) file format output library.

Modified: packages/ming/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-flash/packages/ming/trunk/debian/copyright?rev=306&op=diff
==============================================================================
--- packages/ming/trunk/debian/copyright (original)
+++ packages/ming/trunk/debian/copyright Sat Dec 27 15:23:11 2008
@@ -58,7 +58,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2006 The PHP Group                                |
+  | Copyright (c) 1997-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -71,5 +71,77 @@
   | Authors: Dave Hayden <dave at opaque.net>                               |
   |          Frank M. Kromann <fmk at php.net>                              |
   |          Stuart R. Anderson <anderson at netsweng.com>                  |
+  |          Klaus Rechert <klaus at rechert.de>                            |
   +----------------------------------------------------------------------+
 */
+
+The text of the PHP licesne is:
+
+-------------------------------------------------------------------- 
+                  The PHP License, version 3.01
+Copyright (c) 1999 - 2008 The PHP Group. All rights reserved.
+-------------------------------------------------------------------- 
+
+Redistribution and use in source and binary forms, with or without
+modification, is permitted provided that the following conditions
+are met:
+
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+ 
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the
+     distribution.
+ 
+  3. The name "PHP" must not be used to endorse or promote products
+     derived from this software without prior written permission. For
+     written permission, please contact group at php.net.
+  
+  4. Products derived from this software may not be called "PHP", nor
+     may "PHP" appear in their name, without prior written permission
+     from group at php.net.  You may indicate that your software works in
+     conjunction with PHP by saying "Foo for PHP" instead of calling
+     it "PHP Foo" or "phpfoo"
+ 
+  5. The PHP Group may publish revised and/or new versions of the
+     license from time to time. Each version will be given a
+     distinguishing version number.
+     Once covered code has been published under a particular version
+     of the license, you may always continue to use it under the terms
+     of that version. You may also choose to use such covered code
+     under the terms of any subsequent version of the license
+     published by the PHP Group. No one other than the PHP Group has
+     the right to modify the terms applicable to covered code created
+     under this License.
+
+  6. Redistributions of any form whatsoever must retain the following
+     acknowledgment:
+     "This product includes PHP software, freely available from
+     <http://www.php.net/software/>".
+
+THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
+ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE PHP
+DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+
+-------------------------------------------------------------------- 
+
+This software consists of voluntary contributions made by many
+individuals on behalf of the PHP Group.
+
+The PHP Group can be contacted via Email at group at php.net.
+
+For more information on the PHP Group and the PHP project, 
+please see <http://www.php.net>.
+
+PHP includes the Zend Engine, freely available at
+<http://www.zend.com>.

Added: packages/ming/trunk/debian/patches/02_php_ext
URL: http://svn.debian.org/wsvn/pkg-flash/packages/ming/trunk/debian/patches/02_php_ext?rev=306&op=file
==============================================================================
--- packages/ming/trunk/debian/patches/02_php_ext (added)
+++ packages/ming/trunk/debian/patches/02_php_ext Sat Dec 27 15:23:11 2008
@@ -1,0 +1,12 @@
+Index: ming/php_ext/Makefile.am
+===================================================================
+--- ming.orig/php_ext/Makefile.am	2008-12-22 14:01:29.000000000 -0500
++++ ming/php_ext/Makefile.am	2008-12-22 14:02:42.000000000 -0500
+@@ -8,5 +8,5 @@
+ 	rm -rf tmp
+ 
+ install: all
+-	$(INSTALL) -d "$(DESTDIR)"/`php-config --extension-dir`
+-	$(INSTALL) -m 755 tmp/modules/ming.so" "$(DESTDIR)"/`php-config --extension-dir`
++	$(INSTALL) -d `dirname $(prefix)`/`php-config --extension-dir`
++	$(INSTALL) -m 755 tmp/modules/ming.so `dirname $(prefix)`/`php-config --extension-dir`

Added: packages/ming/trunk/debian/patches/03_py_ext
URL: http://svn.debian.org/wsvn/pkg-flash/packages/ming/trunk/debian/patches/03_py_ext?rev=306&op=file
==============================================================================
--- packages/ming/trunk/debian/patches/03_py_ext (added)
+++ packages/ming/trunk/debian/patches/03_py_ext Sat Dec 27 15:23:11 2008
@@ -1,0 +1,13 @@
+Index: ming/py_ext/Makefile.am
+===================================================================
+--- ming.orig/py_ext/Makefile.am	2008-12-22 15:21:10.000000000 -0500
++++ ming/py_ext/Makefile.am	2008-12-22 15:22:09.000000000 -0500
+@@ -9,7 +9,7 @@
+ 	rm -Rf test.swf build
+ 
+ install:
+-	$(PYTHON) setup.py install --prefix $(prefix) --root "$(DESTDIR)"
++	$(PYTHON) setup.py install --prefix $(prefix) --root `dirname $(prefix)`
+ 
+ test.swf:
+ 	$(PYTHON) shape.py

Modified: packages/ming/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-flash/packages/ming/trunk/debian/patches/series?rev=306&op=diff
==============================================================================
--- packages/ming/trunk/debian/patches/series (original)
+++ packages/ming/trunk/debian/patches/series Sat Dec 27 15:23:11 2008
@@ -1,1 +1,3 @@
 01_perl_vendor
+02_php_ext
+03_py_ext

Modified: packages/ming/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-flash/packages/ming/trunk/debian/rules?rev=306&op=diff
==============================================================================
--- packages/ming/trunk/debian/rules (original)
+++ packages/ming/trunk/debian/rules Sat Dec 27 15:23:11 2008
@@ -33,7 +33,8 @@
 	CFLAGS += -O2
 endif
 
-config.status: configure
+configure: configure-stamp
+configure-stamp:
 	dh_testdir
 
 	$(MAKE) -f /usr/share/quilt/quilt.make patch
@@ -56,10 +57,12 @@
 		--enable-php \
 		--enable-python
 
+	touch configure-stamp
+
 build: build-arch build-indep
 
 build-arch: build-arch-stamp
-build-arch-stamp:  config.status
+build-arch-stamp: configure-stamp
 
 	# Add here commands to compile the arch part of the package.
 	$(MAKE)
@@ -70,7 +73,7 @@
 	touch build-arch-stamp
 
 build-indep: build-indep-stamp
-build-indep-stamp:  config.status
+build-indep-stamp: configure-stamp
 
 	$(SHELL) debian/mkfontset ttf-dejavu
 	#Move file name to be the same as in 0.3.0 for compatability
@@ -104,14 +107,12 @@
 
 	rm -rf debian/ming
 	rm -rf fonts
-	rm -f build-arch-stamp build-indep-stamp
+	rm -f build-arch-stamp build-indep-stamp configure-stamp
 
 	# Add here commands to clean up after the build process.
 	rm -f libming-util.1
-	#$(MAKE) distclean
-	rm -f config.log
-	#rm -f configure aclocal.m4
-	#-rm `find . -name Makefile.in`
+	if [ -f Makefile ]; then $(MAKE) distclean; fi
+	rm -f config.log config.sub config.guess
 
 	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
 
@@ -159,17 +160,12 @@
 	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 -fs libming-util.1.gz debian/ming/usr/share/man/man1/listaction.1.gz
 	ln -fs libming-util.1.gz debian/ming/usr/share/man/man1/listaction_d.1.gz
 	ln -fs libming-util.1.gz debian/ming/usr/share/man/man1/listswf.1.gz
 	ln -fs libming-util.1.gz debian/ming/usr/share/man/man1/listswf_d.1.gz
-	ln -fs libming-util.1.gz debian/ming/usr/share/man/man1/png2dbl.1.gz
-	ln -fs libming-util.1.gz debian/ming/usr/share/man/man1/png2swf-ming.1.gz
 	ln -fs libming-util.1.gz debian/ming/usr/share/man/man1/swftoperl.1.gz
 	ln -fs libming-util.1.gz debian/ming/usr/share/man/man1/swftophp.1.gz
 	ln -fs libming-util.1.gz debian/ming/usr/share/man/man1/swftopython.1.gz




More information about the pkg-flash-devel mailing list