Update to 2.0.0 tree from current Fremantle build

[opencv] / debian / rules

diff --git a/debian/rules b/debian/rules
old mode 100644 (file)
new mode 100755 (executable)
index 3a6812d..589f732
--- a/debian/rules
+++ b/debian/rules
@@ -21,30 +21,42 @@ endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
        INSTALL_PROGRAM += -s
 endif
+ifneq (,$(CONCURRENCY_LEVEL))
+       MAKE_FLAGS += -j $(CONCURRENCY_LEVEL)
+endif
+
+PYTHON_CSPEC = /usr/include/python2.5/
+PYTHON = /usr/bin/python2.5
 
 config.status: configure
        dh_testdir
+       QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
        touch configure.in
        touch aclocal.m4
        touch configure
        touch cvconfig.h.in
        touch `find . -name Makefile.in`
        touch stamp-h.in
-       CFLAGS="$(CFLAGS)" ./configure $(confflags) --enable-static --without-python --with-apps
+       CFLAGS="$(CFLAGS)" PYTHON_CSPEC="$(PYTHON_CSPEC)" PYTHON="$(PYTHON)" \
+                ./configure $(confflags) --enable-static \
+               --disable-optimization --disable-sse --without-1394libs \
+                --disable-openmp --with-python
 
 build: build-stamp
 build-stamp: config.status
        dh_testdir
-       $(MAKE) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)"
+       $(MAKE) $(MAKE_FLAGS) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)"
        touch build-stamp
 
 clean:
        dh_testdir
        dh_testroot
        rm -f build-stamp 
-       -$(MAKE) distclean
+       [ ! -f Makefile ] || $(MAKE) distclean
        rm -f tests/cv/src/lt-cvtest.lst tests/cv/src/lt-cvtest.sum
-       dh_clean 
+       QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+       dh_clean
+       rm -rf stamp-h.in .pc
 
 install: build
        dh_testdir
@@ -54,46 +66,31 @@ install: build
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
        # Move files around
        mkdir -p debian/tmp/usr/share/doc/opencv-doc
-       mv debian/tmp/usr/share/opencv/doc/* debian/tmp/usr/share/doc/opencv-doc/
+       # mv debian/tmp/usr/share/opencv/doc/* debian/tmp/usr/share/doc/opencv-doc/
        mv debian/tmp/usr/share/opencv/readme.txt debian/tmp/usr/share/doc/opencv-doc/
        mv debian/tmp/usr/share/opencv/samples debian/tmp/usr/share/doc/opencv-doc/examples
-       # Remove useless files
-       rm -f `find debian/tmp -name license.txt`
-       rm -f `find debian/tmp -name '*.py[co]'`
        # Install files in their required packages
-       dh_install --sourcedir=debian/tmp --list-missing
+       dh_install --sourcedir=debian/tmp --list-missing -Xlicense.txt -X.pyc -X.pyo
 
 binary-indep: build install
        dh_testdir
        dh_testroot
        dh_installchangelogs -i ChangeLog
-       dh_installdocs -i AUTHORS THANKS TODO
-       dh_installexamples -p opencv-doc samples/c/*.c samples/c/*.png samples/c/*.jpg
+       dh_installdocs -i AUTHORS THANKS TODO debian/README.Debian
+       dh_installexamples -i
+       mv debian/opencv-doc/usr/share/doc/opencv-doc/examples/c/Makefile.debian debian/opencv-doc/usr/share/doc/opencv-doc/examples/c/Makefile
+       (cd debian/opencv-doc/usr/share/doc/opencv-doc/examples/python/; cp minidemo.py tmp ; echo '#!/usr/bin/python' >| minidemo.py ; cat tmp >> minidemo.py ; rm -f tmp)
        #dh_install -p opencv-doc docs/*.rtf usr/share/doc/opencv-doc
        #dh_install -p opencv-doc docs/*.pdf usr/share/doc/opencv-doc
        #dh_install -p opencv-doc docs/*.htm usr/share/doc/opencv-doc/html
        #dh_install -p opencv-doc docs/*.jpg usr/share/doc/opencv-doc/html
        #dh_install -p opencv-doc docs/ref usr/share/doc/opencv-doc/html
-#      dh_install
-#      dh_installmenu
-#      dh_installdebconf       
-#      dh_installlogrotate
-#      dh_installemacsen
-#      dh_installpam
-#      dh_installmime
-#      dh_installinit
-#      dh_installcron
-#      dh_installinfo
        dh_installman -i
        dh_link -i
        dh_strip -i
        dh_compress -i -Xexamples
        dh_fixperms -i
-#      dh_perl
-#      dh_python
-#      dh_makeshlibs
        dh_installdeb -i
-#      dh_shlibdeps -i
        dh_gencontrol -i
        dh_md5sums -i
        dh_builddeb -i
@@ -102,24 +99,14 @@ binary-arch: build install
        dh_testdir
        dh_testroot
        dh_installchangelogs -a ChangeLog
-       dh_installdocs -a AUTHORS THANKS TODO
+       dh_installdocs -a AUTHORS THANKS TODO debian/README.Debian
        dh_installexamples -a
-#      dh_install
-#      dh_installmenu
-#      dh_installdebconf       
-#      dh_installlogrotate
-#      dh_installemacsen
-#      dh_installpam
-#      dh_installmime
-#      dh_installinit
-#      dh_installcron
-#      dh_installinfo
-       dh_installman -p libcv-dev debian/opencv-config.1
+       dh_installman -a 
        dh_link -a
        dh_strip -a
        dh_compress -a
        dh_fixperms -a
-#      dh_perl
+       dh_pysupport -a
        dh_makeshlibs
        dh_installdeb -a
        dh_shlibdeps -a