r503 - in /packages/swfmill/trunk/debian: README.source changelog control copyright docs patches/missing_files.patch patches/series rules source/ source/format source/options watch
miriam at users.alioth.debian.org
miriam at users.alioth.debian.org
Wed Mar 16 22:45:04 UTC 2011
Author: miriam
Date: Wed Mar 16 22:45:04 2011
New Revision: 503
URL: http://svn.debian.org/wsvn/?sc=1&rev=503
Log:
New Uptream Release
Added:
packages/swfmill/trunk/debian/README.source
packages/swfmill/trunk/debian/patches/missing_files.patch
packages/swfmill/trunk/debian/source/
packages/swfmill/trunk/debian/source/format
packages/swfmill/trunk/debian/source/options
Modified:
packages/swfmill/trunk/debian/changelog
packages/swfmill/trunk/debian/control
packages/swfmill/trunk/debian/copyright
packages/swfmill/trunk/debian/docs
packages/swfmill/trunk/debian/patches/series
packages/swfmill/trunk/debian/rules
packages/swfmill/trunk/debian/watch
Added: packages/swfmill/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/packages/swfmill/trunk/debian/README.source?rev=503&op=file
==============================================================================
--- packages/swfmill/trunk/debian/README.source (added)
+++ packages/swfmill/trunk/debian/README.source Wed Mar 16 22:45:04 2011
@@ -1,0 +1,1 @@
+See /usr/share/doc/quilt/README.source
Modified: packages/swfmill/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/packages/swfmill/trunk/debian/changelog?rev=503&op=diff
==============================================================================
--- packages/swfmill/trunk/debian/changelog (original)
+++ packages/swfmill/trunk/debian/changelog Wed Mar 16 22:45:04 2011
@@ -1,8 +1,33 @@
-swfmill (0.2.12-2.1) UNRELEASED; urgency=low
+swfmill (0.3.1-2) unstable; urgency=low
- *
+ * Uploading package to unstable.
+ * Added -lz to LDFLAGS. Closes: #618103
+ * Upgraded to Debian source package 3.0
- -- Miriam Ruiz <little_miry at yahoo.es> Fri, 06 Jun 2008 12:20:01 +0000
+ -- Miriam Ruiz <little_miry at yahoo.es> Wed, 16 Mar 2011 20:37:33 +0100
+
+swfmill (0.3.1-1) experimental; urgency=low
+
+ * New Upstream Release
+ * Upgraded Standards-Version from 3.8.3 to 3.9.1
+ * Added to Build-Depends: quilt
+ * Due to some error, some files are missing in upstream's tarball.
+ Added them through missing_files.patch
+
+ -- Miriam Ruiz <little_miry at yahoo.es> Wed, 18 Aug 2010 20:40:48 +0200
+
+swfmill (0.3.0-1) unstable; urgency=low
+
+ * New Upstream Release
+ * Closes: #560448 (FTBFS)
+ * debian/control: Removed dependency: quilt (no patches needed)
+ * debian/control: Added dependency: xsltproc
+ * debian/control: Upgraded Standards-Version from 3.7.3 to 3.8.3
+ * debian/rules: Do not ignore make clean errors
+ * debian/watch: Fixed watch file. Closes: #450089
+ Thanks to Yan Morin <progysm at gmail.com>
+
+ -- Miriam Ruiz <little_miry at yahoo.es> Mon, 18 Jan 2010 11:45:10 +0100
swfmill (0.2.12-2) unstable; urgency=low
Modified: packages/swfmill/trunk/debian/control
URL: http://svn.debian.org/wsvn/packages/swfmill/trunk/debian/control?rev=503&op=diff
==============================================================================
--- packages/swfmill/trunk/debian/control (original)
+++ packages/swfmill/trunk/debian/control Wed Mar 16 22:45:04 2011
@@ -1,11 +1,13 @@
Source: swfmill
-Priority: extra
+Priority: optional
Maintainer: Miriam Ruiz <little_miry at yahoo.es>
-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
+Build-Depends: debhelper (>= 5), quilt, autotools-dev, pkg-config, help2man,
+ xsltproc, libxml2-dev, libxslt1-dev, zlib1g-dev, libfreetype6-dev, libpng12-dev
+Standards-Version: 3.9.1
Section: libs
Homepage: http://www.swfmill.org/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-flash/packages/swfmill/trunk
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-flash/packages/swfmill/trunk
Package: swfmill
Section: utils
Modified: packages/swfmill/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/packages/swfmill/trunk/debian/copyright?rev=503&op=diff
==============================================================================
--- packages/swfmill/trunk/debian/copyright (original)
+++ packages/swfmill/trunk/debian/copyright Wed Mar 16 22:45:04 2011
@@ -3,7 +3,11 @@
It was downloaded from http://swfmill.org/
-Upstream Authors:
+Upstream Author:
+ * Daniel Cassidy <mail at danielcassidy.me.uk>
+
+ Other Authors:
+ * Daniel Turing <mail at danielturing.com>
* Daniel Fischer <dan at subsignal.org>
* Herman Narkaytis (Font import fixes)
* Steve Webster (lots of Flash8/9 tags, fixes)
@@ -11,6 +15,8 @@
* Gerrit Karius (refinement of the SVG import)
Copyright: (C) 2005 Daniel Fischer
+Copyright (C) 2005â2007 Daniel Turing
+Copyright (C) 2005â2009 swfmill contributors (see AUTHORS)
License:
@@ -476,6 +482,6 @@
-The Debian packaging is (C) 2007, Miriam Ruiz <little_miry at yahoo.es> and
-is licensed under the GPL, see above.
-
+The Debian packaging is (C) 2007-2010, Miriam Ruiz <little_miry at yahoo.es>
+and is licensed under the GPL license (version 2 or -at your option- any later
+version), see above.
Modified: packages/swfmill/trunk/debian/docs
URL: http://svn.debian.org/wsvn/packages/swfmill/trunk/debian/docs?rev=503&op=diff
==============================================================================
--- packages/swfmill/trunk/debian/docs (original)
+++ packages/swfmill/trunk/debian/docs Wed Mar 16 22:45:04 2011
@@ -1,3 +1,4 @@
+README
+AUTHORS
NEWS
-README
TODO
Added: packages/swfmill/trunk/debian/patches/missing_files.patch
URL: http://svn.debian.org/wsvn/packages/swfmill/trunk/debian/patches/missing_files.patch?rev=503&op=file
==============================================================================
--- packages/swfmill/trunk/debian/patches/missing_files.patch (added)
+++ packages/swfmill/trunk/debian/patches/missing_files.patch Wed Mar 16 22:45:04 2011
@@ -1,0 +1,207 @@
+#
+# Files obtained from https://code.launchpad.net/~djcsdy/swfmill/trunk
+# See: http://osflash.org/pipermail/swfmill_osflash.org/2010-August/002408.html
+#
+
+--- /dev/null
++++ b/src/xslt/README
+@@ -0,0 +1,19 @@
++
++2005-07-19 building the internal stylesheets
++
++ * swfmill uses internal stylesheets for some commands ("simple").
++ * these get big, so they are split into parts (*.xslt)
++ * a .xml file (e.g. simple.xml) describes which parts should get assembled
++ to form a single internal sheet.
++ * the .xml is transformed along assemble.xsl, including the parts,
++ producing a .cpp that contains the stylesheet as a static string.
++
++a new internal stylesheet (foo) would need:
++ * foo.xml <compilation> description
++ * ? anything else
++ * mentions in Makefile.am
++ * mention in xslt.h
++ * command in swfmill.cpp
++
++(PS, yes i know about xsl:import and :include, but i would have to hack
++libxslt to read from something like memory:// urls, which is not nice either)
+--- /dev/null
++++ b/src/xslt/xslt.h
+@@ -0,0 +1,7 @@
++#ifndef SWF_XSLT_H
++#define SWF_XSLT_H
++
++// definitions for "in-memory" stylesheets
++extern const char *xslt_simple;
++
++#endif
+--- /dev/null
++++ b/src/xslt/xslt_pack.cpp
+@@ -0,0 +1,167 @@
++#include "xslt.h"
++#include <cstring>
++
++namespace SWF {
++
++#define TMP_STRLEN 0xff
++
++char *get_name_from_filename( const char *filename ) {
++ char *name, *b;
++ const char *basename;
++ int l;
++
++ // figure basename (filename without path)
++ b = strrchr( filename, '/' );
++ basename = b ? b+1 : filename;
++
++ l = strlen(basename);
++ name = new char[l];
++ strncpy( name, basename, l );
++
++ // separate extension (set position of last . as end of string)
++ b = strrchr( name, '.' );
++ if( b ) b[0]=0;
++
++ return name;
++}
++
++// jpeg
++
++int getJpegWord( FILE *fp ) {
++ int r = fgetc(fp);
++ r <<= 8;
++ r += fgetc(fp);
++ return r;
++}
++
++bool create_jpeg( const char *filename, xmlNodePtr parent ) {
++ char *name = get_name_from_filename( filename );
++
++ // parse thru the jpeg to find width and height
++ FILE *fp = fopen( filename, "rb" );
++ char tmp[TMP_STRLEN];
++ if( !fp ) return false;
++
++ int width=-1, height=-1;
++ while( !feof( fp ) ) { // could do a && width==-1 here, but that captures preview imgs...
++ if( fgetc(fp) == 0xff ) {
++ if( fgetc(fp) == 0xc0 ) {
++ // StartOfFrame
++ // skip length and precision (UGLY, eh?)
++ fgetc(fp); fgetc(fp); fgetc(fp);
++
++ // read height, width
++ height = getJpegWord( fp );
++ width = getJpegWord( fp );
++ }
++ }
++ }
++
++ xmlNodePtr node = xmlNewChild( parent, NULL, (const xmlChar *)"jpeg", NULL );
++
++ snprintf(tmp,TMP_STRLEN,"%i", width);
++ xmlSetProp( node, (const xmlChar *)"width", (const xmlChar *)&tmp );
++
++ snprintf(tmp,TMP_STRLEN,"%i", height);
++ xmlSetProp( node, (const xmlChar *)"height", (const xmlChar *)&tmp );
++
++ xmlSetProp( node, (const xmlChar *)"file", (const xmlChar *)filename );
++ xmlSetProp( node, (const xmlChar *)"name", (const xmlChar *)name );
++ if( name ) delete name;
++
++ return true;
++}
++
++bool create_swf( const char *filename, xmlNodePtr parent ) {
++ char *name = get_name_from_filename( filename );
++ xmlNodePtr node = xmlNewChild( parent, NULL, (const xmlChar *)"swf", NULL );
++
++ xmlSetProp( node, (const xmlChar *)"file", (const xmlChar *)filename );
++ xmlSetProp( node, (const xmlChar *)"name", (const xmlChar *)name );
++
++ if( name ) delete name;
++
++ return true;
++}
++
++bool create_font( const char *filename, xmlNodePtr parent ) {
++ char *name = get_name_from_filename( filename );
++ xmlNodePtr node = xmlNewChild( parent, NULL, (const xmlChar *)"font", NULL );
++
++ xmlSetProp( node, (const xmlChar *)"file", (const xmlChar *)filename );
++ xmlSetProp( node, (const xmlChar *)"name", (const xmlChar *)name );
++
++ if( name ) delete name;
++
++ return true;
++}
++
++typedef bool createNodeFunction( const char *filename, xmlNodePtr parent );
++struct NodeTypes {
++ const char *extension;
++ createNodeFunction *create;
++};
++NodeTypes nodeTypes[] = {
++ { ".jpg", create_jpeg },
++ { ".jpeg", create_jpeg },
++ { ".swf", create_swf },
++ { ".ttf", create_font },
++ { NULL, NULL }
++ };
++
++
++}
++
++using namespace SWF;
++
++xmlDocPtr xslt_pack( int argc, char *argv[], int width, int height, float framerate ) {
++ int nObjects = 0;
++ xmlDocPtr doc;
++ xmlNodePtr root;
++ doc = xmlNewDoc((const xmlChar*)"1.0");
++ root = doc->xmlRootNode = xmlNewDocNode( doc, NULL, (const xmlChar *)"files", NULL );
++
++ // add header
++ char tmp[TMP_STRLEN];
++
++ snprintf(tmp,TMP_STRLEN,"%i", width);
++ xmlSetProp( root, (const xmlChar *)"right", (const xmlChar *)&tmp );
++
++ snprintf(tmp,TMP_STRLEN,"%i", height);
++ xmlSetProp( root, (const xmlChar *)"bottom", (const xmlChar *)&tmp );
++
++ snprintf(tmp,TMP_STRLEN,"%f", framerate);
++ xmlSetProp( root, (const xmlChar *)"framerate", (const xmlChar *)&tmp );
++
++
++ // add nodes for every file
++ const char *filename;
++ for( int i=0; i<argc; i++ ) {
++ filename = argv[i];
++ char *ext = strrchr( filename, '.' );
++ if( !ext ) {
++ fprintf(stderr, "Unsure what to do with '%s' (no extension), ignoring.\n", filename );
++ } else {
++ int h=0;
++ while( h>=0 && nodeTypes[h].extension != NULL ) {
++ if( !strcasecmp( nodeTypes[h].extension, ext ) ) {
++ if( nodeTypes[h].create( filename, root ) ) {
++ h=-1;
++ nObjects++;
++ }
++ }
++ if( h>=0 ) h++;
++ }
++ if( h>=0 ) {
++ fprintf(stderr, "No import function for '%s', ignoring.\n", filename );
++ }
++ }
++ }
++
++ if( !nObjects ) {
++ xmlFreeDoc( doc );
++ return NULL;
++ }
++
++ return doc;
++}
Modified: packages/swfmill/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/packages/swfmill/trunk/debian/patches/series?rev=503&op=diff
==============================================================================
--- packages/swfmill/trunk/debian/patches/series (original)
+++ packages/swfmill/trunk/debian/patches/series Wed Mar 16 22:45:04 2011
@@ -1,1 +1,1 @@
-swfmill_gcc-4.3.patch
+missing_files.patch
Modified: packages/swfmill/trunk/debian/rules
URL: http://svn.debian.org/wsvn/packages/swfmill/trunk/debian/rules?rev=503&op=diff
==============================================================================
--- packages/swfmill/trunk/debian/rules (original)
+++ packages/swfmill/trunk/debian/rules Wed Mar 16 22:45:04 2011
@@ -28,7 +28,7 @@
config: config-stamp
config-stamp:
dh_testdir
- $(MAKE) -f /usr/share/quilt/quilt.make patch
+ [ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make patch
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
@@ -41,8 +41,7 @@
--prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
--disable-shared --enable-static \
CFLAGS="$(CFLAGS)" \
- # LDFLAGS="-Wl,-z,defs"
-
+ LDFLAGS="-Wl,-z,defs -Wl,--as-needed -Wl,--no-undefined -lz"
touch $@
build: build-stamp
@@ -54,12 +53,12 @@
clean:
dh_testdir
dh_testroot
- rm -f config-stamp build-stamp
- -$(MAKE) distclean
- -$(MAKE) clean
+ rm -f config-stamp build-stamp
+ [ ! -f Makefile ] || $(MAKE) distclean
+ [ ! -f Makefile ] || $(MAKE) clean
rm -f config.sub config.guess config.status config.log
$(MAKE) -C debian/h2m clean
- $(MAKE) -f /usr/share/quilt/quilt.make unpatch
+ [ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make unpatch
dh_clean
install: build
Added: packages/swfmill/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/packages/swfmill/trunk/debian/source/format?rev=503&op=file
==============================================================================
--- packages/swfmill/trunk/debian/source/format (added)
+++ packages/swfmill/trunk/debian/source/format Wed Mar 16 22:45:04 2011
@@ -1,0 +1,1 @@
+3.0 (quilt)
Added: packages/swfmill/trunk/debian/source/options
URL: http://svn.debian.org/wsvn/packages/swfmill/trunk/debian/source/options?rev=503&op=file
==============================================================================
--- packages/swfmill/trunk/debian/source/options (added)
+++ packages/swfmill/trunk/debian/source/options Wed Mar 16 22:45:04 2011
@@ -1,0 +1,5 @@
+# Bzip2 compression for debian.tar
+compression = "bzip2"
+compression-level = 7
+# Do not generate diff for changes in config.(sub|guess)
+extend-diff-ignore = "(^|/)config.(sub|guess)$"
Modified: packages/swfmill/trunk/debian/watch
URL: http://svn.debian.org/wsvn/packages/swfmill/trunk/debian/watch?rev=503&op=diff
==============================================================================
--- packages/swfmill/trunk/debian/watch (original)
+++ packages/swfmill/trunk/debian/watch Wed Mar 16 22:45:04 2011
@@ -6,4 +6,4 @@
# Examine a Webpage
# <Webpage URL> <string match>
-http://swfmill.org/ swfmill-(.*)\.tar\.gz
+http://swfmill.org/releases/ ./swfmill-([\d\.]*)\.tar\.gz
More information about the pkg-flash-devel
mailing list