[coin3] 01/03: Revert the previoud removal of embedded expat. (Closes: #884947)
Anton Gladky
gladk at moszumanska.debian.org
Sat Dec 23 08:52:58 UTC 2017
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository coin3.
commit 2b9d3344803617620d45e191e539558241ff852e
Author: Anton Gladky <gladk at debian.org>
Date: Sat Dec 23 09:48:43 2017 +0100
Revert the previoud removal of embedded expat. (Closes: #884947)
---
debian/copyright | 1 -
debian/patches/0030_remove_expat.patch | 225 ---------------------------------
debian/patches/series | 1 -
3 files changed, 227 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index 4369cb6..d00cc5c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,6 @@ Upstream-Name: Coin
Source: https://bitbucket.org/Coin3D/coin/wiki/Home
Files-Excluded:
cfg/*.exe
- src/xml/expat
Files: *
Copyright: Coin is copyright (C) 1998-2013 Kongsberg Oil & Gas Technologies AS
diff --git a/debian/patches/0030_remove_expat.patch b/debian/patches/0030_remove_expat.patch
deleted file mode 100644
index a90dd85..0000000
--- a/debian/patches/0030_remove_expat.patch
+++ /dev/null
@@ -1,225 +0,0 @@
-Description: Drop an embedded version of expat
-Author: Anton Gladky <gladk at debian.org>
-Bug-Debian: https://bugs.debian.org/874727
-Last-Update: 2017-12-20
-
-Index: coin3-3.1.4~abc9f50+dfsg2/configure
-===================================================================
---- coin3-3.1.4~abc9f50+dfsg2.orig/configure
-+++ coin3-3.1.4~abc9f50+dfsg2/configure
-@@ -21205,49 +21205,13 @@ fi
- # *******************************************************************
- # Enable/disable system expat
-
--sim_ac_enable_system_expat=false
--# Check whether --enable-system-expat was given.
--if test "${enable_system_expat+set}" = set; then :
-- enableval=$enable_system_expat;
-- case $enableval in
-- yes | true) sim_ac_enable_system_expat=true ;;
-- no | false) sim_ac_enable_system_expat=false ;;
-- *) ;;
-- esac
--fi
--
--
--
--
--if $sim_ac_enable_system_expat; then
-- USE_SYSTEM_EXPAT_TRUE=
-- USE_SYSTEM_EXPAT_FALSE='#'
--else
-- USE_SYSTEM_EXPAT_TRUE='#'
-- USE_SYSTEM_EXPAT_FALSE=
--fi
--
--
--if $sim_ac_enable_system_expat; then
-+sim_ac_enable_system_expat=true
-
--$as_echo "#define HAVE_SYSTEM_EXPAT 1" >>confdefs.h
-
-+USE_SYSTEM_EXPAT_TRUE=
-+USE_SYSTEM_EXPAT_FALSE='#'
-
--if test x"${sim_ac_configuration_settings+set}" = x"set"; then
-- sim_ac_configuration_settings="$sim_ac_configuration_settings|Use system expat:Yes"
--else
-- sim_ac_configuration_settings="Use system expat:Yes"
--fi
--
--else
--
--if test x"${sim_ac_configuration_settings+set}" = x"set"; then
-- sim_ac_configuration_settings="$sim_ac_configuration_settings|Use system expat:No (default)"
--else
-- sim_ac_configuration_settings="Use system expat:No (default)"
--fi
--
--fi
-+sim_ac_configuration_settings="Use system expat:Yes"
-
- # *******************************************************************
- # See if we should build with javascript capabilities.
-@@ -31574,7 +31538,7 @@ fi
- elements/GL:glelements engines errors events fields fonts glue io \
- manips misc lists nodekits navigation nodes rendering shapenodes projectors \
- sensors shaders upgraders hardcopy shadows geo foreignfiles collision \
-- xml xml/expat:expat profiler 3ds:format3ds scxml soscxml; \
-+ xml profiler 3ds:format3ds scxml soscxml; \
- do
- case $dir in
- *:* )
-@@ -32363,7 +32327,7 @@ ac_config_files="$ac_config_files src/Co
-
- # **************************************************************************
-
--ac_config_files="$ac_config_files Makefile bin/Makefile include/Makefile include/Inventor/Makefile include/Inventor/C/Makefile include/Inventor/C/XML/Makefile include/Inventor/C/base/Makefile include/Inventor/C/errors/Makefile include/Inventor/C/glue/Makefile include/Inventor/C/threads/Makefile include/Inventor/VRMLnodes/Makefile include/Inventor/XML/Makefile include/Inventor/actions/Makefile include/Inventor/bundles/Makefile include/Inventor/caches/Makefile include/Inventor/collision/M [...]
-+ac_config_files="$ac_config_files Makefile bin/Makefile include/Makefile include/Inventor/Makefile include/Inventor/C/Makefile include/Inventor/C/XML/Makefile include/Inventor/C/base/Makefile include/Inventor/C/errors/Makefile include/Inventor/C/glue/Makefile include/Inventor/C/threads/Makefile include/Inventor/VRMLnodes/Makefile include/Inventor/XML/Makefile include/Inventor/actions/Makefile include/Inventor/bundles/Makefile include/Inventor/caches/Makefile include/Inventor/collision/M [...]
-
-
- cat >confcache <<\_ACEOF
-@@ -33269,7 +33233,6 @@ do
- "src/geo/Makefile") CONFIG_FILES="$CONFIG_FILES src/geo/Makefile" ;;
- "src/foreignfiles/Makefile") CONFIG_FILES="$CONFIG_FILES src/foreignfiles/Makefile" ;;
- "src/xml/Makefile") CONFIG_FILES="$CONFIG_FILES src/xml/Makefile" ;;
-- "src/xml/expat/Makefile") CONFIG_FILES="$CONFIG_FILES src/xml/expat/Makefile" ;;
- "src/profiler/Makefile") CONFIG_FILES="$CONFIG_FILES src/profiler/Makefile" ;;
- "src/scxml/Makefile") CONFIG_FILES="$CONFIG_FILES src/scxml/Makefile" ;;
- "src/soscxml/Makefile") CONFIG_FILES="$CONFIG_FILES src/soscxml/Makefile" ;;
-Index: coin3-3.1.4~abc9f50+dfsg2/src/xml/document.cpp
-===================================================================
---- coin3-3.1.4~abc9f50+dfsg2.orig/src/xml/document.cpp
-+++ coin3-3.1.4~abc9f50+dfsg2/src/xml/document.cpp
-@@ -52,7 +52,7 @@
- #include <Inventor/lists/SbList.h>
- #include <Inventor/SbString.h>
-
--#include "expat/expat.h"
-+#include <expat.h>
- #include "utils.h"
- #include "elementp.h"
-
-Index: coin3-3.1.4~abc9f50+dfsg2/src/Makefile.in
-===================================================================
---- coin3-3.1.4~abc9f50+dfsg2.orig/src/Makefile.in
-+++ coin3-3.1.4~abc9f50+dfsg2/src/Makefile.in
-@@ -115,7 +115,7 @@ coin at COIN_MAJOR_VERSION@@SUFFIX at _lib_DEP
- collision/collision.lst hardcopy/hardcopy.lst \
- threads/threads.lst shaders/shaders.lst shadows/shadows.lst \
- geo/geo.lst foreignfiles/foreignfiles.lst xml/xml.lst \
-- xml/expat/expat.lst profiler/profiler.lst vrml97/vrml97.lst \
-+ profiler/profiler.lst vrml97/vrml97.lst \
- scxml/scxml.lst soscxml/soscxml.lst $(am__DEPENDENCIES_1)
- am__coin at COIN_MAJOR_VERSION@@SUFFIX at _lib_SOURCES_DIST = tidbits.cpp \
- actions/all-actions-cpp.cpp base/all-base-cpp.cpp \
-@@ -137,7 +137,7 @@ am__coin at COIN_MAJOR_VERSION@@SUFFIX at _lib
- threads/all-threads-cpp.cpp shaders/all-shaders-cpp.cpp \
- shadows/all-shadows-cpp.cpp geo/all-geo-cpp.cpp \
- foreignfiles/all-foreignfiles-cpp.cpp xml/all-xml-cpp.cpp \
-- xml/expat/all-expat-c.c profiler/all-profiler-cpp.cpp \
-+ profiler/all-profiler-cpp.cpp \
- vrml97/all-vrml97-cpp.cpp scxml/all-scxml-cpp.cpp \
- soscxml/all-soscxml-cpp.cpp
- @MAC_FRAMEWORK_FALSE at am__objects_1 = tidbits.$(OBJEXT)
-@@ -177,7 +177,6 @@ am__coin at COIN_MAJOR_VERSION@@SUFFIX at _lib
- @MAC_FRAMEWORK_TRUE@ all-geo-cpp.$(OBJEXT) \
- @MAC_FRAMEWORK_TRUE@ all-foreignfiles-cpp.$(OBJEXT) \
- @MAC_FRAMEWORK_TRUE@ all-xml-cpp.$(OBJEXT) \
-- at MAC_FRAMEWORK_TRUE@ all-expat-c.$(OBJEXT) \
- @MAC_FRAMEWORK_TRUE@ all-profiler-cpp.$(OBJEXT) \
- @MAC_FRAMEWORK_TRUE@ all-vrml97-cpp.$(OBJEXT) \
- @MAC_FRAMEWORK_TRUE@ all-scxml-cpp.$(OBJEXT) \
-@@ -224,7 +223,6 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
- @HACKING_DYNAMIC_MODULES_FALSE@@MAC_FRAMEWORK_FALSE@ geo/libgeo.la \
- @HACKING_DYNAMIC_MODULES_FALSE@@MAC_FRAMEWORK_FALSE@ foreignfiles/libforeignfiles.la \
- @HACKING_DYNAMIC_MODULES_FALSE@@MAC_FRAMEWORK_FALSE@ xml/libxml.la \
-- at HACKING_DYNAMIC_MODULES_FALSE@@MAC_FRAMEWORK_FALSE@ xml/expat/libexpat.la \
- @HACKING_DYNAMIC_MODULES_FALSE@@MAC_FRAMEWORK_FALSE@ profiler/libprofiler.la \
- @HACKING_DYNAMIC_MODULES_FALSE@@MAC_FRAMEWORK_FALSE@ vrml97/libvrml97.la \
- @HACKING_DYNAMIC_MODULES_FALSE@@MAC_FRAMEWORK_FALSE@ scxml/libscxml.la \
-@@ -250,7 +248,7 @@ am__libCoin at SUFFIX@_la_SOURCES_DIST = ti
- threads/all-threads-cpp.cpp shaders/all-shaders-cpp.cpp \
- shadows/all-shadows-cpp.cpp geo/all-geo-cpp.cpp \
- foreignfiles/all-foreignfiles-cpp.cpp xml/all-xml-cpp.cpp \
-- xml/expat/all-expat-c.c profiler/all-profiler-cpp.cpp \
-+ profiler/all-profiler-cpp.cpp \
- vrml97/all-vrml97-cpp.cpp scxml/all-scxml-cpp.cpp \
- soscxml/all-soscxml-cpp.cpp
- @MAC_FRAMEWORK_FALSE at am__objects_3 = tidbits.lo
-@@ -272,7 +270,7 @@ am__libCoin at SUFFIX@_la_SOURCES_DIST = ti
- @MAC_FRAMEWORK_TRUE@ all-threads-cpp.lo all-shaders-cpp.lo \
- @MAC_FRAMEWORK_TRUE@ all-shadows-cpp.lo all-geo-cpp.lo \
- @MAC_FRAMEWORK_TRUE@ all-foreignfiles-cpp.lo all-xml-cpp.lo \
-- at MAC_FRAMEWORK_TRUE@ all-expat-c.lo all-profiler-cpp.lo \
-+ at MAC_FRAMEWORK_TRUE@ all-profiler-cpp.lo \
- @MAC_FRAMEWORK_TRUE@ all-vrml97-cpp.lo all-scxml-cpp.lo \
- @MAC_FRAMEWORK_TRUE@ all-soscxml-cpp.lo tidbits.lo
- am_libCoin at SUFFIX@_la_OBJECTS = $(am__objects_3)
-@@ -305,8 +303,6 @@ am__depfiles_maybe = depfiles
- @AMDEP_TRUE@ ./$(DEPDIR)/all-errors-cpp.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/all-events-cpp.Plo \
- @AMDEP_TRUE@ ./$(DEPDIR)/all-events-cpp.Po \
-- at AMDEP_TRUE@ ./$(DEPDIR)/all-expat-c.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/all-expat-c.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/all-fields-cpp.Plo \
- @AMDEP_TRUE@ ./$(DEPDIR)/all-fields-cpp.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/all-fonts-cpp.Plo \
-@@ -702,7 +698,7 @@ DEFAULT_INCLUDES = -I$(top_builddir)/inc
- @HACKING_DYNAMIC_MODULES_FALSE@@MAC_FRAMEWORK_FALSE@ hardcopy/libhardcopy.la threads/libthreads.la \
- @HACKING_DYNAMIC_MODULES_FALSE@@MAC_FRAMEWORK_FALSE@ shaders/libshaders.la shadows/libshadows.la geo/libgeo.la \
- @HACKING_DYNAMIC_MODULES_FALSE@@MAC_FRAMEWORK_FALSE@ foreignfiles/libforeignfiles.la xml/libxml.la \
-- at HACKING_DYNAMIC_MODULES_FALSE@@MAC_FRAMEWORK_FALSE@ xml/expat/libexpat.la profiler/libprofiler.la \
-+ at HACKING_DYNAMIC_MODULES_FALSE@@MAC_FRAMEWORK_FALSE@ profiler/libprofiler.la \
- @HACKING_DYNAMIC_MODULES_FALSE@@MAC_FRAMEWORK_FALSE@ vrml97/libvrml97.la scxml/libscxml.la soscxml/libsoscxml.la $(SUPERGLULIBADD)
-
- @HACKING_DYNAMIC_MODULES_TRUE@@MAC_FRAMEWORK_FALSE at libCoin@SUFFIX at _la_LIBADD =
-@@ -752,7 +748,6 @@ DEFAULT_INCLUDES = -I$(top_builddir)/inc
- @MAC_FRAMEWORK_TRUE@ geo/all-geo-cpp.cpp \
- @MAC_FRAMEWORK_TRUE@ foreignfiles/all-foreignfiles-cpp.cpp \
- @MAC_FRAMEWORK_TRUE@ xml/all-xml-cpp.cpp \
-- at MAC_FRAMEWORK_TRUE@ xml/expat/all-expat-c.c \
- @MAC_FRAMEWORK_TRUE@ profiler/all-profiler-cpp.cpp \
- @MAC_FRAMEWORK_TRUE@ vrml97/all-vrml97-cpp.cpp \
- @MAC_FRAMEWORK_TRUE@ scxml/all-scxml-cpp.cpp \
-@@ -780,7 +775,7 @@ coin at COIN_MAJOR_VERSION@@SUFFIX at _lib_LIB
- collision/collision.lst hardcopy/hardcopy.lst \
- threads/threads.lst shaders/shaders.lst shadows/shadows.lst \
- geo/geo.lst foreignfiles/foreignfiles.lst xml/xml.lst \
-- xml/expat/expat.lst profiler/profiler.lst vrml97/vrml97.lst \
-+ profiler/profiler.lst vrml97/vrml97.lst \
- scxml/scxml.lst soscxml/soscxml.lst $(SUPERGLULSTADD)
-
- @MACOSX_10_2FF_FALSE at LibtoolLinkArgs = -no-undefined
-@@ -954,8 +949,6 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/all-errors-cpp.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/all-events-cpp.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/all-events-cpp.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/all-expat-c.Plo at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/all-expat-c.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/all-fields-cpp.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/all-fields-cpp.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/all-fonts-cpp.Plo at am__quote@
-Index: coin3-3.1.4~abc9f50+dfsg2/src/xml/Makefile.am
-===================================================================
---- coin3-3.1.4~abc9f50+dfsg2.orig/src/xml/Makefile.am
-+++ coin3-3.1.4~abc9f50+dfsg2/src/xml/Makefile.am
-@@ -1,7 +1,5 @@
- ## Process this file with automake to generate Makefile.in.
-
--SUBDIRS = expat
--
- RegularSources = \
- document.cpp \
- element.cpp \
-
---- coin3-3.1.4~abc9f50+dfsg2.orig/src/xml/Makefile.in
-+++ coin3-3.1.4~abc9f50+dfsg2/src/xml/Makefile.in
-@@ -424,7 +424,6 @@ target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--SUBDIRS = expat
- RegularSources = \
- document.cpp \
- element.cpp \
diff --git a/debian/patches/series b/debian/patches/series
index 6cfcb2c..e6f5f43 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
01_convert_old_patches.patch
0010-Remove-timestamp-in-generated-html.patch
0020_Remove_exe-installs.patch
-0030_remove_expat.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/coin3.git
More information about the debian-science-commits
mailing list