[SCM] osceleton/master: build using Debian's liblo-dev rather than the included liblo sources

eighthave at users.alioth.debian.org eighthave at users.alioth.debian.org
Mon May 20 17:37:59 UTC 2013


The following commit has been merged in the master branch:
commit eb781b0b56f8d54cb0863b9b1f545188d61eb026
Author: Hans-Christoph Steiner <hans at eds.org>
Date:   Mon May 20 13:27:15 2013 -0400

    build using Debian's liblo-dev rather than the included liblo sources

diff --git a/debian/control b/debian/control
index 2381ecf..5fb8097 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alio
 Uploaders: Hans-Christoph Steiner <hans at eds.org>
 Build-Depends: debhelper (>= 7.0.50~),
                libopenni-dev,
-               freeglut3-dev
+               freeglut3-dev,
+               liblo-dev
 Standards-Version: 3.9.4
 Section: video
 Homepage: https://github.com/Sensebloom/OSCeleton
diff --git a/debian/patches/build-using-debian-liblo.patch b/debian/patches/build-using-debian-liblo.patch
new file mode 100644
index 0000000..9657890
--- /dev/null
+++ b/debian/patches/build-using-debian-liblo.patch
@@ -0,0 +1,18 @@
+diff --git a/Makefile b/Makefile
+index 9aa26ed..19d24bf 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,10 +1,7 @@
+ all: osceleton
+ 
+-liblo:
+-	cd liblo-0.26;./configure;make
+-
+-osceleton: liblo
+-	g++ src/OSCeleton.cpp src/viewer.cpp -O3 -Wno-write-strings -Iliblo-0.26 -I/usr/X11/include -I/usr/include/ni -lOpenNI -lstdc++ -L/usr/X11/lib -lGL -lGLU -lglut liblo-0.26/src/.libs/*.o -o osceleton
++osceleton:
++	g++ src/OSCeleton.cpp src/viewer.cpp -O3 -Wno-write-strings -I/usr/X11/include -I/usr/include/ni -lOpenNI -lstdc++ -L/usr/X11/lib -lGL -lGLU -lglut -llo  -o osceleton
+ 
+ clean:
+-	rm -f osceleton ; cd liblo-0.26; make clean
++	rm -f osceleton
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c1fa63e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+build-using-debian-liblo.patch
diff --git a/debian/rules b/debian/rules
index 089d8e4..e887ea8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,10 @@ docdir = $(prefix)/share/doc
 %:
 	dh $@
 
+# the upstream clean target is broken, and this is all we need:
+override_dh_auto_clean:
+	rm -f osceleton
+
 override_dh_auto_install:
 	install -d $(CURDIR)/debian/osceleton/$(bindir)
 	install -m755 osceleton $(CURDIR)/debian/osceleton$(bindir)

-- 
osceleton packaging



More information about the pkg-multimedia-commits mailing list