[ming] 03/13: Merge tag 'upstream/0.4.6'

Gabriele Giacone gg0-guest at moszumanska.debian.org
Fri May 15 11:53:27 UTC 2015


This is an automated email from the git hooks/post-receive script.

gg0-guest pushed a commit to branch master
in repository ming.

commit b6852cc341924816cd5bd870e5e38ea24b699b8a
Merge: 5e0042e 5c9dcc1
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Thu May 14 17:26:06 2015 +0200

    Merge tag 'upstream/0.4.6'
    
    Upstream version 0.4.6
    
    Conflicts:
    	.gitignore

 .gitignore                                         |    25 +
 .travis.yml                                        |     4 +
 COPYING                                            |   504 -
 ChangeLog                                          | 16684 ----------------
 Makefile.am                                        |     3 +
 Makefile.in                                        |   899 -
 NEWS                                               |     9 +
 README                                             |     5 +-
 README.md                                          |     1 +
 aclocal.m4                                         |  1121 --
 c++_ext/.gitignore                                 |     1 +
 c++_ext/Makefile                                   |    11 +
 c++_ext/README                                     |     9 +
 c++_ext/test.cpp                                   |    21 +
 ch/Makefile                                        |    14 +
 ch/c/Make.inc                                      |    40 +
 ch/c/Makefile                                      |    23 +
 ch/c/Makefile.win                                  |    23 +
 ch/c/handmade/Ming_setErrorFunction_chdl.c         |     7 +
 ch/c/handmade/Ming_setWarnFunction_chdl.c          |     7 +
 ch/c/handmade/SWFMovie_output_chdl.c               |    34 +
 ch/chfhandmade/Ming_setErrorFunction.chf           |    10 +
 ch/chfhandmade/Ming_setWarnFunction.chf            |    10 +
 ch/chfhandmade/SWFMovie_output.chf                 |    13 +
 ch/demos/action.c                                  |    60 +
 ch/demos/backyard.jpg                              |   Bin 0 -> 82044 bytes
 ch/demos/backyard.png                              |   Bin 0 -> 717521 bytes
 ch/demos/button.c                                  |    51 +
 ch/demos/cxform.c                                  |    67 +
 ch/demos/drag.c                                    |    53 +
 ch/demos/gradient.c                                |    64 +
 ch/demos/gradientxform.c                           |    79 +
 ch/demos/jpegfill.c                                |    43 +
 ch/demos/png.c                                     |    44 +
 ch/demos/png.dbl                                   |   Bin 0 -> 195081 bytes
 src/libming.h => ch/include/blocklist.h            |    67 +-
 src/libming.h => ch/include/blocks/action.h        |    66 +-
 src/libming.h => ch/include/blocks/bitmap.h        |    63 +-
 ch/include/blocks/block.h                          |    96 +
 ch/include/blocks/blocktypes.h                     |    99 +
 src/libming.h => ch/include/blocks/browserfont.h   |    64 +-
 src/libming.h => ch/include/blocks/button.h        |    63 +-
 ch/include/blocks/character.h                      |   127 +
 src/libming.h => ch/include/blocks/cxform.h        |    67 +-
 src/libming.h => ch/include/blocks/dbl.h           |    85 +-
 ch/include/blocks/error.h                          |    28 +
 src/libming.h => ch/include/blocks/exports.h       |    68 +-
 src/libming.h => ch/include/blocks/fillstyle.h     |    70 +-
 ch/include/blocks/font.h                           |   145 +
 src/libming.h => ch/include/blocks/fontinfo.h      |    65 +-
 src/libming.h => ch/include/blocks/fromswf.h       |    76 +-
 src/libming.h => ch/include/blocks/gradient.h      |    69 +-
 ch/include/blocks/imports.h                        |    31 +
 ch/include/blocks/input.h                          |    25 +
 src/libming.h => ch/include/blocks/jpeg.h          |    63 +-
 src/libming.h => ch/include/blocks/libswf.h        |    46 +-
 src/libming.h => ch/include/blocks/linestyle.h     |    70 +-
 src/libming.h => ch/include/blocks/matrix.h        |    75 +-
 src/libming.h => ch/include/blocks/method.h        |    72 +-
 src/libming.h => ch/include/blocks/morph.h         |    61 +-
 ch/include/blocks/output.h                         |    98 +
 src/libming.h => ch/include/blocks/outputblock.h   |    65 +-
 ch/include/blocks/placeobject.h                    |    68 +
 src/libming.h => ch/include/blocks/rect.h          |    73 +-
 ch/include/blocks/shape.h                          |    83 +
 src/libming.h => ch/include/blocks/sound.h         |    68 +-
 src/libming.h => ch/include/blocks/soundinstance.h |    68 +-
 src/libming.h => ch/include/blocks/soundstream.h   |    72 +-
 src/libming.h => ch/include/blocks/sprite.h        |    68 +-
 ch/include/blocks/swf.h                            |   554 +
 ch/include/blocks/text.h                           |    82 +
 src/libming.h => ch/include/blocks/textfield.h     |    72 +-
 ch/include/blocks/ttffont.h                        |   107 +
 ch/include/blocks/utf8.h                           |    19 +
 ch/include/blocks/videostream.h                    |    84 +
 ch/include/displaylist.h                           |    92 +
 src/libming.h => ch/include/fill.h                 |    62 +-
 src/libming.h => ch/include/font_util.h            |    62 +-
 ch/include/gc.h                                    |    14 +
 {src => ch/include}/libming.h                      |    12 -
 ch/include/ming_config.h                           |    27 +
 src/libming.h => ch/include/movie.h                |    63 +-
 src/libming.h => ch/include/movieclip.h            |    61 +-
 src/libming.h => ch/include/position.h             |    76 +-
 src/libming.h => ch/include/shape_cubic.h          |    65 +-
 src/libming.h => ch/include/shape_util.h           |    61 +-
 src/libming.h => ch/include/text_util.h            |    65 +-
 ch/pkgcreate.ch                                    |   391 +
 ch/pkginstall.ch                                   |   325 +
 ch/readme.txt                                      |    70 +
 config/.gitignore                                  |     1 +
 config/ltmain.sh                                   |  9661 ---------
 configure                                          | 19886 -------------------
 configure.in                                       |    10 +-
 docs/.gitignore                                    |     2 +
 docs/Makefile.in                                   |   433 -
 docs/man/Makefile                                  |   615 -
 docs/man/Makefile.am                               |   159 +-
 docs/man/Makefile.in                               |   615 -
 java_ext/MANIFEST                                  |    60 +
 java_ext/Makefile                                  |    57 +
 java_ext/README                                    |    82 +
 java_ext/SWFAction.java                            |    41 +
 java_ext/SWFActionI.java                           |    35 +
 java_ext/SWFBitmap.java                            |    80 +
 java_ext/SWFBitmapI.java                           |    35 +
 java_ext/SWFButton.java                            |    82 +
 java_ext/SWFButtonI.java                           |    62 +
 java_ext/SWFColor.java                             |    90 +
 java_ext/SWFDimensionableI.java                    |    38 +
 java_ext/SWFDisplayItem.java                       |   139 +
 java_ext/SWFDisplayItemI.java                      |    71 +
 java_ext/SWFException.java                         |    44 +
 java_ext/SWFFill.java                              |   117 +
 java_ext/SWFFillI.java                             |    72 +
 java_ext/SWFFont.java                              |    85 +
 java_ext/SWFFontI.java                             |    42 +
 java_ext/SWFGradient.java                          |    60 +
 java_ext/SWFGradientI.java                         |    37 +
 java_ext/SWFMatrix.java                            |   141 +
 java_ext/SWFMorph.java                             |    64 +
 java_ext/SWFMorphI.java                            |    39 +
 java_ext/SWFMovie.java                             |   144 +
 java_ext/SWFMovieClip.java                         |    97 +
 java_ext/SWFMovieClipI.java                        |    45 +
 java_ext/SWFMovieI.java                            |    60 +
 java_ext/SWFObject.java                            |   170 +
 java_ext/SWFObjectI.java                           |    53 +
 java_ext/SWFShape.java                             |   257 +
 java_ext/SWFShapeI.java                            |    68 +
 java_ext/SWFSound.java                             |    41 +
 java_ext/SWFSoundI.java                            |    35 +
 java_ext/SWFSoundStream.java                       |    29 +
 java_ext/SWFText.java                              |   101 +
 java_ext/SWFTextField.java                         |   112 +
 java_ext/SWFTextFieldI.java                        |    73 +
 java_ext/SWFTextI.java                             |    49 +
 java_ext/SWFVideoStream.java                       |    37 +
 java_ext/Tests/Simple.java                         |    74 +
 java_ext/Tests/SlideShow.java                      |    80 +
 java_ext/native/Makefile                           |    16 +
 java_ext/native/SWFAction.h                        |    36 +
 java_ext/native/SWFBitmap.h                        |    88 +
 java_ext/native/SWFButton.h                        |    61 +
 java_ext/native/SWFDisplayItem.h                   |   173 +
 java_ext/native/SWFFill.h                          |   141 +
 java_ext/native/SWFFont.h                          |    93 +
 java_ext/native/SWFGradient.h                      |    53 +
 java_ext/native/SWFMorph.h                         |    61 +
 java_ext/native/SWFMovie.h                         |   165 +
 java_ext/native/SWFMovieClip.h                     |    85 +
 java_ext/native/SWFNative.cc                       |  1042 +
 java_ext/native/SWFNative.h                        |    22 +
 java_ext/native/SWFShape.h                         |   203 +
 java_ext/native/SWFSound.h                         |    36 +
 java_ext/native/SWFSoundStream.h                   |    20 +
 java_ext/native/SWFText.h                          |   117 +
 java_ext/native/SWFTextField.h                     |   143 +
 java_ext/native/SWFUtilities.h                     |    89 +
 java_ext/native/SWFVideoStream.h                   |    24 +
 macros/.gitignore                                  |     7 +
 macros/Makefile.in                                 |   429 -
 macros/libtool.m4                                  |  7983 --------
 macros/ltoptions.m4                                |   384 -
 macros/ltsugar.m4                                  |   123 -
 macros/ltversion.m4                                |    23 -
 macros/lt~obsolete.m4                              |    98 -
 ming.spec                                          |    73 -
 perl_ext/.gitignore                                |    43 +
 perl_ext/Makefile.in                               |   479 -
 perl_ext/SWF/.gitignore                            |     1 +
 perl_ext/common/flowers.jpg                        |   Bin 0 -> 21775 bytes
 perl_ext/common/flowers.msk                        |   Bin 0 -> 22306 bytes
 perl_ext/t/.gitignore                              |     2 +
 php_ext/.gitignore                                 |     8 +
 php_ext/Makefile.in                                |   657 -
 php_ext/config.m4                                  |   116 +
 php_ext/make_module.sh                             |    16 +
 php_ext/ming.c                                     |    42 +-
 php_ext/php_ming.h                                 |    41 +-
 py_ext/.gitignore                                  |     7 +
 py_ext/Makefile.in                                 |   453 -
 py_ext/Zwiff/.gitignore                            |     6 +
 py_ext/setup.py                                    |    32 -
 py_ext/setup.py.in                                 |     2 +-
 rb_ext/.gitignore                                  |     1 +
 rb_ext/MANIFEST                                    |     6 +
 rb_ext/README                                      |    14 +
 rb_ext/depend                                      |    13 +
 rb_ext/extconf.rb                                  |     6 +
 rb_ext/ming.rb                                     |   621 +
 rb_ext/shape.rb                                    |    17 +
 rb_ext/test.rb                                     |    19 +
 src/.gitignore                                     |    14 +
 src/Makefile.in                                    |   969 -
 src/actioncompiler/.gitignore                      |    14 +
 src/actioncompiler/Makefile.in                     |   627 -
 src/actioncompiler/compile.c                       |     0
 src/actioncompiler/compile.h                       |     2 +-
 src/actioncompiler/lex.swf4.c                      |  3222 ---
 src/actioncompiler/lex.swf5.c                      |  3938 ----
 src/actioncompiler/listaction.c                    |     0
 src/actioncompiler/main.c                          |   128 +
 src/actioncompiler/swf4compiler.flex               |     2 +-
 src/actioncompiler/swf4compiler.tab.c              |  3746 ----
 src/actioncompiler/swf4compiler.tab.h              |   284 -
 src/actioncompiler/swf4compiler.y                  |     3 +-
 src/actioncompiler/swf5compiler.flex               |     2 +-
 src/actioncompiler/swf5compiler.tab.c              |  7903 --------
 src/actioncompiler/swf5compiler.tab.h              |   444 -
 src/actioncompiler/swf5compiler.y                  |    15 +-
 src/blocks/.gitignore                              |     7 +
 src/blocks/Makefile.in                             |  1260 --
 src/blocks/gifdbl.c                                |    13 +
 src/libming.h                                      |    33 +-
 src/ming.h                                         |  1084 -
 src/ming.h.in                                      |     4 +
 src/ming_config.h                                  |   132 -
 src/ming_config.h.in                               |   131 -
 tcl_ext/.gitignore                                 |     4 +
 tcl_ext/Makefile.in                                |   636 -
 test/.gitignore                                    |     2 +
 test/Action/.gitignore                             |    11 +
 test/Action/Makefile.in                            |   958 -
 test/Bitmap/.gitignore                             |    11 +
 test/Bitmap/Makefile.in                            |   960 -
 test/BrowserFont/.gitignore                        |     9 +
 test/BrowserFont/Makefile.in                       |   933 -
 test/Button/.gitignore                             |    13 +
 test/Button/Makefile.in                            |   979 -
 test/FillStyle/.gitignore                          |    23 +
 test/FillStyle/Makefile.in                         |  1114 --
 test/Filter/.gitignore                             |    21 +
 test/Filter/Makefile.in                            |  1031 -
 test/Font/.gitignore                               |    21 +
 test/Font/Makefile.in                              |  1087 -
 test/Gradient/.gitignore                           |    25 +
 test/Gradient/Makefile.in                          |  1118 --
 test/LineStyle/.gitignore                          |    13 +
 test/LineStyle/Makefile.in                         |   977 -
 test/Makefile.in                                   |   652 -
 test/Media/.gitignore                              |     2 +
 test/Media/Makefile.in                             |   640 -
 test/Morph/.gitignore                              |    11 +
 test/Morph/Makefile.in                             |   957 -
 test/Movie/.gitignore                              |     2 +
 test/Movie/Background/.gitignore                   |    15 +
 test/Movie/Background/Makefile.in                  |   986 -
 test/Movie/Dimension/.gitignore                    |     9 +
 test/Movie/Dimension/Makefile.in                   |   934 -
 test/Movie/FrameLabel/.gitignore                   |    12 +
 test/Movie/FrameLabel/Makefile.in                  |   960 -
 test/Movie/Makefile.in                             |   644 -
 test/Movie/NumFrames/.gitignore                    |     9 +
 test/Movie/NumFrames/Makefile.in                   |   933 -
 test/Movie/Protect/.gitignore                      |    16 +
 test/Movie/Protect/Makefile.in                     |   962 -
 test/Movie/Rate/.gitignore                         |     9 +
 test/Movie/Rate/Makefile.in                        |   933 -
 test/Movie/add/.gitignore                          |    21 +
 test/Movie/add/Makefile.in                         |   962 -
 test/Movie/addMetadata/.gitignore                  |     9 +
 test/Movie/addMetadata/Makefile.in                 |   933 -
 test/Movie/assignSymbol/.gitignore                 |     9 +
 test/Movie/assignSymbol/Makefile.in                |   933 -
 test/Movie/defineScene/.gitignore                  |     9 +
 test/Movie/defineScene/Makefile.in                 |   932 -
 test/Movie/importCharacter/.gitignore              |    12 +
 test/Movie/importCharacter/Makefile.in             |   957 -
 test/Movie/new/.gitignore                          |    27 +
 test/Movie/new/Makefile.in                         |  1091 -
 test/Movie/nextFrame/.gitignore                    |    21 +
 test/Movie/nextFrame/Makefile.in                   |   959 -
 test/Movie/nextFrame/test01.tcl                    |    20 +
 test/Movie/replace/.gitignore                      |    12 +
 test/Movie/replace/Makefile.in                     |   957 -
 test/Movie/setNetworkAccess/.gitignore             |    11 +
 test/Movie/setNetworkAccess/Makefile.in            |   958 -
 test/Movie/setScriptLimits/.gitignore              |     9 +
 test/Movie/setScriptLimits/Makefile.in             |   933 -
 test/Movie/setSoundStream/.gitignore               |    15 +
 test/Movie/setSoundStream/Makefile.in              |  1010 -
 test/Movie/setTabIndex/.gitignore                  |     9 +
 test/Movie/setTabIndex/Makefile.in                 |   932 -
 test/MovieClip/.gitignore                          |    13 +
 test/MovieClip/Makefile.in                         |   976 -
 test/PrebuiltClip/.gitignore                       |     9 +
 test/PrebuiltClip/Makefile.in                      |   931 -
 test/Shape/.gitignore                              |    11 +
 test/Shape/Makefile.in                             |   959 -
 test/Shape/addSolidFill/Makefile.in                |   933 -
 test/Shape/addSolidFill/test01.tcl                 |    35 +
 test/Sound/.gitignore                              |    13 +
 test/Sound/Makefile.in                             |   983 -
 test/SoundStream/.gitignore                        |    13 +
 test/SoundStream/Makefile.in                       |   986 -
 test/Text/.gitignore                               |    13 +
 test/Text/Makefile.in                              |   986 -
 test/TextField/.gitignore                          |    11 +
 test/TextField/Makefile.in                         |   960 -
 test/Video/.gitignore                              |    19 +
 test/Video/Makefile.in                             |  1066 -
 test/actionscript/.gitignore                       |     7 +
 test/actionscript/Makefile.in                      |  1009 -
 test/find_misdistributed                           |    10 +
 test/find_missing                                  |    18 +
 util/.gitignore                                    |    35 +
 util/Makefile.in                                   |  1229 --
 util/gif2dbl.c                                     |    22 +-
 util/gif2mask.c                                    |    19 +-
 util/makeswf.c                                     |     4 +-
 util/old/.gitignore                                |    16 +
 util/old/Makefile                                  |    32 +
 util/old/bindump.c                                 |    73 +
 util/old/blocktypes.c                              |    50 +
 util/old/decompile4.c                              |  1404 ++
 util/old/hexdump.c                                 |    71 +
 util/old/img2swf.c                                 |   106 +
 util/old/listswf.c                                 |  2093 ++
 util/old/read.c                                    |   312 +
 util/old/read.h                                    |    29 +
 util/outputswf.c                                   |  1266 ++
 win32/MANIFEST                                     |     2 +
 win32/libming.dsp                                  |   704 +
 win32/libming.dsw                                  |    29 +
 325 files changed, 17703 insertions(+), 127701 deletions(-)

diff --cc .gitignore
index 845ca06,ca4fddd..c26eadc
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,25 +1,26 @@@
 +.pc
+ *.o
+ Makefile.in
+ Makefile
+ .AppleDouble
+ ming_wrap.c
+ Makefile.config
+ libming.so.*
+ config.log
+ config.status
+ ming.spec
+ *.tar.gz
+ *.tar.bz2
+ *.zip
+ autom4te.cache
+ aclocal.m4
+ config.cache
+ libming.a
+ libming.so
+ libtool
+ configure
+ .project
+ config/test-driver
+ *.log
+ *.trs
+ *~

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-flash/ming.git



More information about the pkg-flash-devel mailing list