r253 - in /packages/swfmill/trunk/debian: changelog control patches/ patches/series patches/swfmill_gcc-4.3.patch rules

[miriam at users.alioth.debian.org]

Author: miriam
Date: Fri Jun  6 11:33:56 2008
New Revision: 253

URL: http://svn.debian.org/wsvn/?sc=1&rev=253
Log:
Removed bashism in debian/rules (Closes: #484443)
Added quilt to build dependencies.
Build fails now if make clean fails. Errors are not ignored anymore.
Upgraded Standards-Version to 3.7.3
Added Homepage section to debian/control


Added:
    packages/swfmill/trunk/debian/patches/
    packages/swfmill/trunk/debian/patches/series
    packages/swfmill/trunk/debian/patches/swfmill_gcc-4.3.patch
Modified:
    packages/swfmill/trunk/debian/changelog
    packages/swfmill/trunk/debian/control
    packages/swfmill/trunk/debian/rules

Modified: packages/swfmill/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/packages/swfmill/trunk/debian/changelog?rev=253&op=diff
==============================================================================
--- packages/swfmill/trunk/debian/changelog (original)
+++ packages/swfmill/trunk/debian/changelog Fri Jun  6 11:33:56 2008
@@ -1,3 +1,14 @@
+swfmill (0.2.12-2) UNRELEASED; urgency=low
+
+  * Acknowledged NMU.
+  * Removed bashism in debian/rules (Closes: #484443)
+  * Added quilt to build dependencies.
+  * Build fails now if make clean fails. Errors are not ignored anymore.
+  * Upgraded Standards-Version to 3.7.3
+  * Added Homepage section to debian/control
+
+ -- Miriam Ruiz <little_miry at yahoo.es>  Fri, 06 Jun 2008 10:49:07 +0000
+
 swfmill (0.2.12-1.1) unstable; urgency=low
 
   * Non-maintainer upload.

Modified: packages/swfmill/trunk/debian/control
URL: http://svn.debian.org/wsvn/packages/swfmill/trunk/debian/control?rev=253&op=diff
==============================================================================
--- packages/swfmill/trunk/debian/control (original)
+++ packages/swfmill/trunk/debian/control Fri Jun  6 11:33:56 2008
@@ -1,9 +1,11 @@
 Source: swfmill
 Priority: extra
 Maintainer: Miriam Ruiz <little_miry at yahoo.es>
-Build-Depends: debhelper (>= 5), autotools-dev, pkg-config, help2man, libxml2-dev, libxslt1-dev, zlib1g-dev, libfreetype6-dev, libpng12-dev 
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 5), autotools-dev, pkg-config, help2man, quilt,
+ libxml2-dev, libxslt1-dev, zlib1g-dev, libfreetype6-dev, libpng12-dev 
+Standards-Version: 3.7.3
 Section: libs
+ Homepage: http://www.swfmill.org/
 
 Package: swfmill
 Section: utils
@@ -23,5 +25,3 @@
  As a simple application of such functionality, swfmill can pack together
  a bunch of media files (currently JPGs, PNGs, TTFs and other SWFs) into
  an SWF as "library objects" for your attachMovie() pleasure.
- .
-  Homepage: http://www.swfmill.org/

Added: packages/swfmill/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/packages/swfmill/trunk/debian/patches/series?rev=253&op=file
==============================================================================
--- packages/swfmill/trunk/debian/patches/series (added)
+++ packages/swfmill/trunk/debian/patches/series Fri Jun  6 11:33:56 2008
@@ -1,0 +1,1 @@
+swfmill_gcc-4.3.patch

Added: packages/swfmill/trunk/debian/patches/swfmill_gcc-4.3.patch
URL: http://svn.debian.org/wsvn/packages/swfmill/trunk/debian/patches/swfmill_gcc-4.3.patch?rev=253&op=file
==============================================================================
--- packages/swfmill/trunk/debian/patches/swfmill_gcc-4.3.patch (added)
+++ packages/swfmill/trunk/debian/patches/swfmill_gcc-4.3.patch Fri Jun  6 11:33:56 2008
@@ -1,0 +1,29 @@
+--- a/src/swft/swft_css.cpp
++++ b/src/swft/swft_css.cpp
+@@ -7,6 +7,8 @@
+ #include <libxml/xpathInternals.h>
+ #include "swft.h"
+ 
++#include <cstring>
++
+ using namespace std;
+ #define TMP_STRLEN 0xff
+ 	
+@@ -236,4 +238,4 @@
+ 	//fprintf(stderr,"looking up style %s: %s\n", needle, r.c_str() );
+ 	
+ 	valuePush( ctx, xmlXPathNewString( (const xmlChar *)r.c_str() ) );
+-}
+\ No newline at end of file
++}
+--- a/src/swft/swft_import_mp3.cpp
++++ b/src/swft/swft_import_mp3.cpp
+@@ -6,6 +6,8 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
++#include <cstring>
++
+ #define TMP_STRLEN 0xff
+ 
+ const int mp3SamplesPerFrame = 1152;

Modified: packages/swfmill/trunk/debian/rules
URL: http://svn.debian.org/wsvn/packages/swfmill/trunk/debian/rules?rev=253&op=diff
==============================================================================
--- packages/swfmill/trunk/debian/rules (original)
+++ packages/swfmill/trunk/debian/rules Fri Jun  6 11:33:56 2008
@@ -27,13 +27,16 @@
 
 config.status: configure
 	dh_testdir
-	-$(MAKE) distclean
+	$(MAKE) -f /usr/share/quilt/quilt.make patch
+	[ ! -f Makefile ] || $(MAKE) distclean
+
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
 endif
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
+
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
 		--disable-shared --enable-static \
@@ -51,8 +54,9 @@
 	dh_testroot
 	rm -f build-stamp 
 	-$(MAKE) clean
-	rm -f config.{sub,guess,status,log}
+	rm -f config.sub config.guess config.status config.log
 	$(MAKE) -C debian/h2m/ clean
+	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
 	dh_clean 
 
 install: build