diff -Nru smartshine-0.36/debian/changelog smartshine-0.36/debian/changelog --- smartshine-0.36/debian/changelog 2012-07-14 03:46:18.000000000 +0000 +++ smartshine-0.36/debian/changelog 2012-07-25 13:40:54.000000000 +0000 @@ -1,37 +1,11 @@ -smartshine (0.36-dhor1~all) all; urgency=low +smartshine (0.36-0extras12.04.2) precise; urgency=low - * Fix: open and convert png/bmp/others - * UI fix - 1 pixel margin removed :) + * New icon - -- Dariusz Duma Sat, 14 Jul 2012 05:44:45 +0200 - -smartshine (0.35-dhor1~all) all; urgency=low - - * Proper handle of square photos - * Fix 0 value bug - * Save/Not Save EXIF - * Fix resize errors - - -- Dariusz Duma Fri, 13 Jul 2012 07:24:05 +0200 - -smartshine (0.3-dhor1~all) all; urgency=low - - * Some GUI improvements - * Independent flip and rotate - * Busy mode indicator - * Fixes + -- Dariusz Duma Wed, 25 Jul 2012 15:40:20 +0200 - -- Dariusz Duma Thu, 12 Jul 2012 16:49:22 +0200 +smartshine (0.36-0extras12.04.2) precise; urgency=low -smartshine (0.2-dhor1~all) all; urgency=low + * Initial release. - * GTK3 - * Fixes - - -- Dariusz Duma Wed, 11 Jul 2012 07:30:57 +0200 - -smartshine (0.1-dhor1~all) all; urgency=low - - * Initial release - - -- Dariusz Duma Mon, 09 Jul 2012 20:27:07 +0200 + -- Dariusz Duma Sat, 14 Jul 2012 05:44:45 +0200 diff -Nru smartshine-0.36/debian/control smartshine-0.36/debian/control --- smartshine-0.36/debian/control 2012-07-11 05:36:49.000000000 +0000 +++ smartshine-0.36/debian/control 2012-07-17 16:55:17.000000000 +0000 @@ -3,11 +3,11 @@ Priority: extra Maintainer: Dariusz Duma Build-Depends: debhelper (>= 8.0.0) -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: http://sourceforge.net/p/smartshine Package: smartshine -Architecture: any +Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, python, python-imaging, libgirepository-1.0-1, python-pyexiv2, aaphoto (>=0.41) Description: Automatic photo adjusting software The program analyzes the histogram of the image and tries to set the most diff -Nru smartshine-0.36/debian/copyright smartshine-0.36/debian/copyright --- smartshine-0.36/debian/copyright 2012-07-09 18:30:52.000000000 +0000 +++ smartshine-0.36/debian/copyright 2012-07-17 16:55:17.000000000 +0000 @@ -1,36 +1,10 @@ Format: http://dep.debian.net/deps/dep5 Upstream-Name: smartshine -Source: +Upstream-Contact: Dariusz Duma +Source: https://launchpad.net/smartshine Files: * -Copyright: - -License: - - - . - - -# If you want to use GPL v2 or later for the /debian/* files use -# the following clauses, or change it to suit. Delete these two lines -Files: debian/* -Copyright: 2012 Dariusz Duma -License: GPL-2+ - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see - . +Copyright: 2012 Dariusz Duma +License: GPL-3 On Debian systems, the complete text of the GNU General - Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". - -# Please also look if there are files or directories which have a -# different copyright/license attached and list them here. + Public License version 2 can be found in "/usr/share/common-licenses/GPL-3". diff -Nru smartshine-0.36/debian/emacsen-install.ex smartshine-0.36/debian/emacsen-install.ex --- smartshine-0.36/debian/emacsen-install.ex 2012-07-09 18:30:52.000000000 +0000 +++ smartshine-0.36/debian/emacsen-install.ex 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -#! /bin/sh -e -# /usr/lib/emacsen-common/packages/install/smartshine - -# Written by Jim Van Zandt , borrowing heavily -# from the install scripts for gettext by Santiago Vila -# and octave by Dirk Eddelbuettel . - -FLAVOR=$1 -PACKAGE=smartshine - -if [ ${FLAVOR} = emacs ]; then exit 0; fi - -echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR} - -#FLAVORTEST=`echo $FLAVOR | cut -c-6` -#if [ ${FLAVORTEST} = xemacs ] ; then -# SITEFLAG="-no-site-file" -#else -# SITEFLAG="--no-site-file" -#fi -FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile" - -ELDIR=/usr/share/emacs/site-lisp/${PACKAGE} -ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} - -# Install-info-altdir does not actually exist. -# Maybe somebody will write it. -if test -x /usr/sbin/install-info-altdir; then - echo install/${PACKAGE}: install Info links for ${FLAVOR} - install-info-altdir --quiet --section "" "" --dirname=${FLAVOR} /usr/share/info/${PACKAGE}.info.gz -fi - -install -m 755 -d ${ELCDIR} -cd ${ELDIR} -FILES=`echo *.el` -cp ${FILES} ${ELCDIR} -cd ${ELCDIR} - -cat << EOF > path.el -(setq load-path (cons "." load-path) byte-compile-warnings nil) -EOF -${FLAVOR} ${FLAGS} ${FILES} -rm -f *.el path.el - -exit 0 diff -Nru smartshine-0.36/debian/emacsen-remove.ex smartshine-0.36/debian/emacsen-remove.ex --- smartshine-0.36/debian/emacsen-remove.ex 2012-07-09 18:30:52.000000000 +0000 +++ smartshine-0.36/debian/emacsen-remove.ex 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -#!/bin/sh -e -# /usr/lib/emacsen-common/packages/remove/smartshine - -FLAVOR=$1 -PACKAGE=smartshine - -if [ ${FLAVOR} != emacs ]; then - if test -x /usr/sbin/install-info-altdir; then - echo remove/${PACKAGE}: removing Info links for ${FLAVOR} - install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/share/info/smartshine.info.gz - fi - - echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR} - rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE} -fi diff -Nru smartshine-0.36/debian/emacsen-startup.ex smartshine-0.36/debian/emacsen-startup.ex --- smartshine-0.36/debian/emacsen-startup.ex 2012-07-09 18:30:52.000000000 +0000 +++ smartshine-0.36/debian/emacsen-startup.ex 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -;; -*-emacs-lisp-*- -;; -;; Emacs startup file, e.g. /etc/emacs/site-start.d/50smartshine.el -;; for the Debian smartshine package -;; -;; Originally contributed by Nils Naumann -;; Modified by Dirk Eddelbuettel -;; Adapted for dh-make by Jim Van Zandt - -;; The smartshine package follows the Debian/GNU Linux 'emacsen' policy and -;; byte-compiles its elisp files for each 'emacs flavor' (emacs19, -;; xemacs19, emacs20, xemacs20...). The compiled code is then -;; installed in a subdirectory of the respective site-lisp directory. -;; We have to add this to the load-path: -(let ((package-dir (concat "/usr/share/" - (symbol-name flavor) - "/site-lisp/smartshine"))) -;; If package-dir does not exist, the smartshine package must have -;; removed but not purged, and we should skip the setup. - (when (file-directory-p package-dir) - (setq load-path (cons package-dir load-path)) - (autoload 'smartshine-mode "smartshine-mode" - "Major mode for editing smartshine files." t) - (add-to-list 'auto-mode-alist '("\\.smartshine$" . smartshine-mode)))) - diff -Nru smartshine-0.36/debian/init.d.ex smartshine-0.36/debian/init.d.ex --- smartshine-0.36/debian/init.d.ex 2012-07-09 18:30:52.000000000 +0000 +++ smartshine-0.36/debian/init.d.ex 1970-01-01 00:00:00.000000000 +0000 @@ -1,154 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: smartshine -# Required-Start: $network $local_fs -# Required-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: -# Description: -# <...> -# <...> -### END INIT INFO - -# Author: Dariusz Duma - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC=smartshine # Introduce a short description here -NAME=smartshine # Introduce the short server's name here -DAEMON=/usr/sbin/smartshine # Introduce the server's location here -DAEMON_ARGS="" # Arguments to run the daemon with -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/etc/init.d/$NAME - -# Exit if the package is not installed -[ -x $DAEMON ] || exit 0 - -# Read configuration variable file if it is present -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -# Load the VERBOSE setting and other rcS variables -. /lib/init/vars.sh - -# Define LSB log_* functions. -# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. -. /lib/lsb/init-functions - -# -# Function that starts the daemon/service -# -do_start() -{ - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ - || return 1 - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ - $DAEMON_ARGS \ - || return 2 - # Add code here, if necessary, that waits for the process to be ready - # to handle requests from services started subsequently which depend - # on this one. As a last resort, sleep for some time. -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON - [ "$?" = 2 ] && return 2 - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - return "$RETVAL" -} - -# -# Function that sends a SIGHUP to the daemon/service -# -do_reload() { - # - # If the daemon can reload its configuration without - # restarting (for example, when it is sent a SIGHUP), - # then implement that here. - # - start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME - return 0 -} - -case "$1" in - start) - [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME" - do_start - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - stop) - [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - #reload|force-reload) - # - # If do_reload() is not implemented then leave this commented out - # and leave 'force-reload' as an alias for 'restart'. - # - #log_daemon_msg "Reloading $DESC" "$NAME" - #do_reload - #log_end_msg $? - #;; - restart|force-reload) - # - # If the "reload" option is implemented then remove the - # 'force-reload' alias - # - log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - case "$?" in - 0) log_end_msg 0 ;; - 1) log_end_msg 1 ;; # Old process is still running - *) log_end_msg 1 ;; # Failed to start - esac - ;; - *) - # Failed to stop - log_end_msg 1 - ;; - esac - ;; - *) - #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac - -: diff -Nru smartshine-0.36/debian/manpage.1.ex smartshine-0.36/debian/manpage.1.ex --- smartshine-0.36/debian/manpage.1.ex 2012-07-09 18:30:52.000000000 +0000 +++ smartshine-0.36/debian/manpage.1.ex 1970-01-01 00:00:00.000000000 +0000 @@ -1,59 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH SMARTSHINE SECTION "July 9, 2012" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -smartshine \- program to do something -.SH SYNOPSIS -.B smartshine -.RI [ options ] " files" ... -.br -.B bar -.RI [ options ] " files" ... -.SH DESCRIPTION -This manual page documents briefly the -.B smartshine -and -.B bar -commands. -.PP -.\" TeX users may be more comfortable with the \fB\fP and -.\" \fI\fP escape sequences to invode bold face and italics, -.\" respectively. -\fBsmartshine\fP is a program that... -.SH OPTIONS -These programs follow the usual GNU command line syntax, with long -options starting with two dashes (`-'). -A summary of options is included below. -For a complete description, see the Info files. -.TP -.B \-h, \-\-help -Show summary of options. -.TP -.B \-v, \-\-version -Show version of program. -.SH SEE ALSO -.BR bar (1), -.BR baz (1). -.br -The programs are documented fully by -.IR "The Rise and Fall of a Fooish Bar" , -available via the Info system. -.SH AUTHOR -smartshine was written by . -.PP -This manual page was written by Dariusz Duma , -for the Debian project (and may be used by others). diff -Nru smartshine-0.36/debian/manpage.sgml.ex smartshine-0.36/debian/manpage.sgml.ex --- smartshine-0.36/debian/manpage.sgml.ex 2012-07-09 18:30:52.000000000 +0000 +++ smartshine-0.36/debian/manpage.sgml.ex 1970-01-01 00:00:00.000000000 +0000 @@ -1,154 +0,0 @@ - manpage.1'. You may view - the manual page with: `docbook-to-man manpage.sgml | nroff -man | - less'. A typical entry in a Makefile or Makefile.am is: - -manpage.1: manpage.sgml - docbook-to-man $< > $@ - - - The docbook-to-man binary is found in the docbook-to-man package. - Please remember that if you create the nroff version in one of the - debian/rules file targets (such as build), you will need to include - docbook-to-man in your Build-Depends control field. - - --> - - - FIRSTNAME"> - SURNAME"> - - July 9, 2012"> - - SECTION"> - dhor@unknown"> - - SMARTSHINE"> - - - Debian"> - GNU"> - GPL"> -]> - - - -
- &dhemail; -
- - &dhfirstname; - &dhsurname; - - - 2003 - &dhusername; - - &dhdate; -
- - &dhucpackage; - - &dhsection; - - - &dhpackage; - - program to do something - - - - &dhpackage; - - - - - - - - DESCRIPTION - - This manual page documents briefly the - &dhpackage; and bar - commands. - - This manual page was written for the &debian; distribution - because the original program does not have a manual page. - Instead, it has documentation in the &gnu; - Info format; see below. - - &dhpackage; is a program that... - - - - OPTIONS - - These programs follow the usual &gnu; command line syntax, - with long options starting with two dashes (`-'). A summary of - options is included below. For a complete description, see the - Info files. - - - - - - - - Show summary of options. - - - - - - - - Show version of program. - - - - - - SEE ALSO - - bar (1), baz (1). - - The programs are documented fully by The Rise and - Fall of a Fooish Bar available via the - Info system. - - - AUTHOR - - This manual page was written by &dhusername; &dhemail; for - the &debian; system (and may be used by others). Permission is - granted to copy, distribute and/or modify this document under - the terms of the &gnu; General Public License, Version 2 any - later version published by the Free Software Foundation. - - - On Debian systems, the complete text of the GNU General Public - License can be found in /usr/share/common-licenses/GPL. - - - -
- - diff -Nru smartshine-0.36/debian/manpage.xml.ex smartshine-0.36/debian/manpage.xml.ex --- smartshine-0.36/debian/manpage.xml.ex 2012-07-09 18:30:52.000000000 +0000 +++ smartshine-0.36/debian/manpage.xml.ex 1970-01-01 00:00:00.000000000 +0000 @@ -1,291 +0,0 @@ - -.
will be generated. You may view the -manual page with: nroff -man .
| less'. A typical entry -in a Makefile or Makefile.am is: - -DB2MAN = /usr/share/sgml/docbook/stylesheet/xsl/docbook-xsl/manpages/docbook.xsl -XP = xsltproc -''-nonet -''-param man.charmap.use.subset "0" - -manpage.1: manpage.xml - $(XP) $(DB2MAN) $< - -The xsltproc binary is found in the xsltproc package. The XSL files are in -docbook-xsl. A description of the parameters you can use can be found in the -docbook-xsl-doc-* packages. Please remember that if you create the nroff -version in one of the debian/rules file targets (such as build), you will need -to include xsltproc and docbook-xsl in your Build-Depends control field. -Alternatively use the xmlto command/package. That will also automatically -pull in xsltproc and docbook-xsl. - -Notes for using docbook2x: docbook2x-man does not automatically create the -AUTHOR(S) and COPYRIGHT sections. In this case, please add them manually as - ... . - -To disable the automatic creation of the AUTHOR(S) and COPYRIGHT sections -read /usr/share/doc/docbook-xsl/doc/manpages/authors.html. This file can be -found in the docbook-xsl-doc-html package. - -Validation can be done using: `xmllint -''-noout -''-valid manpage.xml` - -General documentation about man-pages and man-page-formatting: -man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/ - ---> - - - - - - - - - - - - - -]> - - - - &dhtitle; - &dhpackage; - - - &dhfirstname; - &dhsurname; - Wrote this manpage for the Debian system. -
- &dhemail; -
-
-
- - 2007 - &dhusername; - - - This manual page was written for the Debian system - (and may be used by others). - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU General Public License, - Version 2 or (at your option) any later version published by - the Free Software Foundation. - On Debian systems, the complete text of the GNU General Public - License can be found in - /usr/share/common-licenses/GPL. - -
- - &dhucpackage; - &dhsection; - - - &dhpackage; - program to do something - - - - &dhpackage; - - - - - - - - - this - - - - - - - - this - that - - - - - &dhpackage; - - - - - - - - - - - - - - - - - - - DESCRIPTION - This manual page documents briefly the - &dhpackage; and bar - commands. - This manual page was written for the Debian distribution - because the original program does not have a manual page. - Instead, it has documentation in the GNU - info - 1 - format; see below. - &dhpackage; is a program that... - - - OPTIONS - The program follows the usual GNU command line syntax, - with long options starting with two dashes (`-'). A summary of - options is included below. For a complete description, see the - - info - 1 - files. - - - - - - - Does this and that. - - - - - - - Show summary of options. - - - - - - - Show version of program. - - - - - - FILES - - - /etc/foo.conf - - The system-wide configuration file to control the - behaviour of &dhpackage;. See - - foo.conf - 5 - for further details. - - - - ${HOME}/.foo.conf - - The per-user configuration file to control the - behaviour of &dhpackage;. See - - foo.conf - 5 - for further details. - - - - - - ENVIONMENT - - - FOO_CONF - - If used, the defined file is used as configuration - file (see also ). - - - - - - DIAGNOSTICS - The following diagnostics may be issued - on stderr: - - - Bad configuration file. Exiting. - - The configuration file seems to contain a broken configuration - line. Use the option, to get more info. - - - - - &dhpackage; provides some return codes, that can - be used in scripts: - - Code - Diagnostic - - 0 - Program exited successfully. - - - 1 - The configuration file seems to be broken. - - - - - - BUGS - The program is currently limited to only work - with the foobar library. - The upstreams BTS can be found - at . - - - SEE ALSO - - - bar - 1 - , - baz - 1 - , - foo.conf - 5 - - The programs are documented fully by The Rise and - Fall of a Fooish Bar available via the - info - 1 - system. - -
- diff -Nru smartshine-0.36/debian/menu.ex smartshine-0.36/debian/menu.ex --- smartshine-0.36/debian/menu.ex 2012-07-09 18:30:52.000000000 +0000 +++ smartshine-0.36/debian/menu.ex 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -?package(smartshine):needs="X11|text|vc|wm" section="Applications/see-menu-manual"\ - title="smartshine" command="/usr/bin/smartshine" diff -Nru smartshine-0.36/debian/patches/precise1 smartshine-0.36/debian/patches/precise1 --- smartshine-0.36/debian/patches/precise1 1970-01-01 00:00:00.000000000 +0000 +++ smartshine-0.36/debian/patches/precise1 2012-07-19 04:27:38.000000000 +0000 @@ -0,0 +1,150 @@ +Description: + TODO: Put a short summary on the line above and replace this paragraph + with a longer explanation of this change. Complete the meta-information + with other relevant fields (see below for details). To make it easier, the + information below has been extracted from the changelog. Adjust it or drop + it. + . + smartshine (0.36-0extras12.04.1) precise; urgency=low + . + * Initial release. +Author: Dariusz Duma + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: http://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +--- /dev/null ++++ smartshine-0.36/extras-smartshine.desktop +@@ -0,0 +1,19 @@ ++[Desktop Entry] ++Version=1.0 ++Name=SmartShine Photo ++GenericName=SmartShine Photo ++Comment=Make your photos shine - auto gamma levels, contrast, saturation ++Comment[pl]=Zbalansuj swoje zdjęcia - automatyczna korekta kontrastu, saturacji, poziomów ++ ++Type=Application ++Categories=Graphics;Photography; ++ ++Exec=/opt/extras.ubuntu.com/smartshine/smartshine %F ++TryExec=/opt/extras.ubuntu.com/smartshine/smartshine ++Icon=/opt/extras.ubuntu.com/smartshine/pixmaps/smartshine.png ++ ++Terminal=false ++StartupNotify=true ++ ++MimeType=application/x-sshine;image/jpeg;image/png;image/bmp;image/jp2 ++Name[pl_PL]=SmartShine Photo +--- smartshine-0.36.orig/smartshine.py ++++ smartshine-0.36/smartshine.py +@@ -40,18 +40,18 @@ except: + # sys.exit(1) + + APP = 'SmartShine Photo' +-__VERSION__='0.35' ++__VERSION__='0.36' + __LICENSE__='GPL' + __COPYRIGHT__='Dariusz Duma' + __WEBSITE__='http://launchpad.net/smartshine' + +-if os.path.exists('/usr/share/smartshine/ui/smartshine_g3.ui') \ +- and os.path.exists('/usr/share/pixmaps/smartshine.png'): +- # and os.path.exists('/usr/share/mfusion/images/logoSplash.png'): ++if os.path.exists('/opt/extras.ubuntu.com/smartshine/ui/smartshine_g3.ui') \ ++ and os.path.exists('/opt/extras.ubuntu.com/smartshine/pixmaps/smartshine.png'): ++ # and os.path.exists('/opt/extras.ubuntu.com/mfusion/images/logoSplash.png'): + # print ("System wide install!") +- DIR = '/usr/share/locale/' +- IMG = '/usr/share/pixmaps/' +- UI = '/usr/share/smartshine/ui/' ++ DIR = '/opt/extras.ubuntu.com/smartshine/locale/' ++ IMG = '/opt/extras.ubuntu.com/smartshine/pixmaps/' ++ UI = '/opt/extras.ubuntu.com/smartshine/ui/' + + elif os.path.exists(sys.path[0] + "/ui/smartshine_g3.ui"): + # print ("Local run!") +@@ -283,7 +283,7 @@ class Interface: + def rm_if_exist(self, photo, where): + path, photo = os.path.split(photo) + fileaanew, fileaaext = os.path.splitext(photo) +- self.fileaa = fileaanew + "_new" + fileaaext ++ self.fileaa = fileaanew + "_new" + ".jpg" + if os.path.isfile(where + "/" + self.fileaa): + os.remove(where + "/" + self.fileaa) + +@@ -411,7 +411,7 @@ class Interface: + self.badfiles=[] + self.default_settings=["-a", "-o"] + for photo in self.photos: +- if re.search('\\.jpg$|\\.jpeg$|\\.png$|\\.bmp$|\\.jp2$', photo, flags=re.IGNORECASE): ++ if re.search('\\.jpg$|\\.jpeg$|\\.png$|\\.bmp$|\\.jp2$|\\.ppm$', photo, flags=re.IGNORECASE): + self.photo_thumb=self.make_thumb(photo,(int(512), int(512))) + pb = GdkPixbuf.Pixbuf.new_from_file(photo) + im = self.pixbuf2Image(pb) +@@ -420,9 +420,8 @@ class Interface: + self.width = self.size[0] + else: + self.width = self.size[1] +- self.tags2 = Gui.get_exif(photo) ++ self.tags2 = self.get_exif(photo) + self.photo_thumb_new = self.make_thumb_prev(self.photo_thumb, self.default_settings) # !!!! Check, if exist +- + if not self.tags2: + self.tags2='' + self.tooltip=(""+_("Auto-corrected:")+" \n" \ +@@ -457,6 +456,7 @@ class Interface: + + def make_thumb(self,file,width): + outfile=donnees.previs_dossier + '/' + os.path.splitext(os.path.split(file)[1])[0] + ".jpg" ++ self.rm_if_exist(file, donnees.previs_dossier) # rm if thumb exist + try: + im = GdkPixbuf.Pixbuf.new_from_file_at_size(file, width[0], width[1]) + im.savev(outfile, "jpeg", [], []) +@@ -549,7 +549,7 @@ class open_files: + """choose files""" + self.filtre=Gtk.FileFilter() + self.filtre.add_mime_type("image/jpeg") +- self.filtre.add_mime_type("image/tiff") ++ self.filtre.add_mime_type("image/x-portable-pixmap") + self.filtre.add_mime_type("image/png") + self.filtre.add_mime_type("image/bmp") + self.filtre.add_mime_type("image/jp2") +--- smartshine-0.36.orig/TODO ++++ smartshine-0.36/TODO +@@ -1,7 +1,7 @@ +-- Repair flip + rotate (two different params), ++(done) - Repair flip + rotate (two different params), + (partialy done) - Emit any sign of life durning adding photos/saving photos (damn +- gtk.spinner (can't spin in background?) and recently-used.xbel (blocks +- filechooser), +-- Rethink GUI, +-- Make use of ImageMagick (sharpen?), +-(done - GTK3 +\ No newline at end of file ++ gtk.spinner (can't spin in background?) and recently-used.xbel (blocks ++ filechooser), ++(partialy done) - Rethink GUI, ++ - Make use of ImageMagick (sharpen?), ++(done) - GTK3 +\ No newline at end of file +--- smartshine-0.36.orig/Changelog ++++ smartshine-0.36/Changelog +@@ -1,6 +1,7 @@ + 15.07.12 - 0.36 + +- * Fix: open and convert png/bmp/others ++ * Fix: open and convert png/bmp/pnm ++ * Fix: check, if thumbnail exists + * UI fix - 1 pixel margin removed :) + + 13.07.12 - 0.35 diff -Nru smartshine-0.36/debian/patches/series smartshine-0.36/debian/patches/series --- smartshine-0.36/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ smartshine-0.36/debian/patches/series 2012-07-19 04:27:38.000000000 +0000 @@ -0,0 +1 @@ +precise1 diff -Nru smartshine-0.36/debian/postinst.ex smartshine-0.36/debian/postinst.ex --- smartshine-0.36/debian/postinst.ex 2012-07-09 18:30:52.000000000 +0000 +++ smartshine-0.36/debian/postinst.ex 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -#!/bin/sh -# postinst script for smartshine -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-remove' -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - configure) - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff -Nru smartshine-0.36/debian/postrm.ex smartshine-0.36/debian/postrm.ex --- smartshine-0.36/debian/postrm.ex 2012-07-09 18:30:52.000000000 +0000 +++ smartshine-0.36/debian/postrm.ex 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -#!/bin/sh -# postrm script for smartshine -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `purge' -# * `upgrade' -# * `failed-upgrade' -# * `abort-install' -# * `abort-install' -# * `abort-upgrade' -# * `disappear' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff -Nru smartshine-0.36/debian/preinst.ex smartshine-0.36/debian/preinst.ex --- smartshine-0.36/debian/preinst.ex 2012-07-09 18:30:52.000000000 +0000 +++ smartshine-0.36/debian/preinst.ex 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -#!/bin/sh -# preinst script for smartshine -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `install' -# * `install' -# * `upgrade' -# * `abort-upgrade' -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - install|upgrade) - ;; - - abort-upgrade) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff -Nru smartshine-0.36/debian/prerm.ex smartshine-0.36/debian/prerm.ex --- smartshine-0.36/debian/prerm.ex 2012-07-09 18:30:52.000000000 +0000 +++ smartshine-0.36/debian/prerm.ex 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -#!/bin/sh -# prerm script for smartshine -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `upgrade' -# * `failed-upgrade' -# * `remove' `in-favour' -# * `deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - remove|upgrade|deconfigure) - ;; - - failed-upgrade) - ;; - - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff -Nru smartshine-0.36/debian/README.Debian smartshine-0.36/debian/README.Debian --- smartshine-0.36/debian/README.Debian 2012-07-09 18:30:52.000000000 +0000 +++ smartshine-0.36/debian/README.Debian 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -smartshine for Debian ---------------------- - - - - -- Dariusz Duma Mon, 09 Jul 2012 20:30:50 +0200 diff -Nru smartshine-0.36/debian/README.source smartshine-0.36/debian/README.source --- smartshine-0.36/debian/README.source 2012-07-09 18:30:52.000000000 +0000 +++ smartshine-0.36/debian/README.source 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -smartshine for Debian ---------------------- - - - - - - diff -Nru smartshine-0.36/debian/rules smartshine-0.36/debian/rules --- smartshine-0.36/debian/rules 2012-07-09 18:38:08.000000000 +0000 +++ smartshine-0.36/debian/rules 2012-07-17 16:58:29.000000000 +0000 @@ -10,7 +10,7 @@ #export DH_VERBOSE=1 override_dh_auto_install: cp -f smartshine.py smartshine - mkdir -p $(CURDIR)/debian/smartshine/usr/bin - install -m 755 smartshine $(CURDIR)/debian/smartshine/usr/bin + mkdir -p $(CURDIR)/debian/smartshine/opt/extras.ubuntu.com/smartshine/ + install -m 755 smartshine $(CURDIR)/debian/smartshine/opt/extras.ubuntu.com/smartshine/ %: dh $@ diff -Nru smartshine-0.36/debian/smartshine.cron.d.ex smartshine-0.36/debian/smartshine.cron.d.ex --- smartshine-0.36/debian/smartshine.cron.d.ex 2012-07-09 18:30:52.000000000 +0000 +++ smartshine-0.36/debian/smartshine.cron.d.ex 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -# -# Regular cron jobs for the smartshine package -# -0 4 * * * root [ -x /usr/bin/smartshine_maintenance ] && /usr/bin/smartshine_maintenance diff -Nru smartshine-0.36/debian/smartshine.default.ex smartshine-0.36/debian/smartshine.default.ex --- smartshine-0.36/debian/smartshine.default.ex 2012-07-09 18:30:52.000000000 +0000 +++ smartshine-0.36/debian/smartshine.default.ex 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -# Defaults for smartshine initscript -# sourced by /etc/init.d/smartshine -# installed at /etc/default/smartshine by the maintainer scripts - -# -# This is a POSIX shell fragment -# - -# Additional options that are passed to the Daemon. -DAEMON_OPTS="" diff -Nru smartshine-0.36/debian/smartshine.doc-base.EX smartshine-0.36/debian/smartshine.doc-base.EX --- smartshine-0.36/debian/smartshine.doc-base.EX 2012-07-09 18:30:52.000000000 +0000 +++ smartshine-0.36/debian/smartshine.doc-base.EX 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -Document: smartshine -Title: Debian smartshine Manual -Author: -Abstract: This manual describes what smartshine is - and how it can be used to - manage online manuals on Debian systems. -Section: unknown - -Format: debiandoc-sgml -Files: /usr/share/doc/smartshine/smartshine.sgml.gz - -Format: postscript -Files: /usr/share/doc/smartshine/smartshine.ps.gz - -Format: text -Files: /usr/share/doc/smartshine/smartshine.text.gz - -Format: HTML -Index: /usr/share/doc/smartshine/html/index.html -Files: /usr/share/doc/smartshine/html/*.html diff -Nru smartshine-0.36/debian/smartshine.install smartshine-0.36/debian/smartshine.install --- smartshine-0.36/debian/smartshine.install 2012-07-09 18:31:30.000000000 +0000 +++ smartshine-0.36/debian/smartshine.install 2012-07-17 16:59:16.000000000 +0000 @@ -1,5 +1,5 @@ -smartshine.desktop /usr/share/applications/ -ui/* /usr/share/smartshine/ui/ -locale/* /usr/share/locale/ -images/smartshine.png /usr/share/pixmaps/ +extras-smartshine.desktop /usr/share/applications/ +ui/* /opt/extras.ubuntu.com/smartshine/ui/ +locale/* /opt/extras.ubuntu.com/smartshine/locale/ +images/smartshine.png /opt/extras.ubuntu.com/smartshine/pixmaps/ diff -Nru smartshine-0.36/debian/source/include-binaries smartshine-0.36/debian/source/include-binaries --- smartshine-0.36/debian/source/include-binaries 1970-01-01 00:00:00.000000000 +0000 +++ smartshine-0.36/debian/source/include-binaries 2012-07-25 13:42:14.000000000 +0000 @@ -0,0 +1 @@ +images/smartshine.png diff -Nru smartshine-0.36/debian/watch.ex smartshine-0.36/debian/watch.ex --- smartshine-0.36/debian/watch.ex 2012-07-09 18:30:52.000000000 +0000 +++ smartshine-0.36/debian/watch.ex 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -# 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 - -# Uncomment to examine a Webpage -# -#http://www.example.com/downloads.php smartshine-(.*)\.tar\.gz - -# Uncomment to examine a Webserver directory -#http://www.example.com/pub/smartshine-(.*)\.tar\.gz - -# Uncommment to examine a FTP server -#ftp://ftp.example.com/pub/smartshine-(.*)\.tar\.gz debian uupdate - -# Uncomment to find new files on sourceforge, for devscripts >= 2.9 -# http://sf.net/smartshine/smartshine-(.*)\.tar\.gz - -# Uncomment to find new files on GooglePages -# http://example.googlepages.com/foo.html smartshine-(.*)\.tar\.gz Binary files /tmp/ftPXl7uIMm/smartshine-0.36/images/smartshine.png and /tmp/175U5DjYex/smartshine-0.36/images/smartshine.png differ