[libmwaw] 02/05: Import Debian patch 0.3.8-1

Rene Engelhard rene at moszumanska.debian.org
Tue Sep 13 02:54:32 UTC 2016


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

rene pushed a commit to branch master
in repository libmwaw.

commit 6bc473b7dad530d21b3ce8011c5bb52af1076661
Merge: 9f6ef64 afc77e7
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Jul 25 15:44:55 2016 +0200

    Import Debian patch 0.3.8-1

 CHANGES                                          |   42 +-
 README                                           |   37 +
 aclocal.m4                                       |  211 +-
 build/win32/libmwaw.dsp                          |   76 +-
 build/win32/libmwaw.vcproj                       |   76 +-
 build/win32/libmwaw.vcxproj                      |   58 +-
 configure                                        |   53 +-
 configure.ac                                     |   17 +-
 debian/changelog                                 |    9 +
 debian/control                                   |    2 +-
 debian/rules                                     |   16 +-
 inc/libmwaw/MWAWDocument.hxx                     |   28 +-
 libmwaw.spec                                     |    4 +-
 ltmain.sh                                        |    4 +-
 src/conv/csv/mwaw2csv.cpp                        |   36 +-
 src/conv/html/mwaw2html.cpp                      |    4 +-
 src/conv/raw/mwaw2raw.cpp                        |    4 +-
 src/conv/svg/mwaw2svg.cpp                        |    6 +-
 src/conv/text/mwaw2text.cpp                      |   14 +-
 src/lib/ActaParser.cxx                           |   50 +-
 src/lib/ActaText.cxx                             |   38 +-
 src/lib/ApplePictParser.cxx                      |  435 ++-
 src/lib/ApplePictParser.hxx                      |    4 +
 src/lib/BeagleWksBMParser.cxx                    |   74 +-
 src/lib/BeagleWksDBParser.cxx                    |  184 +-
 src/lib/BeagleWksDRParser.cxx                    |  136 +-
 src/lib/BeagleWksParser.cxx                      |   18 +-
 src/lib/BeagleWksSSParser.cxx                    |  144 +-
 src/lib/BeagleWksStructManager.cxx               |  104 +-
 src/lib/BeagleWksText.cxx                        |   82 +-
 src/lib/ClarisDrawGraph.cxx                      |  224 +-
 src/lib/ClarisDrawParser.cxx                     |  204 +-
 src/lib/ClarisDrawStyleManager.cxx               |   92 +-
 src/lib/ClarisDrawText.cxx                       |  145 +-
 src/lib/ClarisWksBMParser.cxx                    |    5 +-
 src/lib/ClarisWksDatabase.cxx                    |   83 +-
 src/lib/ClarisWksDbaseContent.cxx                |  122 +-
 src/lib/ClarisWksDocument.cxx                    |  302 +-
 src/lib/ClarisWksDocument.hxx                    |    3 +
 src/lib/ClarisWksGraph.cxx                       |  250 +-
 src/lib/ClarisWksPRParser.cxx                    |    1 +
 src/lib/ClarisWksParser.cxx                      |    1 +
 src/lib/ClarisWksPresentation.cxx                |   27 +-
 src/lib/ClarisWksSSParser.cxx                    |    1 +
 src/lib/ClarisWksSpreadsheet.cxx                 |   59 +-
 src/lib/ClarisWksStruct.cxx                      |   36 +-
 src/lib/ClarisWksStruct.hxx                      |    2 +
 src/lib/ClarisWksStyleManager.cxx                |  180 +-
 src/lib/ClarisWksStyleManager.hxx                |    2 +
 src/lib/ClarisWksTable.cxx                       |   77 +-
 src/lib/ClarisWksText.cxx                        |  203 +-
 src/lib/CricketDrawParser.cxx                    | 1534 ++++++++++
 src/lib/CricketDrawParser.hxx                    |  108 +
 src/lib/DocMkrParser.cxx                         |   40 +-
 src/lib/DocMkrText.cxx                           |   60 +-
 src/lib/EDocParser.cxx                           |   82 +-
 src/lib/FreeHandParser.cxx                       | 3566 ++++++++++++++++++++++
 src/lib/FreeHandParser.hxx                       |  168 +
 src/lib/FullWrtGraph.cxx                         |   52 +-
 src/lib/FullWrtParser.cxx                        |  122 +-
 src/lib/FullWrtStruct.cxx                        |   74 +-
 src/lib/FullWrtStruct.hxx                        |    2 +-
 src/lib/FullWrtText.cxx                          |  259 +-
 src/lib/GreatWksBMParser.cxx                     |   10 +-
 src/lib/GreatWksDBParser.cxx                     |  204 +-
 src/lib/GreatWksDocument.cxx                     |   50 +-
 src/lib/GreatWksDocument.hxx                     |    1 +
 src/lib/GreatWksGraph.cxx                        |  192 +-
 src/lib/GreatWksParser.cxx                       |   14 +-
 src/lib/GreatWksSSParser.cxx                     |  122 +-
 src/lib/GreatWksText.cxx                         |  130 +-
 src/lib/HanMacWrdJGraph.cxx                      |  237 +-
 src/lib/HanMacWrdJParser.cxx                     |   70 +-
 src/lib/HanMacWrdJText.cxx                       |  248 +-
 src/lib/HanMacWrdKGraph.cxx                      |  184 +-
 src/lib/HanMacWrdKParser.cxx                     |   52 +-
 src/lib/HanMacWrdKParser.hxx                     |    4 +-
 src/lib/HanMacWrdKText.cxx                       |  176 +-
 src/lib/LightWayTxtGraph.cxx                     |    8 +-
 src/lib/LightWayTxtParser.cxx                    |   44 +-
 src/lib/LightWayTxtText.cxx                      |  110 +-
 src/lib/MWAWCell.cxx                             |  145 +-
 src/lib/MWAWCell.hxx                             |    4 +-
 src/lib/MWAWChart.cxx                            |   31 +-
 src/lib/MWAWChart.hxx                            |    4 +-
 src/lib/MWAWDebug.cxx                            |    4 +-
 src/lib/MWAWDocument.cxx                         |   77 +-
 src/{tools/zip/xattr.h => lib/MWAWEntry.cxx}     |   36 +-
 src/lib/MWAWEntry.hxx                            |    9 +-
 src/lib/MWAWFont.cxx                             |   22 +-
 src/lib/MWAWFont.hxx                             |    8 +-
 src/lib/MWAWFontConverter.cxx                    |   16 +-
 src/lib/MWAWGraphicDecoder.hxx                   |    8 +-
 src/lib/MWAWGraphicEncoder.hxx                   |    6 +-
 src/lib/MWAWGraphicListener.cxx                  |  143 +-
 src/lib/MWAWGraphicListener.hxx                  |    4 +-
 src/lib/MWAWGraphicShape.cxx                     |  275 +-
 src/lib/MWAWGraphicShape.hxx                     |    8 +-
 src/lib/MWAWGraphicStyle.cxx                     |   70 +-
 src/lib/MWAWGraphicStyle.hxx                     |   53 +-
 src/lib/MWAWHeader.cxx                           |   90 +-
 src/lib/MWAWInputStream.cxx                      |  112 +-
 src/lib/MWAWInputStream.hxx                      |    5 +-
 src/lib/MWAWList.cxx                             |    8 +
 src/lib/MWAWList.hxx                             |   10 +-
 src/{tools/zip/xattr.h => lib/MWAWListener.cxx}  |   36 +-
 src/lib/MWAWListener.hxx                         |    6 +-
 src/lib/MWAWOLEParser.cxx                        |   44 +-
 src/lib/MWAWPageSpan.cxx                         |   16 +-
 src/lib/MWAWPageSpan.hxx                         |    8 +-
 src/lib/MWAWParagraph.cxx                        |   29 +-
 src/lib/MWAWParagraph.hxx                        |    3 +-
 src/lib/MWAWParser.cxx                           |   25 +-
 src/lib/MWAWParser.hxx                           |   12 +-
 src/{tools/zip/xattr.h => lib/MWAWPict.cxx}      |   36 +-
 src/lib/MWAWPict.hxx                             |    8 +-
 src/lib/MWAWPictBitmap.cxx                       |   52 +-
 src/lib/MWAWPictBitmap.hxx                       |    8 +-
 src/lib/MWAWPictData.cxx                         |   12 +
 src/lib/MWAWPictData.hxx                         |   10 +-
 src/lib/MWAWPictMac.cxx                          |  260 +-
 src/lib/MWAWPictMac.hxx                          |    7 +-
 src/{tools/zip/xattr.h => lib/MWAWPosition.cxx}  |   36 +-
 src/lib/MWAWPosition.hxx                         |   10 +-
 src/lib/MWAWPresentationListener.cxx             |  136 +-
 src/lib/MWAWPresentationListener.hxx             |    4 +-
 src/lib/MWAWPrinter.cxx                          |   30 +-
 src/lib/MWAWPropertyHandler.cxx                  |   26 +-
 src/lib/MWAWPropertyHandler.hxx                  |    2 +-
 src/lib/MWAWRSRCParser.cxx                       |   56 +-
 src/lib/MWAWRSRCParser.hxx                       |   15 +-
 src/lib/MWAWSection.cxx                          |    8 +-
 src/lib/MWAWSection.hxx                          |    5 +-
 src/lib/MWAWSpreadsheetDecoder.hxx               |    8 +-
 src/lib/MWAWSpreadsheetEncoder.hxx               |    6 +-
 src/lib/MWAWSpreadsheetListener.cxx              |  141 +-
 src/lib/MWAWSpreadsheetListener.hxx              |    4 +-
 src/lib/MWAWStringStream.cxx                     |   16 +-
 src/lib/MWAWTable.cxx                            |   26 +-
 src/lib/MWAWTextListener.cxx                     |  128 +-
 src/lib/MWAWTextListener.hxx                     |    4 +-
 src/lib/MacDocParser.cxx                         |   34 +-
 src/lib/MacDraft5Parser.cxx                      |  408 +--
 src/lib/MacDraft5StyleManager.cxx                |  204 +-
 src/lib/MacDraftParser.cxx                       |  184 +-
 src/lib/MacDrawParser.cxx                        |   90 +-
 src/lib/MacDrawProParser.cxx                     |  282 +-
 src/lib/MacDrawProStyleManager.cxx               |  310 +-
 src/lib/MacPaintParser.cxx                       |   12 +-
 src/lib/MacWrtParser.cxx                         |  142 +-
 src/lib/MacWrtProParser.cxx                      |  154 +-
 src/lib/MacWrtProStructures.cxx                  |  284 +-
 src/lib/Makefile.am                              |   13 +
 src/lib/Makefile.in                              |   73 +-
 src/lib/MarinerWrtGraph.cxx                      |   46 +-
 src/lib/MarinerWrtParser.cxx                     |   48 +-
 src/lib/MarinerWrtParser.hxx                     |    2 +
 src/lib/MarinerWrtText.cxx                       |   98 +-
 src/lib/MaxWrtParser.cxx                         |  389 +++
 src/lib/MaxWrtParser.hxx                         |  102 +
 src/lib/MindWrtParser.cxx                        |  142 +-
 src/lib/MoreParser.cxx                           |  115 +-
 src/lib/MoreText.cxx                             |  134 +-
 src/lib/MouseWrtParser.cxx                       |  929 ++++++
 src/lib/MouseWrtParser.hxx                       |  109 +
 src/lib/MsWks3Text.cxx                           |   80 +-
 src/lib/MsWks4Text.cxx                           |  209 +-
 src/lib/MsWks4Zone.cxx                           |   70 +-
 src/lib/MsWksDBParser.cxx                        |  294 +-
 src/lib/MsWksDRParser.cxx                        |   14 +-
 src/lib/MsWksDocument.cxx                        |  280 +-
 src/lib/MsWksDocument.hxx                        |    5 +-
 src/lib/MsWksGraph.cxx                           |  300 +-
 src/lib/MsWksGraph.hxx                           |    2 +
 src/lib/MsWksSSParser.cxx                        |   88 +-
 src/lib/MsWksTable.cxx                           |   62 +-
 src/lib/MsWrd1Parser.cxx                         |  140 +-
 src/lib/MsWrdParser.cxx                          |  202 +-
 src/lib/MsWrdParser.hxx                          |    3 +
 src/lib/MsWrdStruct.cxx                          |  124 +-
 src/lib/MsWrdStruct.hxx                          |   36 +-
 src/lib/MsWrdText.cxx                            |  222 +-
 src/lib/MsWrdTextStyles.cxx                      |  165 +-
 src/lib/NisusWrtGraph.cxx                        |   18 +-
 src/lib/NisusWrtParser.cxx                       |  110 +-
 src/lib/NisusWrtStruct.cxx                       |    8 +-
 src/lib/NisusWrtText.cxx                         |  144 +-
 src/lib/PixelPaintParser.cxx                     |  122 +-
 src/lib/README                                   |   21 +-
 src/lib/RagTime5Chart.cxx                        |  286 +-
 src/lib/RagTime5ClusterManager.cxx               |  240 +-
 src/lib/RagTime5ClusterManager.hxx               |   10 +-
 src/lib/RagTime5Graph.cxx                        |  299 +-
 src/lib/RagTime5Layout.cxx                       |  111 +-
 src/lib/RagTime5Parser.cxx                       |  157 +-
 src/lib/RagTime5Pipeline.cxx                     |   60 +-
 src/lib/RagTime5Spreadsheet.cxx                  |  200 +-
 src/lib/RagTime5StructManager.cxx                |  183 +-
 src/lib/RagTime5StructManager.hxx                |   10 +-
 src/lib/RagTime5StyleManager.cxx                 |  158 +-
 src/lib/RagTime5StyleManager.hxx                 |    8 +-
 src/lib/RagTime5Text.cxx                         |  215 +-
 src/lib/RagTimeParser.cxx                        |  300 +-
 src/lib/RagTimeSpreadsheet.cxx                   |  296 +-
 src/lib/RagTimeStruct.cxx                        |   18 +-
 src/lib/RagTimeText.cxx                          |  130 +-
 src/lib/StyleParser.cxx                          |  194 +-
 src/lib/SuperPaintParser.cxx                     |  120 +-
 src/lib/TeachTxtParser.cxx                       |   20 +-
 src/lib/WingzParser.cxx                          |  408 +--
 src/{tools/zip/xattr.h => lib/WriteNowEntry.cxx} |   36 +-
 src/lib/WriteNowEntry.hxx                        |    4 +
 src/lib/WriteNowParser.cxx                       |   80 +-
 src/lib/WriteNowText.cxx                         |  196 +-
 src/lib/WriterPlsParser.cxx                      |  214 +-
 src/lib/ZWrtParser.cxx                           |   14 +-
 src/lib/ZWrtParser.hxx                           |    2 +-
 src/lib/ZWrtText.cxx                             |   48 +-
 src/lib/libmwaw_internal.cxx                     |  259 +-
 src/lib/libmwaw_internal.hxx                     |  411 ++-
 src/tools/file/file.cpp                          |   72 +-
 src/tools/file/input.cpp                         |   20 +-
 src/tools/file/input.h                           |    6 +-
 src/tools/file/ole.cpp                           |   74 +-
 src/tools/file/ole.h                             |    6 +-
 src/tools/file/rsrc.cpp                          |   48 +-
 src/tools/file/rsrc.h                            |    2 +-
 src/tools/file/xattr.cpp                         |   32 +-
 src/tools/file/xattr.h                           |    2 +-
 src/tools/zip/input.cpp                          |   20 +-
 src/tools/zip/input.h                            |    4 +-
 src/tools/zip/mwawZip.cpp                        |   16 +-
 src/tools/zip/xattr.cpp                          |   38 +-
 src/tools/zip/xattr.h                            |    2 +-
 src/tools/zip/zip.cpp                            |   21 +-
 src/tools/zip/zip.h                              |    2 +-
 236 files changed, 17815 insertions(+), 8549 deletions(-)

diff --cc debian/changelog
index dffffbb,0000000..29cb5ef
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,107 -1,0 +1,116 @@@
++libmwaw (0.3.8-1) unstable; urgency=medium
++
++  * New upstream release
++
++  * add overrides build-{arch,indep}; build docs only in indep; 
++    add doxygen to B-D-I 
++
++ -- Rene Engelhard <rene at debian.org>  Mon, 25 Jul 2016 15:44:55 +0200
++
 +libmwaw (0.3.7-1) unstable; urgency=medium
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene at debian.org>  Tue, 01 Dec 2015 19:48:34 +0100
 +
 +libmwaw (0.3.6-1) unstable; urgency=medium
 +
 +  * New upstream release
 +
 +  * use dh --parallel
 +  * Standards-Version: 3.9.6 (no changed needed)
 +
 + -- Rene Engelhard <rene at debian.org>  Sun, 13 Sep 2015 12:13:52 +0200
 +
 +libmwaw (0.3.5-1) unstable; urgency=medium
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene at debian.org>  Sun, 17 May 2015 11:03:42 +0200
 +
 +libmwaw (0.3.4-2) unstable; urgency=medium
 +
 +  * upload to unstable
 +
 + -- Rene Engelhard <rene at debian.org>  Sun, 05 Apr 2015 19:20:22 +0200
 +
 +libmwaw (0.3.4-1) experimental; urgency=medium
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene at debian.org>  Tue, 06 Jan 2015 21:39:49 +0100
 +
 +libmwaw (0.3.3-1) experimental; urgency=low
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene at debian.org>  Thu, 16 Oct 2014 22:29:30 +0200
 +
 +libmwaw (0.3.1-2) unstable; urgency=low
 +
 +  * upload to unstable 
 +
 + -- Rene Engelhard <rene at debian.org>  Thu, 07 Aug 2014 23:53:09 +0200
 +
 +libmwaw (0.3.1-1) experimental; urgency=low
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene at debian.org>  Fri, 23 May 2014 22:14:34 +0200
 +
 +libmwaw (0.2.1-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene at debian.org>  Fri, 23 May 2014 22:06:24 +0200
 +
 +libmwaw (0.2.0-2) unstable; urgency=low
 +
 +  * upload to unstable 
 +
 + -- Rene Engelhard <rene at debian.org>  Tue, 06 May 2014 21:36:25 +0200
 +
 +libmwaw (0.2.0-1) experimental; urgency=low
 +
 +  * New upstream release
 +  * s/mac/Mac/ in Description and add missing s (closes: #726968)
 +  * use dh-autoreconf (closes: #734684)
 +
 + -- Rene Engelhard <rene at debian.org>  Wed, 15 Jan 2014 19:13:04 +0100
 +
 +libmwaw (0.1.11-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * debian/control: fix typos in description (closes: #725473)
 +
 + -- Rene Engelhard <rene at debian.org>  Tue, 08 Oct 2013 19:46:25 +0200
 +
 +libmwaw (0.1.10-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene at debian.org>  Mon, 01 Jul 2013 23:51:17 +0200
 +
 +libmwaw (0.1.9-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene at debian.org>  Wed, 22 May 2013 20:00:32 +0200
 +
 +libmwaw (0.1.8-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene at debian.org>  Sun, 05 May 2013 20:25:06 +0200
 +
 +libmwaw (0.1.7-2) unstable; urgency=low
 +
 +  * upload to unstable 
 +
 + -- Rene Engelhard <rene at debian.org>  Thu, 18 Apr 2013 23:02:18 +0200
 +
 +libmwaw (0.1.7-1) experimental; urgency=low
 +
 +  * Initial release
 +
 + -- Rene Engelhard <rene at debian.org>  Sat, 13 Apr 2013 13:13:21 +0200
diff --cc debian/control
index f5212ce,0000000..bc40dbe
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,52 -1,0 +1,52 @@@
 +Source: libmwaw
 +Priority: optional
 +Maintainer: Rene Engelhard <rene at debian.org>
 +Build-Depends: debhelper (>= 9),
 +               dh-autoreconf,
-                doxygen,
 +               libboost-dev,
 +               librevenge-dev,
 +               pkg-config,
 +               zlib1g-dev
++Build-Depends-Indep: doxygen
 +Standards-Version: 3.9.6
 +Section: libs
 +Homepage: http://sourceforge.net/projects/libmwaw
 +
 +Package: libmwaw-dev
 +Section: libdevel
 +Architecture: any
 +Depends: libmwaw-0.3-3 (= ${binary:Version}),
 +         librevenge-dev,
 +         ${misc:Depends}
 +Description: import library for some old Mac text documents -- development
 + libmwaw contains some import filters for old Mac text documents
 + (MacWrite, ClarisWorks, ... ) based on top of libwpd.
 + .
 + This package contains the development files (headers, ...).
 +
 +Package: libmwaw-doc
 +Section: doc
 +Architecture: all
 +Depends: ${misc:Depends}
 +Description: import library for some old Mac text documents -- documentation
 + libmwaw contains some import filters for old Mac text documents
 + (MacWrite, ClarisWorks, ... ) based on top of libwpd.
 + .
 + This package contains the documentation.
 +
 +Package: libmwaw-0.3-3
 +Architecture: any
 +Depends: ${misc:Depends}, ${shlibs:Depends}
 +Description: import library for some old Mac text documents
 + libmwaw contains some import filters for old Mac text documents
 + (MacWrite, ClarisWorks, ... ) based on top of libwpd.
 +
 +Package: libmwaw-tools
 +Section: utils
 +Architecture: any
 +Depends: ${misc:Depends}, ${shlibs:Depends}
 +Description: import library for some old Mac text documents -- tools
 + libmwaw contains some import filters for old Mac text documents
 + (MacWrite, ClarisWorks, ... ) based on top of libwpd.
 + .
 + This package contains vsd2xtml and vsd2raw.
diff --cc debian/rules
index 5a54257,0000000..e614803
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,12 -1,0 +1,24 @@@
 +#!/usr/bin/make -f
 +
 +# Uncomment this to turn on verbose mode.
 +#export DH_VERBOSE=1
 +
++ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
++  NJOBS := -j $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
++endif
++	
++CONFIGURE_FLAGS += --disable-werror --docdir=/usr/share/doc/libmwaw-doc --libdir=/usr/lib --without-docs
++
 +%:
 +	dh $@ --parallel --with autoreconf
 +
 +override_dh_auto_configure:
- 	dh_auto_configure -- --disable-werror --docdir=/usr/share/doc/libmwaw-doc --libdir=/usr/lib \
- 		--disable-silent-rules
++
++override_dh_auto_build-arch:
++	dh_auto_configure -- $(CONFIGURE_FLAGS)
++	$(MAKE) $(NJOBS)
++
++override_dh_auto_build-indep:
++	dh_auto_configure -- $(filter-out --without-docs,$(CONFIGURE_FLAGS))
++	$(MAKE) $(NJOBS)
 +

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libmwaw.git



More information about the Pkg-openoffice-commits mailing list