[med-svn] [khmer] 02/02: Merge tag 'upstream/1.3+dfsg'

Andreas Tille tille at debian.org
Tue Feb 3 07:22:44 UTC 2015


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

tille pushed a commit to branch master
in repository khmer.

commit 652c2d7bb98d8859be519e96f0190931b89ebec4
Merge: 81e6c99 54a8002
Author: Andreas Tille <tille at debian.org>
Date:   Tue Feb 3 08:22:19 2015 +0100

    Merge tag 'upstream/1.3+dfsg'
    
    Upstream version 1.3+dfsg

 third-party/bzip2/.gitignore                       |     2 -
 third-party/bzip2/CHANGES                          |   327 -
 third-party/bzip2/LICENSE                          |    42 -
 third-party/bzip2/Makefile                         |   217 -
 third-party/bzip2/Makefile-libbz2_so               |    59 -
 third-party/bzip2/README                           |   215 -
 third-party/bzip2/README.COMPILATION.PROBLEMS      |    58 -
 third-party/bzip2/README.XML.STUFF                 |    45 -
 third-party/bzip2/blocksort.c                      |  1094 -
 third-party/bzip2/bz-common.xsl                    |    39 -
 third-party/bzip2/bz-fo.xsl                        |   276 -
 third-party/bzip2/bz-html.xsl                      |    20 -
 third-party/bzip2/bzdiff                           |    76 -
 third-party/bzip2/bzdiff.1                         |    47 -
 third-party/bzip2/bzgrep                           |    75 -
 third-party/bzip2/bzgrep.1                         |    56 -
 third-party/bzip2/bzip.css                         |    74 -
 third-party/bzip2/bzip2.1                          |   454 -
 third-party/bzip2/bzip2.1.preformatted             |   399 -
 third-party/bzip2/bzip2.c                          |  2034 -
 third-party/bzip2/bzip2.txt                        |   391 -
 third-party/bzip2/bzip2recover.c                   |   514 -
 third-party/bzip2/bzlib.c                          |  1572 -
 third-party/bzip2/bzlib.h                          |   282 -
 third-party/bzip2/bzlib_private.h                  |   509 -
 third-party/bzip2/bzmore                           |    61 -
 third-party/bzip2/bzmore.1                         |   152 -
 third-party/bzip2/compress.c                       |   672 -
 third-party/bzip2/crctable.c                       |   104 -
 third-party/bzip2/decompress.c                     |   646 -
 third-party/bzip2/dlltest.c                        |   175 -
 third-party/bzip2/dlltest.dsp                      |    93 -
 third-party/bzip2/entities.xml                     |     9 -
 third-party/bzip2/format.pl                        |    68 -
 third-party/bzip2/huffman.c                        |   205 -
 third-party/bzip2/libbz2.def                       |    27 -
 third-party/bzip2/libbz2.dsp                       |   130 -
 third-party/bzip2/makefile.msc                     |    63 -
 third-party/bzip2/manual.html                      |  2540 -
 third-party/bzip2/manual.pdf                       |   Bin 256905 -> 0 bytes
 third-party/bzip2/manual.ps                        | 72843 -------------------
 third-party/bzip2/manual.xml                       |  2964 -
 third-party/bzip2/mk251.c                          |    31 -
 third-party/bzip2/randtable.c                      |    84 -
 third-party/bzip2/sample1.bz2                      |   Bin 32348 -> 0 bytes
 third-party/bzip2/sample1.ref                      |   Bin 98696 -> 0 bytes
 third-party/bzip2/sample2.bz2                      |   Bin 73732 -> 0 bytes
 third-party/bzip2/sample2.ref                      |   Bin 212340 -> 0 bytes
 third-party/bzip2/sample3.bz2                      |   Bin 235 -> 0 bytes
 third-party/bzip2/sample3.ref                      | 30007 --------
 third-party/bzip2/spewG.c                          |    54 -
 third-party/bzip2/unzcrash.c                       |   141 -
 third-party/bzip2/words0                           |     9 -
 third-party/bzip2/words1                           |     4 -
 third-party/bzip2/words2                           |     5 -
 third-party/bzip2/words3                           |    30 -
 third-party/bzip2/xmlproc.sh                       |   114 -
 third-party/zlib/.gitignore                        |     5 -
 third-party/zlib/CMakeLists.txt                    |   249 -
 third-party/zlib/ChangeLog                         |  1472 -
 third-party/zlib/FAQ                               |   368 -
 third-party/zlib/INDEX                             |    68 -
 third-party/zlib/Makefile.in                       |   288 -
 third-party/zlib/Makefile.pic                      |     3 -
 third-party/zlib/README                            |   115 -
 third-party/zlib/adler32.c                         |   179 -
 third-party/zlib/amiga/Makefile.pup                |    69 -
 third-party/zlib/amiga/Makefile.sas                |    68 -
 third-party/zlib/as400/bndsrc                      |   215 -
 third-party/zlib/as400/compile.clp                 |   110 -
 third-party/zlib/as400/readme.txt                  |   115 -
 third-party/zlib/as400/zlib.inc                    |   451 -
 third-party/zlib/compress.c                        |    80 -
 third-party/zlib/configure                         |   831 -
 third-party/zlib/contrib/README.contrib            |    78 -
 third-party/zlib/contrib/ada/buffer_demo.adb       |   106 -
 third-party/zlib/contrib/ada/mtest.adb             |   156 -
 third-party/zlib/contrib/ada/read.adb              |   156 -
 third-party/zlib/contrib/ada/readme.txt            |    65 -
 third-party/zlib/contrib/ada/test.adb              |   463 -
 third-party/zlib/contrib/ada/zlib-streams.adb      |   225 -
 third-party/zlib/contrib/ada/zlib-streams.ads      |   114 -
 third-party/zlib/contrib/ada/zlib-thin.adb         |   141 -
 third-party/zlib/contrib/ada/zlib-thin.ads         |   450 -
 third-party/zlib/contrib/ada/zlib.adb              |   701 -
 third-party/zlib/contrib/ada/zlib.ads              |   328 -
 third-party/zlib/contrib/ada/zlib.gpr              |    20 -
 third-party/zlib/contrib/amd64/amd64-match.S       |   452 -
 third-party/zlib/contrib/asm686/README.686         |    51 -
 third-party/zlib/contrib/asm686/match.S            |   357 -
 third-party/zlib/contrib/blast/Makefile            |     8 -
 third-party/zlib/contrib/blast/README              |     4 -
 third-party/zlib/contrib/blast/blast.c             |   446 -
 third-party/zlib/contrib/blast/blast.h             |    75 -
 third-party/zlib/contrib/blast/test.pk             |   Bin 8 -> 0 bytes
 third-party/zlib/contrib/blast/test.txt            |     1 -
 third-party/zlib/contrib/delphi/ZLib.pas           |   557 -
 third-party/zlib/contrib/delphi/ZLibConst.pas      |    11 -
 third-party/zlib/contrib/delphi/readme.txt         |    76 -
 third-party/zlib/contrib/delphi/zlibd32.mak        |    99 -
 third-party/zlib/contrib/dotzlib/DotZLib.build     |    33 -
 third-party/zlib/contrib/dotzlib/DotZLib.chm       |   Bin 72726 -> 0 bytes
 third-party/zlib/contrib/dotzlib/DotZLib.sln       |    21 -
 .../zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs   |    58 -
 .../zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs   |   202 -
 .../zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs |    83 -
 .../zlib/contrib/dotzlib/DotZLib/CodecBase.cs      |   198 -
 .../zlib/contrib/dotzlib/DotZLib/Deflater.cs       |   106 -
 .../zlib/contrib/dotzlib/DotZLib/DotZLib.cs        |   288 -
 .../zlib/contrib/dotzlib/DotZLib/DotZLib.csproj    |   141 -
 .../zlib/contrib/dotzlib/DotZLib/GZipStream.cs     |   301 -
 .../zlib/contrib/dotzlib/DotZLib/Inflater.cs       |   105 -
 .../zlib/contrib/dotzlib/DotZLib/UnitTests.cs      |   274 -
 third-party/zlib/contrib/dotzlib/LICENSE_1_0.txt   |    23 -
 third-party/zlib/contrib/dotzlib/readme.txt        |    58 -
 third-party/zlib/contrib/gcc_gvmat64/gvmat64.S     |   574 -
 third-party/zlib/contrib/infback9/README           |     1 -
 third-party/zlib/contrib/infback9/infback9.c       |   615 -
 third-party/zlib/contrib/infback9/infback9.h       |    37 -
 third-party/zlib/contrib/infback9/inffix9.h        |   107 -
 third-party/zlib/contrib/infback9/inflate9.h       |    47 -
 third-party/zlib/contrib/infback9/inftree9.c       |   324 -
 third-party/zlib/contrib/infback9/inftree9.h       |    61 -
 third-party/zlib/contrib/inflate86/inffas86.c      |  1157 -
 third-party/zlib/contrib/inflate86/inffast.S       |  1368 -
 third-party/zlib/contrib/iostream/test.cpp         |    24 -
 third-party/zlib/contrib/iostream/zfstream.cpp     |   329 -
 third-party/zlib/contrib/iostream/zfstream.h       |   128 -
 third-party/zlib/contrib/iostream2/zstream.h       |   307 -
 .../zlib/contrib/iostream2/zstream_test.cpp        |    25 -
 third-party/zlib/contrib/iostream3/README          |    35 -
 third-party/zlib/contrib/iostream3/TODO            |    17 -
 third-party/zlib/contrib/iostream3/test.cc         |    50 -
 third-party/zlib/contrib/iostream3/zfstream.cc     |   479 -
 third-party/zlib/contrib/iostream3/zfstream.h      |   466 -
 third-party/zlib/contrib/masmx64/bld_ml64.bat      |     2 -
 third-party/zlib/contrib/masmx64/gvmat64.asm       |   553 -
 third-party/zlib/contrib/masmx64/inffas8664.c      |   186 -
 third-party/zlib/contrib/masmx64/inffasx64.asm     |   396 -
 third-party/zlib/contrib/masmx64/readme.txt        |    31 -
 third-party/zlib/contrib/masmx86/bld_ml32.bat      |     2 -
 third-party/zlib/contrib/masmx86/inffas32.asm      |  1080 -
 third-party/zlib/contrib/masmx86/match686.asm      |   479 -
 third-party/zlib/contrib/masmx86/readme.txt        |    27 -
 third-party/zlib/contrib/minizip/Makefile          |    25 -
 third-party/zlib/contrib/minizip/Makefile.am       |    45 -
 .../zlib/contrib/minizip/MiniZip64_Changes.txt     |     6 -
 .../zlib/contrib/minizip/MiniZip64_info.txt        |    74 -
 third-party/zlib/contrib/minizip/configure.ac      |    32 -
 third-party/zlib/contrib/minizip/crypt.h           |   131 -
 third-party/zlib/contrib/minizip/ioapi.c           |   247 -
 third-party/zlib/contrib/minizip/ioapi.h           |   208 -
 third-party/zlib/contrib/minizip/iowin32.c         |   461 -
 third-party/zlib/contrib/minizip/iowin32.h         |    28 -
 third-party/zlib/contrib/minizip/make_vms.com      |    25 -
 third-party/zlib/contrib/minizip/miniunz.c         |   660 -
 third-party/zlib/contrib/minizip/miniunzip.1       |    63 -
 third-party/zlib/contrib/minizip/minizip.1         |    46 -
 third-party/zlib/contrib/minizip/minizip.c         |   520 -
 third-party/zlib/contrib/minizip/minizip.pc.in     |    12 -
 third-party/zlib/contrib/minizip/mztools.c         |   291 -
 third-party/zlib/contrib/minizip/mztools.h         |    37 -
 third-party/zlib/contrib/minizip/unzip.c           |  2125 -
 third-party/zlib/contrib/minizip/unzip.h           |   437 -
 third-party/zlib/contrib/minizip/zip.c             |  2007 -
 third-party/zlib/contrib/minizip/zip.h             |   362 -
 third-party/zlib/contrib/pascal/example.pas        |   599 -
 third-party/zlib/contrib/pascal/readme.txt         |    76 -
 third-party/zlib/contrib/pascal/zlibd32.mak        |    99 -
 third-party/zlib/contrib/pascal/zlibpas.pas        |   276 -
 third-party/zlib/contrib/puff/Makefile             |    42 -
 third-party/zlib/contrib/puff/README               |    63 -
 third-party/zlib/contrib/puff/puff.c               |   840 -
 third-party/zlib/contrib/puff/puff.h               |    35 -
 third-party/zlib/contrib/puff/pufftest.c           |   165 -
 third-party/zlib/contrib/puff/zeros.raw            |   Bin 2517 -> 0 bytes
 third-party/zlib/contrib/testzlib/testzlib.c       |   275 -
 third-party/zlib/contrib/testzlib/testzlib.txt     |    10 -
 third-party/zlib/contrib/untgz/Makefile            |    14 -
 third-party/zlib/contrib/untgz/Makefile.msc        |    17 -
 third-party/zlib/contrib/untgz/untgz.c             |   674 -
 third-party/zlib/contrib/vstudio/readme.txt        |    65 -
 .../zlib/contrib/vstudio/vc10/miniunz.vcxproj      |   310 -
 .../contrib/vstudio/vc10/miniunz.vcxproj.filters   |    22 -
 .../zlib/contrib/vstudio/vc10/minizip.vcxproj      |   307 -
 .../contrib/vstudio/vc10/minizip.vcxproj.filters   |    22 -
 .../zlib/contrib/vstudio/vc10/testzlib.vcxproj     |   420 -
 .../contrib/vstudio/vc10/testzlib.vcxproj.filters  |    58 -
 .../zlib/contrib/vstudio/vc10/testzlibdll.vcxproj  |   310 -
 .../vstudio/vc10/testzlibdll.vcxproj.filters       |    22 -
 third-party/zlib/contrib/vstudio/vc10/zlib.rc      |    32 -
 .../zlib/contrib/vstudio/vc10/zlibstat.vcxproj     |   473 -
 .../contrib/vstudio/vc10/zlibstat.vcxproj.filters  |    77 -
 third-party/zlib/contrib/vstudio/vc10/zlibvc.def   |   143 -
 third-party/zlib/contrib/vstudio/vc10/zlibvc.sln   |   135 -
 .../zlib/contrib/vstudio/vc10/zlibvc.vcxproj       |   657 -
 .../contrib/vstudio/vc10/zlibvc.vcxproj.filters    |   118 -
 .../zlib/contrib/vstudio/vc11/miniunz.vcxproj      |   314 -
 .../zlib/contrib/vstudio/vc11/minizip.vcxproj      |   311 -
 .../zlib/contrib/vstudio/vc11/testzlib.vcxproj     |   426 -
 .../zlib/contrib/vstudio/vc11/testzlibdll.vcxproj  |   314 -
 third-party/zlib/contrib/vstudio/vc11/zlib.rc      |    32 -
 .../zlib/contrib/vstudio/vc11/zlibstat.vcxproj     |   464 -
 third-party/zlib/contrib/vstudio/vc11/zlibvc.def   |   143 -
 third-party/zlib/contrib/vstudio/vc11/zlibvc.sln   |   117 -
 .../zlib/contrib/vstudio/vc11/zlibvc.vcxproj       |   688 -
 .../zlib/contrib/vstudio/vc9/miniunz.vcproj        |   565 -
 .../zlib/contrib/vstudio/vc9/minizip.vcproj        |   562 -
 .../zlib/contrib/vstudio/vc9/testzlib.vcproj       |   852 -
 .../zlib/contrib/vstudio/vc9/testzlibdll.vcproj    |   565 -
 third-party/zlib/contrib/vstudio/vc9/zlib.rc       |    32 -
 .../zlib/contrib/vstudio/vc9/zlibstat.vcproj       |   835 -
 third-party/zlib/contrib/vstudio/vc9/zlibvc.def    |   143 -
 third-party/zlib/contrib/vstudio/vc9/zlibvc.sln    |   144 -
 third-party/zlib/contrib/vstudio/vc9/zlibvc.vcproj |  1156 -
 third-party/zlib/crc32.c                           |   425 -
 third-party/zlib/crc32.h                           |   441 -
 third-party/zlib/deflate.c                         |  1967 -
 third-party/zlib/deflate.h                         |   346 -
 third-party/zlib/doc/algorithm.txt                 |   209 -
 third-party/zlib/doc/rfc1950.txt                   |   619 -
 third-party/zlib/doc/rfc1951.txt                   |   955 -
 third-party/zlib/doc/rfc1952.txt                   |   675 -
 third-party/zlib/doc/txtvsbin.txt                  |   107 -
 third-party/zlib/examples/README.examples          |    49 -
 third-party/zlib/examples/enough.c                 |   572 -
 third-party/zlib/examples/fitblk.c                 |   233 -
 third-party/zlib/examples/gun.c                    |   702 -
 third-party/zlib/examples/gzappend.c               |   504 -
 third-party/zlib/examples/gzjoin.c                 |   449 -
 third-party/zlib/examples/gzlog.c                  |  1059 -
 third-party/zlib/examples/gzlog.h                  |    91 -
 third-party/zlib/examples/zlib_how.html            |   545 -
 third-party/zlib/examples/zpipe.c                  |   205 -
 third-party/zlib/examples/zran.c                   |   409 -
 third-party/zlib/gzclose.c                         |    25 -
 third-party/zlib/gzguts.h                          |   209 -
 third-party/zlib/gzlib.c                           |   634 -
 third-party/zlib/gzread.c                          |   594 -
 third-party/zlib/gzwrite.c                         |   577 -
 third-party/zlib/infback.c                         |   640 -
 third-party/zlib/inffast.c                         |   340 -
 third-party/zlib/inffast.h                         |    11 -
 third-party/zlib/inffixed.h                        |    94 -
 third-party/zlib/inflate.c                         |  1512 -
 third-party/zlib/inflate.h                         |   122 -
 third-party/zlib/inftrees.c                        |   306 -
 third-party/zlib/inftrees.h                        |    62 -
 third-party/zlib/make_vms.com                      |   867 -
 third-party/zlib/msdos/Makefile.bor                |   115 -
 third-party/zlib/msdos/Makefile.dj2                |   104 -
 third-party/zlib/msdos/Makefile.emx                |    69 -
 third-party/zlib/msdos/Makefile.msc                |   112 -
 third-party/zlib/msdos/Makefile.tc                 |   100 -
 third-party/zlib/nintendods/README                 |     5 -
 third-party/zlib/old/Makefile.emx                  |    69 -
 third-party/zlib/old/Makefile.riscos               |   151 -
 third-party/zlib/old/README                        |     3 -
 third-party/zlib/old/descrip.mms                   |    48 -
 third-party/zlib/old/os2/Makefile.os2              |   136 -
 third-party/zlib/old/os2/zlib.def                  |    51 -
 third-party/zlib/old/visual-basic.txt              |   160 -
 third-party/zlib/qnx/package.qpg                   |   141 -
 third-party/zlib/test/example.c                    |   601 -
 third-party/zlib/test/infcover.c                   |   671 -
 third-party/zlib/test/minigzip.c                   |   651 -
 third-party/zlib/treebuild.xml                     |   116 -
 third-party/zlib/trees.c                           |  1226 -
 third-party/zlib/trees.h                           |   128 -
 third-party/zlib/uncompr.c                         |    59 -
 third-party/zlib/watcom/watcom_f.mak               |    43 -
 third-party/zlib/watcom/watcom_l.mak               |    43 -
 third-party/zlib/win32/DLL_FAQ.txt                 |   397 -
 third-party/zlib/win32/Makefile.bor                |   110 -
 third-party/zlib/win32/Makefile.gcc                |   182 -
 third-party/zlib/win32/Makefile.msc                |   163 -
 third-party/zlib/win32/README-WIN32.txt            |   103 -
 third-party/zlib/win32/VisualC.txt                 |     3 -
 third-party/zlib/win32/zlib.def                    |    86 -
 third-party/zlib/win32/zlib1.rc                    |    40 -
 third-party/zlib/zconf.h.cmakein                   |   513 -
 third-party/zlib/zconf.h.in                        |   511 -
 third-party/zlib/zlib.3                            |   151 -
 third-party/zlib/zlib.3.pdf                        |   Bin 8734 -> 0 bytes
 third-party/zlib/zlib.h                            |  1768 -
 third-party/zlib/zlib.map                          |    83 -
 third-party/zlib/zlib.pc.cmakein                   |    13 -
 third-party/zlib/zlib.pc.in                        |    13 -
 third-party/zlib/zlib2ansi                         |   152 -
 third-party/zlib/zutil.c                           |   324 -
 third-party/zlib/zutil.h                           |   253 -
 291 files changed, 188815 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/khmer.git



More information about the debian-med-commit mailing list