r46592 - in /packages/cbp2make/trunk/debian: changelog copyright patches/series patches/tinyxmlremoval.patch

moeller at users.alioth.debian.org moeller at users.alioth.debian.org
Wed Mar 5 16:28:14 UTC 2014 

Author: moeller
Date: Wed Mar  5 16:28:14 2014
New Revision: 46592

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46592
Log:
Following advise by FTP masters - remove TinyXML

completely

Added:
    packages/cbp2make/trunk/debian/patches/tinyxmlremoval.patch
Modified:
    packages/cbp2make/trunk/debian/changelog
    packages/cbp2make/trunk/debian/copyright
    packages/cbp2make/trunk/debian/patches/series

Modified: packages/cbp2make/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/cbp2make/trunk/debian/changelog?rev=46592&op=diff
==============================================================================
--- packages/cbp2make/trunk/debian/changelog	(original)
+++ packages/cbp2make/trunk/debian/changelog	Wed Mar  5 16:28:14 2014
@@ -1,8 +1,10 @@
-cbp2make (147-1) unstable; urgency=low
+cbp2make (147+dfsg-1) unstable; urgency=low
 
   * Initial release for Debian.
 
     An Ubuntu PPA already offered something partially reusable, 
     no ITP issued.
 
+    The FTP masters is thanked for their initial review.
+
  -- Steffen Moeller <moeller at debian.org>  Sun, 16 Feb 2014 04:03:14 +0100

Modified: packages/cbp2make/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/cbp2make/trunk/debian/copyright?rev=46592&op=diff
==============================================================================
--- packages/cbp2make/trunk/debian/copyright	(original)
+++ packages/cbp2make/trunk/debian/copyright	Wed Mar  5 16:28:14 2014
@@ -6,6 +6,9 @@
 Copyright: 
         2010-2013 Mirai Computing <mirai.computing at gmail.com>
 License: GPL-3.0+
+
+Files: lib/doc/stringhash.docx
+License: Public Domain
 
 Files: debian/*
 Copyright:

Modified: packages/cbp2make/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/cbp2make/trunk/debian/patches/series?rev=46592&op=diff
==============================================================================
--- packages/cbp2make/trunk/debian/patches/series	(original)
+++ packages/cbp2make/trunk/debian/patches/series	Wed Mar  5 16:28:14 2014
@@ -1,3 +1,4 @@
 Makefile.patch
 #Makefile_tinyxml.patch
 #tinyxml.patch
+tinyxmlremoval.patch

Added: packages/cbp2make/trunk/debian/patches/tinyxmlremoval.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/cbp2make/trunk/debian/patches/tinyxmlremoval.patch?rev=46592&op=file
==============================================================================
--- packages/cbp2make/trunk/debian/patches/tinyxmlremoval.patch	(added)
+++ packages/cbp2make/trunk/debian/patches/tinyxmlremoval.patch	Wed Mar  5 16:28:14 2014
@@ -0,0 +1,228 @@
+Index: cbp2make-147+dfsg/cbp2make.cbp.mak.unix
+===================================================================
+--- cbp2make-147+dfsg.orig/cbp2make.cbp.mak.unix
++++ cbp2make-147+dfsg/cbp2make.cbp.mak.unix
+@@ -78,10 +78,6 @@
+ 	$(OBJDIR_DEBUG)/lib/stlstrings.o \
+ 	$(OBJDIR_DEBUG)/lib/stlvariables.o \
+ 	$(OBJDIR_DEBUG)/lib/stringhash.o \
+-	$(OBJDIR_DEBUG)/lib/tinyxml/tinystr.o \
+-	$(OBJDIR_DEBUG)/lib/tinyxml/tinyxml.o \
+-	$(OBJDIR_DEBUG)/lib/tinyxml/tinyxmlerror.o \
+-	$(OBJDIR_DEBUG)/lib/tinyxml/tinyxmlparser.o \
+ 	$(OBJDIR_DEBUG)/src/buildtools.o \
+ 	$(OBJDIR_DEBUG)/src/cbbuildcfg.o \
+ 	$(OBJDIR_DEBUG)/src/cbbuildmgr.o \
+@@ -126,10 +122,6 @@
+ 	$(OBJDIR_PROFILE)/lib/stlstrings.o \
+ 	$(OBJDIR_PROFILE)/lib/stlvariables.o \
+ 	$(OBJDIR_PROFILE)/lib/stringhash.o \
+-	$(OBJDIR_PROFILE)/lib/tinyxml/tinystr.o \
+-	$(OBJDIR_PROFILE)/lib/tinyxml/tinyxml.o \
+-	$(OBJDIR_PROFILE)/lib/tinyxml/tinyxmlerror.o \
+-	$(OBJDIR_PROFILE)/lib/tinyxml/tinyxmlparser.o \
+ 	$(OBJDIR_PROFILE)/src/buildtools.o \
+ 	$(OBJDIR_PROFILE)/src/cbbuildcfg.o \
+ 	$(OBJDIR_PROFILE)/src/cbbuildmgr.o \
+@@ -143,7 +135,6 @@
+ 	test -d bin/Debug || mkdir -p bin/Debug
+ 	test -d $(OBJDIR_DEBUG)/src || mkdir -p $(OBJDIR_DEBUG)/src
+ 	test -d $(OBJDIR_DEBUG)/lib || mkdir -p $(OBJDIR_DEBUG)/lib
+-	test -d $(OBJDIR_DEBUG)/lib/tinyxml || mkdir -p $(OBJDIR_DEBUG)/lib/tinyxml
+ 
+ after_debug: 
+ 
+@@ -203,18 +194,6 @@
+ $(OBJDIR_DEBUG)/lib/stringhash.o: lib/stringhash.cpp
+ 	$(CXX) $(CFLAGS_DEBUG) $(INC_DEBUG) -c lib/stringhash.cpp -o $(OBJDIR_DEBUG)/lib/stringhash.o
+ 
+-$(OBJDIR_DEBUG)/lib/tinyxml/tinystr.o: lib/tinyxml/tinystr.cpp
+-	$(CXX) $(CFLAGS_DEBUG) $(INC_DEBUG) -c lib/tinyxml/tinystr.cpp -o $(OBJDIR_DEBUG)/lib/tinyxml/tinystr.o
+-
+-$(OBJDIR_DEBUG)/lib/tinyxml/tinyxml.o: lib/tinyxml/tinyxml.cpp
+-	$(CXX) $(CFLAGS_DEBUG) $(INC_DEBUG) -c lib/tinyxml/tinyxml.cpp -o $(OBJDIR_DEBUG)/lib/tinyxml/tinyxml.o
+-
+-$(OBJDIR_DEBUG)/lib/tinyxml/tinyxmlerror.o: lib/tinyxml/tinyxmlerror.cpp
+-	$(CXX) $(CFLAGS_DEBUG) $(INC_DEBUG) -c lib/tinyxml/tinyxmlerror.cpp -o $(OBJDIR_DEBUG)/lib/tinyxml/tinyxmlerror.o
+-
+-$(OBJDIR_DEBUG)/lib/tinyxml/tinyxmlparser.o: lib/tinyxml/tinyxmlparser.cpp
+-	$(CXX) $(CFLAGS_DEBUG) $(INC_DEBUG) -c lib/tinyxml/tinyxmlparser.cpp -o $(OBJDIR_DEBUG)/lib/tinyxml/tinyxmlparser.o
+-
+ $(OBJDIR_DEBUG)/src/buildtools.o: src/buildtools.cpp
+ 	$(CXX) $(CFLAGS_DEBUG) $(INC_DEBUG) -c src/buildtools.cpp -o $(OBJDIR_DEBUG)/src/buildtools.o
+ 
+@@ -232,13 +211,11 @@
+ 	rm -rf bin/Debug
+ 	rm -rf $(OBJDIR_DEBUG)/src
+ 	rm -rf $(OBJDIR_DEBUG)/lib
+-	rm -rf $(OBJDIR_DEBUG)/lib/tinyxml
+ 
+ before_release: 
+ 	test -d bin/Release || mkdir -p bin/Release
+ 	test -d $(OBJDIR_RELEASE)/src || mkdir -p $(OBJDIR_RELEASE)/src
+ 	test -d $(OBJDIR_RELEASE)/lib || mkdir -p $(OBJDIR_RELEASE)/lib
+-	test -d $(OBJDIR_RELEASE)/lib/tinyxml || mkdir -p $(OBJDIR_RELEASE)/lib/tinyxml
+ 
+ after_release: 
+ 
+@@ -298,18 +275,6 @@
+ $(OBJDIR_RELEASE)/lib/stringhash.o: lib/stringhash.cpp
+ 	$(CXX) $(CFLAGS_RELEASE) $(INC_RELEASE) -c lib/stringhash.cpp -o $(OBJDIR_RELEASE)/lib/stringhash.o
+ 
+-$(OBJDIR_RELEASE)/lib/tinyxml/tinystr.o: lib/tinyxml/tinystr.cpp
+-	$(CXX) $(CFLAGS_RELEASE) $(INC_RELEASE) -c lib/tinyxml/tinystr.cpp -o $(OBJDIR_RELEASE)/lib/tinyxml/tinystr.o
+-
+-$(OBJDIR_RELEASE)/lib/tinyxml/tinyxml.o: lib/tinyxml/tinyxml.cpp
+-	$(CXX) $(CFLAGS_RELEASE) $(INC_RELEASE) -c lib/tinyxml/tinyxml.cpp -o $(OBJDIR_RELEASE)/lib/tinyxml/tinyxml.o
+-
+-$(OBJDIR_RELEASE)/lib/tinyxml/tinyxmlerror.o: lib/tinyxml/tinyxmlerror.cpp
+-	$(CXX) $(CFLAGS_RELEASE) $(INC_RELEASE) -c lib/tinyxml/tinyxmlerror.cpp -o $(OBJDIR_RELEASE)/lib/tinyxml/tinyxmlerror.o
+-
+-$(OBJDIR_RELEASE)/lib/tinyxml/tinyxmlparser.o: lib/tinyxml/tinyxmlparser.cpp
+-	$(CXX) $(CFLAGS_RELEASE) $(INC_RELEASE) -c lib/tinyxml/tinyxmlparser.cpp -o $(OBJDIR_RELEASE)/lib/tinyxml/tinyxmlparser.o
+-
+ $(OBJDIR_RELEASE)/src/buildtools.o: src/buildtools.cpp
+ 	$(CXX) $(CFLAGS_RELEASE) $(INC_RELEASE) -c src/buildtools.cpp -o $(OBJDIR_RELEASE)/src/buildtools.o
+ 
+@@ -327,7 +292,6 @@
+ 	rm -rf bin/Release
+ 	rm -rf $(OBJDIR_RELEASE)/src
+ 	rm -rf $(OBJDIR_RELEASE)/lib
+-	rm -rf $(OBJDIR_RELEASE)/lib/tinyxml
+ 
+ before_doxygen: 
+ 	doxygen Doxyfile
+@@ -340,7 +304,6 @@
+ 	test -d bin/Profile || mkdir -p bin/Profile
+ 	test -d $(OBJDIR_PROFILE)/src || mkdir -p $(OBJDIR_PROFILE)/src
+ 	test -d $(OBJDIR_PROFILE)/lib || mkdir -p $(OBJDIR_PROFILE)/lib
+-	test -d $(OBJDIR_PROFILE)/lib/tinyxml || mkdir -p $(OBJDIR_PROFILE)/lib/tinyxml
+ 
+ after_profile: 
+ 
+@@ -400,18 +363,6 @@
+ $(OBJDIR_PROFILE)/lib/stringhash.o: lib/stringhash.cpp
+ 	$(CXX) $(CFLAGS_PROFILE) $(INC_PROFILE) -c lib/stringhash.cpp -o $(OBJDIR_PROFILE)/lib/stringhash.o
+ 
+-$(OBJDIR_PROFILE)/lib/tinyxml/tinystr.o: lib/tinyxml/tinystr.cpp
+-	$(CXX) $(CFLAGS_PROFILE) $(INC_PROFILE) -c lib/tinyxml/tinystr.cpp -o $(OBJDIR_PROFILE)/lib/tinyxml/tinystr.o
+-
+-$(OBJDIR_PROFILE)/lib/tinyxml/tinyxml.o: lib/tinyxml/tinyxml.cpp
+-	$(CXX) $(CFLAGS_PROFILE) $(INC_PROFILE) -c lib/tinyxml/tinyxml.cpp -o $(OBJDIR_PROFILE)/lib/tinyxml/tinyxml.o
+-
+-$(OBJDIR_PROFILE)/lib/tinyxml/tinyxmlerror.o: lib/tinyxml/tinyxmlerror.cpp
+-	$(CXX) $(CFLAGS_PROFILE) $(INC_PROFILE) -c lib/tinyxml/tinyxmlerror.cpp -o $(OBJDIR_PROFILE)/lib/tinyxml/tinyxmlerror.o
+-
+-$(OBJDIR_PROFILE)/lib/tinyxml/tinyxmlparser.o: lib/tinyxml/tinyxmlparser.cpp
+-	$(CXX) $(CFLAGS_PROFILE) $(INC_PROFILE) -c lib/tinyxml/tinyxmlparser.cpp -o $(OBJDIR_PROFILE)/lib/tinyxml/tinyxmlparser.o
+-
+ $(OBJDIR_PROFILE)/src/buildtools.o: src/buildtools.cpp
+ 	$(CXX) $(CFLAGS_PROFILE) $(INC_PROFILE) -c src/buildtools.cpp -o $(OBJDIR_PROFILE)/src/buildtools.o
+ 
+@@ -429,7 +380,6 @@
+ 	rm -rf bin/Profile
+ 	rm -rf $(OBJDIR_PROFILE)/src
+ 	rm -rf $(OBJDIR_PROFILE)/lib
+-	rm -rf $(OBJDIR_PROFILE)/lib/tinyxml
+ 
+ virtual_all: debug release
+ 
+@@ -504,8 +454,7 @@
+ 	src/cbhelper.h \
+ 	lib/stlconvert.h \
+ 	lib/stlfutils.h \
+-	src/depsearch.h \
+-	lib/tinyxml/tinyxml.h
++	src/depsearch.h
+ 
+ src/cbptarget.h: lib/stlstrings.h \
+ 	src/platforms.h
+@@ -513,28 +462,23 @@
+ src/cbpunit.h: lib/stlstrings.h \
+ 	src/cbptarget.h
+ 
+-lib/tinyxml/tinyxml.h: lib/tinyxml/tinystr.h
+-
+ src/cbptarget.cpp: src/cbptarget.h \
+ 	src/cbhelper.h \
+ 	lib/stlconvert.h \
+-	lib/stlfutils.h \
+-	lib/tinyxml/tinyxml.h
++	lib/stlfutils.h
+ 
+ src/cbpunit.cpp: lib/macros.h \
+ 	src/cbpunit.h \
+ 	src/cbhelper.h \
+ 	lib/stlconvert.h \
+-	lib/stlfutils.h \
+-	lib/tinyxml/tinyxml.h
++	lib/stlfutils.h
+ 
+ src/cbworkspace.cpp: src/revision.h \
+ 	lib/macros.h \
+ 	src/cbworkspace.h \
+ 	src/cbbuildcfg.h \
+ 	src/cbhelper.h \
+-	lib/stlfutils.h \
+-	lib/tinyxml/tinyxml.h
++	lib/stlfutils.h
+ 
+ src/depsearch.cpp: src/cbhelper.h \
+ 	lib/stlfutils.h \
+@@ -542,19 +486,16 @@
+ 
+ src/cbhelper.cpp: src/cbhelper.h
+ 
+-src/makefile.cpp: lib/tinyxml/tinyxml.h \
+-	lib/stlconvert.h \
++src/makefile.cpp: lib/stlconvert.h \
+ 	src/cbhelper.h \
+ 	src/makefile.h
+ 
+ src/platforms.cpp: src/platforms.h \
+ 	lib/stlconvert.h \
+-	lib/stlfutils.h \
+-	lib/tinyxml/tinyxml.h
++	lib/stlfutils.h
+ 
+ src/toolchains.cpp: src/toolchains.h \
+-	lib/stlconvert.h \
+-	lib/tinyxml/tinyxml.h
++	lib/stlconvert.h
+ 
+ lib/stlconfig.cpp: lib/stlstrings.h \
+ 	lib/stlconfig.h
+@@ -573,29 +514,17 @@
+ 
+ lib/stringhash.cpp: lib/stringhash.h
+ 
+-lib/tinyxml/tinystr.cpp: lib/tinyxml/tinystr.h
+-
+-lib/tinyxml/tinyxml.cpp: lib/tinyxml/tinyxml.h
+-
+-lib/tinyxml/tinyxmlerror.cpp: lib/tinyxml/tinyxml.h
+-
+-lib/tinyxml/tinyxmlparser.cpp: lib/tinyxml/tinyxml.h
+-
+ src/buildtools.cpp: src/buildtools.h \
+ 	lib/stlconvert.h \
+-	src/cbhelper.h \
+-	lib/tinyxml/tinyxml.h
++	src/cbhelper.h
+ 
+ src/cbbuildcfg.cpp: src/cbbuildcfg.h \
+-	lib/stlconvert.h \
+-	lib/tinyxml/tinyxml.h
++	lib/stlconvert.h
+ 
+ src/cbbuildmgr.cpp: lib/stlfutils.h \
+-	src/cbbuildmgr.h \
+-	lib/tinyxml/tinyxml.h
++	src/cbbuildmgr.h
+ 
+-src/cbglobalvar.cpp: lib/tinyxml/tinyxml.h \
+-	lib/stlfutils.h \
++src/cbglobalvar.cpp: lib/stlfutils.h \
+ 	src/cbglobalvar.h \
+ 	src/cbhelper.h
+

More information about the debian-science-commits mailing list