[critterding] 19/24: Remove embedded libs, switch to system ones.
Gabriele Giacone
gg0-guest at moszumanska.debian.org
Sat Aug 2 22:43:31 UTC 2014
This is an automated email from the git hooks/post-receive script.
gg0-guest pushed a commit to branch master
in repository critterding.
commit 7914cd19f4a9155c42e407d865e141b10b4012b8
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date: Sat Aug 2 20:59:46 2014 +0200
Remove embedded libs, switch to system ones.
---
debian/README.source | 9 +++--
debian/changelog | 12 ++++---
debian/control | 3 +-
debian/patches/02embeddedlibs | 81 +++++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 17 +++++----
debian/watch | 2 +-
7 files changed, 109 insertions(+), 16 deletions(-)
diff --git a/debian/README.source b/debian/README.source
index 3af9612..aa18fdc 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,8 +1,11 @@
critterding for Debian
----------------------
-The following prebuilt Windows binaries have been removed from tarball:
+The following pathnames contain embedded libraries, which have been
+removed from upstream tarball:
- - dependencies/bullet/GLUT32.DLL
- - dependencies/bullet/glut64.dll
+ - dependencies/bullet
+ - dependencies/glew
+ - dependencies/tinyxml
+ - src/utils/ftgl
diff --git a/debian/changelog b/debian/changelog
index 3b7e94f..caf4e72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,11 @@
-critterding (1.0-beta14-1) UNRELEASED; urgency=low
-
+critterding (1.0-beta14+dfsg-1) UNRELEASED; urgency=low
+
+ * Repacking:
+ + Remove embedded bullet, glew, tinyxml and ftgl libraries from tarball.
+ + Add patch to use system libraries instead of embedded ones.
+ + Add libbullet-dev, libglew-dev, libtinyxml-dev and libftgl-dev
+ as B-D.
+ + Readd +dfsg suffix to version.
* Make VCS-* fields canonical.
* Bump Standards-Version to 3.9.5 (no changes).
* Add cmake, libqt4-opengl-dev, libboost-{thread,filesystem,iostreams}-dev,
@@ -9,9 +15,7 @@ critterding (1.0-beta14-1) UNRELEASED; urgency=low
* Add parallel building support.
* Fix d/copyright according to format specification 1.0.
* Bump debhelper compatibility to 9.
- * Fix d/watch, remove +dfsg leftovers.
* Switch source and binaries compression to xz.
- * Remove prebuilt Windows binaries from tarball.
-- Gabriele Giacone <1o5g4r8o at gmail.com> Sat, 02 Aug 2014 11:41:51 +0200
diff --git a/debian/control b/debian/control
index e356e71..766699f 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ Uploaders: Gabriele Giacone <1o5g4r8o at gmail.com>
Build-Depends: debhelper (>= 9), autotools-dev, automake, libtool,
pkg-config, mesa-common-dev, libglu1-mesa-dev, libsdl1.2-dev, libftgl-dev,
imagemagick, cmake, libqt4-opengl-dev, libboost-thread-dev,
- libboost-filesystem-dev, libboost-iostreams-dev, libsdl-image1.2-dev
+ libboost-filesystem-dev, libboost-iostreams-dev, libsdl-image1.2-dev,
+ libbullet-dev, libtinyxml-dev, libglew-dev, libftgl-dev
Standards-Version: 3.9.5
Vcs-Git: git://anonscm.debian.org/debian-science/packages/critterding.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/critterding.git
diff --git a/debian/patches/02embeddedlibs b/debian/patches/02embeddedlibs
new file mode 100644
index 0000000..03ee57f
--- /dev/null
+++ b/debian/patches/02embeddedlibs
@@ -0,0 +1,81 @@
+Description: Make build use system libraries instead of embedded ones,
+ also removed from tarball.
+Author: Gabriele Giacone <1o5g4r8o at gmail.com>
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -41,8 +41,7 @@ ENDIF (WIN32)
+ SET(INSTALL_LIBS OFF) # THIS DOESNT WORK THE FIRST TIME AFTER REMOVING CMAKECACHE, ALTERED BULLETS CMAKELISTS.TXT:783
+ # SET(INSTALL_EXTRA_LIBS OFF)
+
+- include_directories( dependencies/bullet dependencies/bullet/src )
+- add_subdirectory( dependencies/bullet )
++ include_directories( /usr/include/bullet )
+
+
+ # ADD_DEFINITIONS( " -Ldependencies/bullet/src/BulletCollision -Bstatic -lLinearMath -lBulletMultiThreaded -lBulletDynamics -lBulletCollision" )
+@@ -57,16 +56,12 @@ ENDIF (WIN32)
+ # add_subdirectory( dependencies/boost/boost )
+
+ PROJECT(tinyxml)
+-include_directories(dependencies/tinyxml)
+-add_subdirectory(dependencies/tinyxml)
+
+ PROJECT(glew)
+ # IF(WIN32)
+ add_definitions(-DGLEW_STATIC)
+ # ENDIF(WIN32)
+
+-include_directories(dependencies/glew)
+-add_subdirectory(dependencies/glew)
+
+
+
+@@ -273,7 +268,7 @@ LINK_DIRECTORIES (
+ ${bengine_LIBS_DIRS}
+ )
+
+-SET(bengine_INCLUDES "${CMAKE_SOURCE_DIR};dependencies/bullet;dependencies/tinyxml;dependencies/;${FREETYPE_INCLUDE_DIRS};./${bengine_WIN32INCL}")
++SET(bengine_INCLUDES "${CMAKE_SOURCE_DIR};${FREETYPE_INCLUDE_DIRS};./${bengine_WIN32INCL}")
+ # SET(bengine_INCLUDES "${CMAKE_SOURCE_DIR}/ ./ src/utils/bullet")
+ # MESSAGE(${bengine_INCLUDES})
+
+--- a/src/graphics/be_graphics_system.h
++++ b/src/graphics/be_graphics_system.h
+@@ -14,7 +14,7 @@
+ #include "src/math/vector3f.h"
+ #include "src/math/vector4f.h"
+
+-#include "tinyxml/tinyxml.h"
++#include "tinyxml.h"
+
+ #include "common/be_xml_helper.h"
+ #include "resource/be_texture_2d_resource.h"
+--- a/src/graphics/CMakeLists.txt
++++ b/src/graphics/CMakeLists.txt
+@@ -15,4 +15,4 @@ set(gl_STAT_SRCS
+ )
+
+ add_library(graphics STATIC ${gl_STAT_SRCS})
+-target_link_libraries( graphics gl glew utils common math )
++target_link_libraries( graphics gl GLEW utils common math )
+--- a/src/utils/CMakeLists.txt
++++ b/src/utils/CMakeLists.txt
+@@ -1,6 +1,5 @@
+ include_directories( ${bengine_INCLUDES} )
+
+-add_subdirectory(ftgl)
+
+ set(utils_STAT_SRCS
+ settings.cpp
+--- a/src/gui/textprinter.cpp
++++ b/src/gui/textprinter.cpp
+@@ -2,7 +2,7 @@
+ #include <GL/glew.h>
+ #include <iostream>
+ #include "math/vector2i.h"
+-#include "utils/ftgl/FTGL/ftgl.h"
++#include "FTGL/ftgl.h"
+ #include "filesystem/be_filesystem.h"
+
+
diff --git a/debian/patches/series b/debian/patches/series
index 045d366..75e3c50 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
00fontandiconpath
01formatsecurity
+02embeddedlibs
diff --git a/debian/rules b/debian/rules
index ef7bc59..c2cecd5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
#!/usr/bin/make -f
-VERSION := $(shell dpkg-parsechangelog|sed -n '/^Version/{s/Version: \(.*\)-[0-9]*$$/\1/p}')
+VERSION := $(shell dpkg-parsechangelog|sed -n '/^Version/{s/Version: \(.*\)-[0-9]*$$/\1/;s/+dfsg//p}')
+DVERSION:= $(VERSION)+dfsg
%:
dh $@ --parallel
@@ -25,15 +26,17 @@ override_dh_auto_clean:
rm -rf $(CURDIR)/debian/icons obj-*
TMPDIR=get-orig-source-tmp
-EXCLUDES=*.dll
+EMBEDLIBS=dependencies/bullet dependencies/glew dependencies/tinyxml src/utils/ftgl
+TXZ=critterding_$(DVERSION).orig.tar.xz
get-orig-source:
mkdir -p $(TMPDIR)
uscan --verbose --download-version $(VERSION) --force-download \
- --destdir $(TMPDIR)
+ --destdir $(TMPDIR) --rename
tar jxf $(TMPDIR)/*.bz2 -C $(TMPDIR); rm -f $(TMPDIR)/*.bz2
- @echo "\nThe following files will be removed from tarball:"
- @cd $(TMPDIR)/*/ && find $(foreach pattern,$(EXCLUDES), -iname \
- $(pattern)) -print -delete
+ @echo "\nFollowing paths contain embedded libraries, removing from tarball:"
+ @cd $(TMPDIR)/*/ && for path in $(EMBEDLIBS); do \
+ echo $$path; rm -rf $$path; \
+ done
@echo Generating tarball...
- cd $(TMPDIR) && tar -Jcf ../../critterding_$(VERSION).orig.tar.xz *
+ cd $(TMPDIR) && tar -Jcf ../../$(TXZ) *
rm -rf $(TMPDIR)
diff --git a/debian/watch b/debian/watch
index 5028cd6..28d8ee1 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
version=3
-opts="uversionmangle=s/^/1.0-/" \
+opts="dversionmangle=s/\+dfsg//,uversionmangle=s/^/1.0-/" \
http://sf.net/critterding/critterding-(.*).tar.bz2
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/critterding.git
More information about the debian-science-commits
mailing list