diff --git a/MANIFEST.in b/MANIFEST.in index 0532301..832664c 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,9 +1,9 @@ -recursive-include test *.py -recursive-include data\input\sample * -recursive-include data\output -recursive-include facemovie\haarcascades *.xml +recursive-include log * +recursive-include bin * +recursive-include data/inputs/sample-test * +recursive-include data/media * +recursive-include data/ui * +recursive-include haarcascades *.xml recursive-include docs * -include CHANGES include LICENSE -include *.sh -include README.rst \ No newline at end of file +include README* \ No newline at end of file diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index e9244ce..0000000 --- a/debian/changelog +++ /dev/null @@ -1,11 +0,0 @@ -ivolution (0.2) precise; urgency=low - - * Tries to comply to debian packaging rules - - -- jlengrand Sun, 16 Jul 2012 23:22:11 +0200 - -ivolution (0.1) precise; urgency=low - - * Initial release. - - -- jlengrand Sun, 08 Jul 2012 20:22:11 +0200 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 45a4fb7..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -8 diff --git a/debian/control b/debian/control deleted file mode 100644 index ab1bf14..0000000 --- a/debian/control +++ /dev/null @@ -1,43 +0,0 @@ -Source: ivolution -Section: python -Priority: extra -Build-Depends: debhelper (>= 8), - python (>= 2.6.6-3~), - python-distutils-extra (>= 2.10), - libglib2.0-bin -Maintainer: Julien Lengrand-Lambert -Standards-Version: 3.9.3 -X-Python-Version: >= 2.6 - -Package: ivolution -Architecture: all -Depends: ${misc:Depends}, - ${python:Depends}, - yelp, - gir1.2-gtk-3.0, - gir1.2-glib-2.0, - gir1.2-dbusmenu-glib-0.4, - gir1.2-unity-5.0, - gir1.2-gdkpixbuf-2.0, - gir1.2-launchpad-integration-3.0, - yelp, - libopencv-calib3d2.3, - libopencv-contrib2.3, - libopencv-core2.3, - libopencv-dev, - libopencv-features2d2.3, - libopencv-flann2.3, - libopencv-gpu2.3, - libopencv-highgui2.3, - libopencv-imgproc2.3, - libopencv-legacy2.3, - libopencv-ml2.3, - libopencv-objdetect2.3, - libopencv-video2.3, - python-opencv, - gstreamer0.10-ffmpeg - -Description: Ivolution is a GTK interface built on top of the Facemovie project. It was designed for helping Ubuntu users to use FaceMovie. - FaceMovie is a project aiming at helping you create videos of yourself over time. - Simply take pictures of yourself, Facemovie does everything else for you. - FaceMovie may be used for faces, but also profiles or full body. The only limitation comes from you ! diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 830ea22..0000000 --- a/debian/copyright +++ /dev/null @@ -1,29 +0,0 @@ -Upstream-Name: ivolution -Upstream-Contact: Julien Lengrand-Lambert -Source: https://launchpad.net/~jlengrand/+archive/ivolution - - -License: - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY - DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -The Debian packaging is copyright 2012 Julien Lengrand-Lambert and available on the same terms as the package itself (see above). \ No newline at end of file diff --git a/debian/rules b/debian/rules deleted file mode 100755 index f42fe2c..0000000 --- a/debian/rules +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/make -f -%: -ifneq ($(shell dh -l | grep -xF translations),) - dh $@ --with python2,translations -else - dh $@ --with python2 -endif - - -override_dh_auto_install: - dh_auto_install -- --install-scripts=/opt/extras.ubuntu.com/ivolution --install-data=/opt/extras.ubuntu.com/ivolution - --install-lib=/opt/extras.ubuntu.com/ivolution - -override_dh_python2: - dh_python2 /opt/extras.ubuntu.com/ivolution - - -#!/usr/bin/make -f -%: -ifneq ($(shell dh -l | grep -xF translations),) - dh $@ --with python2,translations -else - dh $@ --with python2 -endif - -override_dh_auto_install: - dh_auto_install -- --install-scripts=/opt/extras.ubuntu.com/ivolution --install-data=/opt/extras.ubuntu.com/ivolution --install-lib=/opt/extras.ubuntu.com/ivolution - -override_dh_python2: - dh_python2 /opt/extras.ubuntu.com/ivolution - - -override_dh_install: - dh_install - mkdir -p debian/ivolution/opt/extras.ubuntu.com/ivolution/bin - if [ -x debian/ivolution/opt/extras.ubuntu.com/ivolution/ivolution ]; then mv debian/ivolution/opt/extras.ubuntu.com/ivolution/ivolution debian/ivolution/opt/extras.ubuntu.com/ivolution/bin; fi - if [ -f debian/ivolution/opt/extras.ubuntu.com/ivolution/share/applications/ivolution.desktop ]; then \ - mkdir -p debian/ivolution/usr/share/applications; \ - mv debian/ivolution/opt/extras.ubuntu.com/ivolution/share/applications/ivolution.desktop debian/ivolution/usr/share/applications/extras-ivolution.desktop; \ - rmdir --ignore-fail-on-non-empty debian/ivolution/opt/extras.ubuntu.com/ivolution/share/applications; \ - sed -i 's|Exec=.*|Exec=/opt/extras.ubuntu.com/ivolution/bin/ivolution|' debian/ivolution/usr/share/applications/extras-ivolution.desktop; \ - sed -i 's|Icon=/usr/|Icon=/opt/extras.ubuntu.com/ivolution/|' debian/ivolution/usr/share/applications/extras-ivolution.desktop; \ - fi - grep -RlZ 'import gettext' debian/ivolution/* | xargs -0 -r sed -i 's|\(import\) gettext$$|\1 locale|' - grep -RlZ 'from gettext import gettext as _' debian/ivolution/* | xargs -0 -r sed -i 's|from gettext \(import gettext as _\)|from locale \1|' - grep -RlZ "gettext.textdomain('ivolution')" debian/ivolution/* | xargs -0 -r sed -i "s|gettext\(\.textdomain('ivolution')\)|locale\.bindtextdomain('ivolution', '/opt/extras.ubuntu.com/ivolution/share/locale')\nlocale\1|" - sed -i "s|__ivolution_data_directory__ =.*|__ivolution_data_directory__ = '/opt/extras.ubuntu.com/ivolution/share/ivolution/'|" debian/ivolution/opt/extras.ubuntu.com/ivolution/download_monitor*/download_monitorconfig.py - sed -i 's| sys.path.insert(0, opt_path)|\0\n os.putenv("XDG_DATA_DIRS", "%s:%s" % ("/opt/extras.ubuntu.com/ivolution/share/", os.getenv("XDG_DATA_DIRS", "")))|' debian/ivolution/opt/extras.ubuntu.com/ivolution/bin/ivolution - if [ -d debian/ivolution/opt/extras.ubuntu.com/ivolution/share/glib-2.0/schemas ]; then glib-compile-schemas debian/ivolution/opt/extras.ubuntu.com/ivolution/share/glib-2.0/schemas; fi diff --git a/run.sh b/run.sh deleted file mode 100755 index 1e833e0..0000000 --- a/run.sh +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh - -echo "Running FaceMovie from Script !" - -ROOT="." -IN_DATA="data/inputs/samples" -OUT_DATA="data/output" - -python ${ROOT}/Facemoviefier.py -r $ROOT -i $IN_DATA -o $OUT_DATA diff --git a/setup.py b/setup.py index a1448a1..a7ee55c 100644 --- a/setup.py +++ b/setup.py @@ -9,12 +9,8 @@ import sys import os import glob -if "win" in sys.platform: - import py2exe import facemovie -sys.argv.append('py2exe') - def find_data_files(source,target,patterns): """Locates the specified data-files and returns the matches in a data_files compatible format. @@ -46,7 +42,7 @@ haar_files = find_data_files('facemovie','',['haarcascades/*.xml']) setup( name = "Facemovie", - version = "0.8.2", + version = "1.0", author = "Julien Lengrand-Lambert", author_email = "jlengrand@gmail.com", description = ("Take one picture of yourself a day, automatically generate a movie!"), @@ -54,8 +50,8 @@ setup( keywords = "image_processing computer_vision one_picture_a_day photography", url = "http://jlengrand.github.com/FaceMovie/", download_url = "http://jlengrand.github.com/FaceMovie/", - packages=['facemovie', 'facemovie.lib', 'haarcascades'], - long_description=read('README.rst'), + packages=['facemovie', 'facemovie.lib', 'haarcascades', 'gui'], + long_description=read('README.markdown'), classifiers=[ "Development Status :: 3 - Alpha", "Topic :: Multimedia :: Graphics", @@ -67,8 +63,4 @@ setup( "Programming Language :: Python :: 2 :: Only", ], data_files = haar_files, - options = {'py2exe': {'bundle_files': 1, # 3 dont bundle, 2 bundle but python interpreter, 1 bundle everything - 'includes': ['numpy'] } }, - console=['Facemoviefier.py'], - zipfile = None, )