--- artoolkitplus-2.1.1.orig/debian/changelog +++ artoolkitplus-2.1.1/debian/changelog @@ -0,0 +1,25 @@ +artoolkitplus (2.1.1-3~ppa4) karmic; urgency=low + + * need .hxx files installed as well + + -- Toby Collett Thu, 09 Jul 2009 20:45:55 +0200 + +artoolkitplus (2.1.1-3~ppa3) karmic; urgency=low + + * We also need to install some of the header files in the 'src' tree as well it seems + + -- Toby Collett Wed, 08 Jul 2009 15:19:42 +0200 + +artoolkitplus (2.1.1-3~ppa1) karmic; urgency=low + + * fix install of header files, copy command was 'echoed' out + + -- Toby Collett Wed, 08 Jul 2009 11:10:34 +0200 + +artoolkitplus (2.1.1-3) karmic; urgency=low + + * patch header files so they don't include files directly from the source + * include template files so we can actually build against the package + * Initial release (LP: #389347) + + -- Toby Collett Thu, 18 Jun 2009 16:02:03 +0200 --- artoolkitplus-2.1.1.orig/debian/libartoolkitplus-dev.install +++ artoolkitplus-2.1.1/debian/libartoolkitplus-dev.install @@ -0,0 +1,4 @@ +usr/include/* +usr/lib/lib*.so +usr/lib/pkgconfig/* +usr/share/* --- artoolkitplus-2.1.1.orig/debian/watch +++ artoolkitplus-2.1.1/debian/watch @@ -0,0 +1,9 @@ +# Example watch control file for uscan +# Rename this file to "watch" and then you can run the "uscan" command +# to check for upstream updates and more. +# See uscan(1) for format + +# Compulsory line, this is a version 3 file +version=3 + +http://studierstube.icg.tu-graz.ac.at/handheld_ar/artoolkitplus.php download/ARToolKitPlus_([\d.]*)\.zip --- artoolkitplus-2.1.1.orig/debian/compat +++ artoolkitplus-2.1.1/debian/compat @@ -0,0 +1 @@ +7 --- artoolkitplus-2.1.1.orig/debian/artoolkitplus.pc +++ artoolkitplus-2.1.1/debian/artoolkitplus.pc @@ -0,0 +1,8 @@ +prefix=/usr + +Name: artoolkitplus +Description: ARToolkitPlus Augmented Reality library +Version: 2.1 +Requires: +Libs: -L${prefix}/lib -lARToolKitPlus +Cflags: -I${prefix}/include/ --- artoolkitplus-2.1.1.orig/debian/libartoolkitplus2.install +++ artoolkitplus-2.1.1/debian/libartoolkitplus2.install @@ -0,0 +1,2 @@ +usr/lib/lib*.so.* +usr/bin/* usr/lib/artoolkitplus/ --- artoolkitplus-2.1.1.orig/debian/rules +++ artoolkitplus-2.1.1/debian/rules @@ -0,0 +1,109 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/quilt/quilt.make + + +export ARTKP=$(CURDIR) +export INSTALL_ROOT=$(CURDIR)/debian/tmp + + +# shared library versions, option 1 +version=2.1.1 +major=2 + + +build: build-stamp +build-stamp: $(QUILT_STAMPFN) + dh_testdir + + # Add here commands to compile the package. + qmake artoolkitplus.pro + + # we need to symlink src to include/ARToolKitPlus/template for it to build now + ln -s $(ARTKP)/src $(ARTKP)/include/ARToolKitPlus/template + + $(MAKE) + + touch $@ + +clean: $(QUILT_STAMPFN) clean-patched unpatch +clean-patched: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + qmake artoolkitplus.pro + $(MAKE) distclean + + # and remove the symlink we added earlier + rm -f $(ARTKP)/include/ARToolKitPlus/template + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + + # Add here commands to install the package into debian/tmp + $(MAKE) install + mkdir -p $(CURDIR)/debian/tmp/usr/lib/pkgconfig + cp $(CURDIR)/debian/artoolkitplus.pc $(CURDIR)/debian/tmp/usr/lib/pkgconfig/ + + # also need to copy the .cxx template sources to the include path + mkdir -p $(CURDIR)/debian/tmp/usr/include/ARToolKitPlus/template/extra + mkdir -p $(CURDIR)/debian/tmp/usr/include/ARToolKitPlus/template/core + mkdir -p $(CURDIR)/debian/tmp/usr/include/ARToolKitPlus/template/librpp + mkdir -p $(CURDIR)/debian/tmp/usr/include/ARToolKitPlus/template/math + cd $(CURDIR)/src && for f in `find -iname "*.cxx"`; do cp $$f $(CURDIR)/debian/tmp/usr/include/ARToolKitPlus/template/$$f; done + cd $(CURDIR)/src && for f in `find -iname "*.hxx"`; do cp $$f $(CURDIR)/debian/tmp/usr/include/ARToolKitPlus/template/$$f; done + cd $(CURDIR)/src && for f in `find -iname "*.h"`; do cp $$f $(CURDIR)/debian/tmp/usr/include/ARToolKitPlus/template/$$f; done + +# Build architecture-independent files here. +binary-indep: install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples + dh_install +# dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_perl +# dh_python + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- artoolkitplus-2.1.1.orig/debian/README.source +++ artoolkitplus-2.1.1/debian/README.source @@ -0,0 +1,5 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +See /usr/share/doc/quilt/README.source for a detailed explanation. --- artoolkitplus-2.1.1.orig/debian/control +++ artoolkitplus-2.1.1/debian/control @@ -0,0 +1,32 @@ +Source: artoolkitplus +Priority: extra +Maintainer: Ubuntu MOTU Developers +Uploaders: Toby Collett +Build-Depends: debhelper (>= 7), quilt, qt4-qmake +Standards-Version: 3.8.0 +Section: libs +Homepage: http://studierstube.icg.tu-graz.ac.at/handheld_ar/artoolkitplus.php + +Package: libartoolkitplus-dev +Section: libdevel +Architecture: any +Depends: libartoolkitplus2 (= ${binary:Version}) +Description: ARToolkitPlus Handheld Augmented Reality library - development + ARToolKit is a software library that can be used to calculate camera position + and orientation relative to physical markers in real time. This enables the + easy development of a wide range of Augmented Reality applications. + ARToolKitPlus is an extended version of ARToolKit's vision code that adds + features, but breaks compatibility due to a new class-based API. + . + This package contains the files needed to develop with ARToolkitPlus + +Package: libartoolkitplus2 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: ARToolkitPlus Handheld Augmented Reality library + ARToolKit is a software library that can be used to calculate camera position + and orientation relative to physical markers in real time. This enables the + easy development of a wide range of Augmented Reality applications. + ARToolKitPlus is an extended version of ARToolKit's vision code that adds + features, but breaks compatibility due to a new class-based API. --- artoolkitplus-2.1.1.orig/debian/copyright +++ artoolkitplus-2.1.1/debian/copyright @@ -0,0 +1,14 @@ +This package was debianized by Toby Collett on +Thu, 18 Jun 2009 16:02:03 +0200. + +It was downloaded from http://studierstube.icg.tu-graz.ac.at/handheld_ar/artoolkitplus.php + +For any open issues please contact: +daniel@icg.tu-graz.ac.at + +License: + + GPL-2 + +The Debian packaging is copyright 2009, Toby Collett and +is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'. --- artoolkitplus-2.1.1.orig/debian/docs +++ artoolkitplus-2.1.1/debian/docs @@ -0,0 +1,2 @@ +README +LICENSE.GPL --- artoolkitplus-2.1.1.orig/debian/patches/options +++ artoolkitplus-2.1.1/debian/patches/options @@ -0,0 +1,22 @@ +--- a/build/linux/options.pro ++++ b/build/linux/options.pro +@@ -13,8 +13,8 @@ + ### + # choose between debug and release mode + +-CONFIG = debug +-#CONFIG = release ++#CONFIG = debug ++CONFIG = release + + ### + # add additional optimization flags (platform-specific) +@@ -24,7 +24,7 @@ + } + else { + # QMAKE_CXXFLAGS = -mtune=pentium4 -march=pentium4 -msse2 -msse -fpermissive +- QMAKE_CXXFLAGS = -mtune=pentium4 -march=pentium4 -msse2 -msse ++# QMAKE_CXXFLAGS = -mtune=pentium4 -march=pentium4 -msse2 -msse + } + + --- artoolkitplus-2.1.1.orig/debian/patches/header_install +++ artoolkitplus-2.1.1/debian/patches/header_install @@ -0,0 +1,108 @@ +--- a/include/ARToolKitPlus/TrackerImpl.h ++++ b/include/ARToolKitPlus/TrackerImpl.h +@@ -633,7 +633,7 @@ + + ARToolKitPlus::Logger *logger; + +- int screenWidth, screenHeight; ++ static int screenWidth, screenHeight; + int thresh; + + ARParam cparam; +@@ -659,40 +659,40 @@ + + // this is templated code, so we need to include all this here... + // +-#include "../../src/extra/FixedPoint.h" +-#include "../../src/core/arBitFieldPattern.cxx" +-#include "../../src/core/arDetectMarker.cxx" +-#include "../../src/core/arDetectMarker2.cxx" +-#include "../../src/core/arGetCode.cxx" +-#include "../../src/core/arGetMarkerInfo.cxx" +-#include "../../src/core/arGetTransMat.cxx" +-#include "../../src/core/arGetTransMat2.cxx" +-#include "../../src/core/arGetTransMat3.cxx" +-#include "../../src/core/rppGetTransMat.cxx" // RPP integration -- [t.pintaric] +-#include "../../src/core/arGetTransMatCont.cxx" +-#include "../../src/core/arLabeling.cxx" +-#include "../../src/core/arMultiActivate.cxx" +-#include "../../src/core/arMultiGetTransMat.cxx" +-#include "../../src/core/rppMultiGetTransMat.cxx" // RPP integration -- [t.pintaric] +-#include "../../src/core/arMultiReadConfigFile.cxx" +-#include "../../src/core/arUtil.cxx" +-#include "../../src/core/matrix.cxx" +-#include "../../src/core/mPCA.cxx" +-//#include "../../src/core/paramChangeSize.cxx" +-#include "../../src/core/paramDecomp.cxx" +-#include "../../src/core/paramDistortion.cxx" +-#include "../../src/core/byteSwap.cxx" +-#include "../../src/core/paramFile.cxx" +-#include "../../src/core/vector.cxx" +- +-#include "../../src/CameraImpl.cxx" +-#include "../../src/CameraAdvImpl.cxx" +-#include "../../src/CameraFactory.cxx" +-#include "../../src/extra/BCH.cxx" +- +-#include "../../src/TrackerImpl.cxx" +-//#include "../../src/extra/harrisCornerDetector.cxx" +-//#include "../../src/extra/cornerRefinement.cxx" ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include // RPP integration -- [t.pintaric] ++#include ++#include ++#include ++#include ++#include // RPP integration -- [t.pintaric] ++#include ++#include ++#include ++#include ++//#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++ ++#include ++//#include ++//#include + + + #endif //__ARTOOLKIT_TRACKERIMPL_HEADERFILE__ +--- a/include/ARToolKitPlus/TrackerMultiMarkerImpl.h ++++ b/include/ARToolKitPlus/TrackerMultiMarkerImpl.h +@@ -183,7 +183,7 @@ + }; // namespace ARToolKitPlus + + +-#include "../src/TrackerMultiMarkerImpl.cxx" ++#include "ARToolKitPlus/template/TrackerMultiMarkerImpl.cxx" + + + #endif //__ARTOOLKITPLUS_TRACKERMULTIMARKERIMPL_HEADERFILE__ +--- a/include/ARToolKitPlus/TrackerSingleMarkerImpl.h ++++ b/include/ARToolKitPlus/TrackerSingleMarkerImpl.h +@@ -178,7 +178,7 @@ + + } // namespace ARToolKitPlus + +-#include "../src/TrackerSingleMarkerImpl.cxx" ++#include + + + #endif //__ARTOOLKITPLUS_TRACKERSINGLEMARKERIMPL_HEADERFILE__ --- artoolkitplus-2.1.1.orig/debian/patches/build_errors +++ artoolkitplus-2.1.1/debian/patches/build_errors @@ -0,0 +1,65 @@ +--- a/src/TrackerImpl.cxx ++++ b/src/TrackerImpl.cxx +@@ -50,6 +50,10 @@ + + namespace ARToolKitPlus { + ++AR_TEMPL_FUNC int ++AR_TEMPL_TRACKER::screenWidth; ++AR_TEMPL_FUNC int ++AR_TEMPL_TRACKER::screenHeight; + + AR_TEMPL_FUNC + AR_TEMPL_TRACKER::TrackerImpl() +--- a/src/librpp/rpp.cpp ++++ b/src/librpp/rpp.cpp +@@ -43,6 +43,7 @@ + + #ifndef _NO_LIBRPP_ + ++#include + + #include + #include "assert.h" +--- a/src/librpp/rpp_vecmat.cpp ++++ b/src/librpp/rpp_vecmat.cpp +@@ -40,6 +40,8 @@ + + #ifndef _NO_LIBRPP_ + ++#include ++#include + + #include "rpp_vecmat.h" + #include "math.h" +--- a/tools/IdPatGen/src/PN/Image.cpp ++++ b/tools/IdPatGen/src/PN/Image.cpp +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + + #if defined(TARGET_HOST_WIN32) || defined(TARGET_HOST_WINCE) + #include +--- a/tools/IdPatGen/src/PN/ImageTool.cpp ++++ b/tools/IdPatGen/src/PN/ImageTool.cpp +@@ -34,6 +34,7 @@ + + #include + #include ++#include + + #if defined(TARGET_HOST_WIN32) || defined(TARGET_HOST_WINCE) + #include +--- a/build/linux/options.pro ++++ b/build/linux/options.pro +@@ -6,7 +6,7 @@ + ### + # change target install path + +-INSTALL_PATH = /usr/local ++INSTALL_PATH = /usr + isEmpty(PREFIX) { PREFIX = $$INSTALL_PATH } + isEmpty(LIBDIR) { LIBDIR = $$PREFIX/lib } + --- artoolkitplus-2.1.1.orig/debian/patches/series +++ artoolkitplus-2.1.1/debian/patches/series @@ -0,0 +1,3 @@ +options +build_errors +header_install