[libcdr] 02/05: Imported Debian patch 0.1.3-1

Rene Engelhard rene at moszumanska.debian.org
Tue Sep 13 02:53:47 UTC 2016


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

rene pushed a commit to branch master
in repository libcdr.

commit 5a43dec713b5410f35f9415230265aedf983ef35
Merge: 3fe4e17 b42380f
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Jul 25 16:17:03 2016 +0200

    Imported Debian patch 0.1.3-1

 ChangeLog                       |  270 +++++++
 Makefile.in                     |   10 +-
 NEWS                            |   13 +
 aclocal.m4                      |  211 +++--
 ar-lib                          |    2 +-
 config.guess                    |  445 +++++------
 config.sub                      |  145 ++--
 configure                       |   37 +-
 configure.ac                    |    2 +-
 debian/changelog                |    9 +
 debian/control                  |    2 +-
 debian/rules                    |   18 +-
 install-sh                      |  374 +++++----
 libcdr.spec                     |    2 +-
 ltmain.sh                       |    0
 m4/libtool.m4                   |    6 +-
 src/conv/raw/cdr2raw.cpp        |   19 +-
 src/conv/raw/cmx2raw.cpp        |   19 +-
 src/conv/svg/cdr2xhtml.cpp      |   22 +-
 src/conv/svg/cmx2xhtml.cpp      |   22 +-
 src/conv/text/cdr2text.cpp      |   19 +-
 src/conv/text/cmx2text.cpp      |   21 +-
 src/lib/CDRCollector.cpp        |   36 +
 src/lib/CDRCollector.h          |   17 +-
 src/lib/CDRContentCollector.cpp |  159 ++--
 src/lib/CDRContentCollector.h   |   28 +-
 src/lib/CDRDocumentStructure.h  |   21 +
 src/lib/CDRParser.cpp           |  187 ++---
 src/lib/CDRParser.h             |    4 +-
 src/lib/CDRStylesCollector.cpp  |   45 +-
 src/lib/CDRStylesCollector.h    |   15 +-
 src/lib/CDRTransforms.cpp       |   65 ++
 src/lib/CDRTransforms.h         |   11 +
 src/lib/CDRTypes.h              |   27 +-
 src/lib/CMXDocument.cpp         |    8 +-
 src/lib/CMXParser.cpp           | 1642 ++++++++++++++++++++++++++++++++++++---
 src/lib/CMXParser.h             |  120 ++-
 src/lib/CommonParser.cpp        |   68 ++
 src/lib/CommonParser.h          |    6 +-
 test-driver                     |   27 +-
 40 files changed, 3145 insertions(+), 1009 deletions(-)

diff --cc debian/changelog
index 5f2c8aa,0000000..d4bf08f
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,129 -1,0 +1,138 @@@
++libcdr (0.1.3-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 16:17:03 +0200
++
 +libcdr (0.1.2-2) unstable; urgency=medium
 +
 +  * add missing build-dependency on libcppunit-dev 
 +
 + -- Rene Engelhard <rene at debian.org>  Sat, 26 Dec 2015 11:10:43 +0100
 +
 +libcdr (0.1.2-1) unstable; urgency=medium
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene at debian.org>  Sat, 26 Dec 2015 10:11:39 +0100
 +
 +libcdr (0.1.1-2) unstable; urgency=medium
 +
 +  * upload to unstable
 +
 + -- Rene Engelhard <rene at debian.org>  Sun, 05 Apr 2015 19:06:34 +0200
 +
 +libcdr (0.1.1-1) experimental; urgency=medium
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene at debian.org>  Tue, 25 Nov 2014 18:38:43 +0100
 +
 +libcdr (0.1.0-3) unstable; urgency=low
 +
 +  * upload to unstable 
 +
 + -- Rene Engelhard <rene at debian.org>  Thu, 07 Aug 2014 22:50:34 +0200
 +
 +libcdr (0.1.0-2) experimental; urgency=low
 +
 +  * actually add --with autoreconf (really closes: #749064) 
 +  * fix debian/copyright (MPL 2.0only, add MPL text)
 +    (closes: #750801)
 +
 + -- Rene Engelhard <rene at debian.org>  Sun, 08 Jun 2014 11:04:08 +0200
 +
 +libcdr (0.1.0-1) experimental; urgency=low
 +
 +  * New upstream release
 +
 +  * use dh-autoreconf (closes: #749064)
 +
 + -- Rene Engelhard <rene at debian.org>  Fri, 23 May 2014 21:09:12 +0200
 +
 +libcdr (0.0.15-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene at debian.org>  Mon, 07 Apr 2014 15:06:15 +0200
 +
 +libcdr (0.0.14-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene at debian.org>  Fri, 17 May 2013 12:40:13 +0000
 +
 +libcdr (0.0.13-2) unstable; urgency=low
 +
 +  * add libboost-dev builddep, sigh
 +
 + -- Rene Engelhard <rene at debian.org>  Mon, 22 Apr 2013 19:55:54 +0200
 +
 +libcdr (0.0.13-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene at debian.org>  Mon, 22 Apr 2013 19:21:47 +0200
 +
 +libcdr (0.0.12-2) unstable; urgency=low
 +
 +  * upload to unstable 
 +
 + -- Rene Engelhard <rene at debian.org>  Thu, 18 Apr 2013 22:31:43 +0200
 +
 +libcdr (0.0.12-1) experimental; urgency=low
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene at debian.org>  Sun, 07 Apr 2013 23:01:29 +0200
 +
 +libcdr (0.0.11-2) experimental; urgency=low
 +
 +  * apply patches from Benjamin Drung:
 +    - drop useless override of dh_auto_install
 +    - remove empty line in beginning of libcdr-tools.install
 +    - really bump Standards-Version: 3.9.4 (no changes needed)
 +
 + -- Rene Engelhard <rene at debian.org>  Mon, 04 Mar 2013 20:13:45 +0100
 +
 +libcdr (0.0.11-1) experimental; urgency=low
 +
 +  * New upstream release
 +
 +  * apply patches from Benjamin Drung:
 +    - enable hardening
 +    - set docdir instead of fixing the installation directory afterwards
 +    - lintian fixes, Standards-Version: 3.9.4 (no changes needed)
 +    - add homepage field.
 +    - Add watch file.
 +    - run wrap-and-sort
 +  * --disable-silent-rules
 +
 + -- Rene Engelhard <rene at debian.org>  Sat, 02 Mar 2013 14:41:00 +0100
 +
 +libcdr (0.0.10-1) experimental; urgency=low
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene at debian.org>  Fri, 25 Jan 2013 09:39:27 +0100
 +
 +libcdr (0.0.9-2) experimental; urgency=low
 +
 +  * install cmx2{xhtml,raw} 
 +
 + -- Rene Engelhard <rene at debian.org>  Mon, 15 Oct 2012 22:03:27 +0200
 +
 +libcdr (0.0.9-1) experimental; urgency=low
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene at debian.org>  Fri, 05 Oct 2012 16:56:18 +0200
 +
 +libcdr (0.0.8-1) experimental; urgency=low
 +
 +  * Initial release
 +
 + -- Rene Engelhard <rene at debian.org>  Mon, 11 Jun 2012 14:34:07 +0200
diff --cc debian/control
index 9d6b2e5,0000000..a43e1d7
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,102 -1,0 +1,102 @@@
 +Source: libcdr
 +Priority: optional
 +Maintainer: Rene Engelhard <rene at debian.org>
 +Build-Depends: autotools-dev,
 +               dh-autoreconf,
 +               debhelper (>= 9),
-                doxygen,
 +               libboost-dev,
 +               libcppunit-dev,
 +               libicu-dev,
 +               liblcms2-dev,
 +               librevenge-dev,
 +               pkg-config,
 +               zlib1g-dev
++Build-Depends-Indep: doxygen
 +Standards-Version: 3.9.4
 +Section: libs
 +Homepage: http://freedesktop.org/wiki/Software/libcdr
 +
 +Package: libcdr-dev
 +Section: libdevel
 +Architecture: any
 +Depends: libcdr-0.1-1 (= ${binary:Version}),
 +         liblcms2-dev,
 +         librevenge-dev,
 +         zlib1g-dev,
 +         ${misc:Depends}
 +Description: library for reading and converting Corel DRAW files -- development
 + libcdr is a library and a set of tools for reading and converting binary files
 + produced by Corel DRAW.
 + .
 + libcdr currently supports just CDR files from V7 to X3 and the following
 + features:
 + .
 +  - pages and page sizes
 +  - shapes, lines, Bezier curves, bitmaps
 +  - flat color fills, both RGB, CMYK, HLS and HSB
 +  - different kinds of strokes including dashed strokes
 + .
 + Above that libcdr provides a public API for rendering preview of pages for
 + applications that have no notion of pages themselves.
 + .
 + This package contains the development files (headers, ...)
 +
 +Package: libcdr-doc
 +Section: doc
 +Architecture: all
 +Depends: ${misc:Depends}
 +Description: library for reading and converting Corel DRAW files -- documentation
 + libcdr is a library and a set of tools for reading and converting binary files
 + produced by Corel DRAW.
 + .
 + libcdr currently supports just CDR files from V7 to X3 and the following
 + features:
 + .
 +  - pages and page sizes
 +  - shapes, lines, Bezier curves, bitmaps
 +  - flat color fills, both RGB, CMYK, HLS and HSB
 +  - different kinds of strokes including dashed strokes
 + .
 + Above that libcdr provides a public API for rendering preview of pages for
 + applications that have no notion of pages themselves.
 + .
 + This package contains the documentation
 +
 +Package: libcdr-0.1-1
 +Architecture: any
 +Depends: ${misc:Depends}, ${shlibs:Depends}
 +Description: library for reading and converting Corel DRAW files
 + libcdr is a library and a set of tools for reading and converting binary files
 + produced by Corel DRAW.
 + .
 + libcdr currently supports just CDR files from V7 to X3 and the following
 + features:
 + .
 +  - pages and page sizes
 +  - shapes, lines, Bezier curves, bitmaps
 +  - flat color fills, both RGB, CMYK, HLS and HSB
 +  - different kinds of strokes including dashed strokes
 + .
 + Above that libcdr provides a public API for rendering preview of pages for
 + applications that have no notion of pages themselves.
 +
 +Package: libcdr-tools
 +Section: utils
 +Architecture: any
 +Depends: ${misc:Depends}, ${shlibs:Depends}
 +Description: library for reading and converting Corel DRAW files -- tools
 + libcdr is a library and a set of tools for reading and converting binary files
 + produced by Corel DRAW.
 + .
 + libcdr currently supports just CDR files from V7 to X3 and the following
 + features:
 + .
 +  - pages and page sizes
 +  - shapes, lines, Bezier curves, bitmaps
 +  - flat color fills, both RGB, CMYK, HLS and HSB
 +  - different kinds of strokes including dashed strokes
 + .
 + Above that libcdr provides a public API for rendering preview of pages for
 + applications that have no notion of pages themselves.
 + .
 + This package contains cdr2xtml/cdr2raw and cmx2xhtml/cmx2raw.
diff --cc debian/rules
index cca0126,0000000..93d7c09
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/libcdr-doc --libdir=/usr/lib --without-docs
++
 +%:
- 	dh $@ --with autoreconf
++	dh $@ --parallel --with autoreconf
 +
 +override_dh_auto_configure:
- 	dh_auto_configure -- --docdir=/usr/share/doc/libcdr-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/libcdr.git



More information about the Pkg-openoffice-commits mailing list