Commit fe00c683 authored by Rico Tzschichholz's avatar Rico Tzschichholz

Import shotwell ubuntu-packaging from 0.15.1-0ubuntu2

parents
This diff is collapsed.
Source: shotwell
Section: gnome
Priority: optional
Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
XSBC-Original-Maintainer: Debian Shotwell Maintainers <pkg-shotwell-maint@lists.alioth.debian.org>
Uploaders: Devid Antonio Filoni <d.filoni@ubuntu.com>
Build-Depends: debhelper (>= 9),
m4,
valac (>= 0.18.0),
libgee-0.8-dev (>= 0.8.0),
libglib2.0-dev (>= 2.30.0),
libgtk-3-dev (>= 3.6.0),
libexif-dev (>= 0.6.16),
libsqlite3-dev (>= 3.5.9),
libgexiv2-dev (>= 0.4.90),
libgphoto2-6-dev (>= 2.4.2),
libsoup2.4-dev (>= 2.26.0),
libxml2 (>= 2.6.32),
libwebkitgtk-3.0-dev (>= 1.4.0),
libgudev-1.0-dev (>= 145),
libraw-dev (>= 0.14),
libjson-glib-dev,
libgstreamer1.0-dev (>= 1.0.0),
libgstreamer-plugins-base1.0-dev (>= 1.0.0),
librest-dev,
libaccounts-glib-dev,
libsignon-glib-dev,
libunity-dev,
python-scour,
desktop-file-utils,
Standards-Version: 3.9.4
Homepage: http://yorba.org/shotwell/
Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/shotwell/ubuntu
XS-Testsuite: autopkgtest
Package: shotwell
Architecture: linux-any
Depends: ${shlibs:Depends},
${misc:Depends},
shotwell-common (= ${source:Version}),
librsvg2-common,
dbus-x11
Suggests: account-plugin-facebook, account-plugin-google, account-plugin-flickr
Description: digital photo organizer
Shotwell is a digital photo organizer designed for the GNOME desktop
environment. It allows you to import photos from disk or camera, organize
them in various ways, view them in full-window or fullscreen mode, and
export them to share with others. It is able to manage a lot of different
image formats, also including raw CR2 files.
Package: shotwell-common
Architecture: all
Depends: ${misc:Depends}
Recommends: shotwell
Breaks: shotwell (<< 0.14.1-1)
Replaces: shotwell (<< 0.14.1-1)
Description: digital photo organizer - common files
Shotwell is a digital photo organizer designed for the GNOME desktop
environment. It allows you to import photos from disk or camera, organize
them in various ways, view them in full-window or fullscreen mode, and
export them to share with others. It is able to manage a lot of different
image formats, also including raw CR2 files.
.
This package provides images and documentation for Shotwell
Package: shotwell-dbg
Priority: extra
Section: debug
Architecture: linux-any
Depends: ${shlibs:Depends},
${misc:Depends},
shotwell (= ${binary:Version})
Description: digital photo organizer - debugging symbols
Shotwell is a digital photo organizer designed for the GNOME desktop
environment. It allows you to import photos from disk or camera, organize
them in various ways, view them in full-window or fullscreen mode, and
export them to share with others. It is able to manage a lot of different
image formats, also including raw CR2 files.
.
This package contains the debugging symbols for Shotwell.
This diff is collapsed.
README
THANKS
usr/bin
usr/lib
debian/shotwell.1
debian/shotwell-video-thumbnailer.1
?package(shotwell):needs="X11" section="Applications/Viewers"\
title="Shotwell" command="/usr/bin/shotwell"
Index: shotwell-0.15.0/Makefile
===================================================================
--- shotwell-0.15.0.orig/Makefile 2013-10-11 12:42:31.000000000 +0200
+++ shotwell-0.15.0/Makefile 2013-10-11 12:42:31.000000000 +0200
@@ -518,15 +518,6 @@
misc/shotwell.desktop: misc/shotwell.desktop.head $(EXPANDED_CORE_PO_FILES)
cp misc/shotwell.desktop.head misc/shotwell.desktop
- @ $(foreach lang,$(CORE_SUPPORTED_LANGUAGES), echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack \
- LANGUAGE=$(lang) gettext --domain=shotwell $(DESKTOP_APP_FULL_NAME)` \
- >> misc/shotwell.desktop ; \
- echo GenericName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) \
- gettext --domain=shotwell $(DESKTOP_APPLICATION_CLASS)` >> misc/shotwell.desktop ; \
- echo Comment[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
- --domain=shotwell $(DESKTOP_APPLICATION_COMMENT)` >> misc/shotwell.desktop ; \
- echo Keywords[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
- --domain=shotwell $(DESKTOP_APP_KEYWORDS)` >> misc/shotwell.desktop ;)
ifndef DISABLE_DESKTOP_VALIDATE
@ desktop-file-validate misc/shotwell.desktop 1>misc/shotwell.desktop.errors 2>&1; \
if test -s misc/shotwell.desktop.errors; then \
@@ -538,12 +529,6 @@
misc/shotwell-viewer.desktop: misc/shotwell-viewer.desktop.head $(EXPANDED_CORE_PO_FILES)
cp misc/shotwell-viewer.desktop.head misc/shotwell-viewer.desktop
- $(foreach lang,$(CORE_SUPPORTED_LANGUAGES), echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack \
- LANGUAGE=$(lang) gettext --domain=shotwell $(DESKTOP_APP_FULL_NAME)` \
- echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
- --domain=shotwell $(DIRECT_EDIT_DESKTOP_APP_FULL_NAME)` >> misc/shotwell-viewer.desktop ; \
- echo GenericName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
- --domain=shotwell $(DIRECT_EDIT_DESKTOP_APPLICATION_CLASS)` >> misc/shotwell-viewer.desktop ;)
ifndef DISABLE_DESKTOP_VALIDATE
@ desktop-file-validate misc/shotwell-viewer.desktop 1>misc/shotwell-viewer.desktop.errors 2>&1; \
if test -s misc/shotwell-viewer.desktop.errors; then \
This diff is collapsed.
Description: Fix FTBFS with missing format string parameter
Author: Luca Falavigna <dktrkranz@debian.org>
Index: shotwell-0.12.2/src/Dialogs.vala
===================================================================
--- shotwell-0.12.2.orig/src/Dialogs.vala 2012-04-11 20:18:19.000000000 +0200
+++ shotwell-0.12.2/src/Dialogs.vala 2012-05-06 19:47:46.625600885 +0200
@@ -31,7 +31,7 @@
public bool confirm_warn_developer_changed(int number) {
Gtk.MessageDialog dialog = new Gtk.MessageDialog.with_markup(AppWindow.get_instance(),
- Gtk.DialogFlags.MODAL, Gtk.MessageType.WARNING, Gtk.ButtonsType.NONE,
+ Gtk.DialogFlags.MODAL, Gtk.MessageType.WARNING, Gtk.ButtonsType.NONE, "%s",
"<span weight=\"bold\" size=\"larger\">%s</span>".printf(ngettext("Switching developers will undo all changes you have made to this photo in Shotwell",
"Switching developers will undo all changes you have made to these photos in Shotwell", number)));
Description: pass compiler flags set in debian/rules to compiler
Author: Devid Antonio Filoni <d.filoni@ubuntu.com>
Index: shotwell-0.15.0~pr3/Makefile
===================================================================
--- shotwell-0.15.0~pr3.orig/Makefile 2013-09-26 11:20:27.486298924 +0200
+++ shotwell-0.15.0~pr3/Makefile 2013-09-26 11:20:27.482298924 +0200
@@ -42,7 +42,7 @@
LOCAL_LANG_DIR=locale-langpack
SYSTEM_LANG_DIR := $(DESTDIR)$(PREFIX)/share/locale
-VALAFLAGS := -g --enable-checking --target-glib=2.32 --thread --fatal-warnings --enable-experimental --enable-deprecated $(USER_VALAFLAGS)
+VALAFLAGS := $(foreach w,$(CPPFLAGS) $(CFLAGS) $(LDFLAGS),-X $(w)) --enable-checking --target-glib=2.32 --thread --fatal-warnings --enable-deprecated --enable-experimental $(USER_VALAFLAGS)
ifdef UNITY_SUPPORT
VALAFLAGS := $(VALAFLAGS) --define UNITY_SUPPORT
endif
@@ -715,7 +715,7 @@
@
$(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile
- $(CC) -c $(VALA_CFLAGS) $(CFLAGS) -o $@ $<
+ $(CC) -c $(VALA_CFLAGS) $(CPPFLAGS) $(CFLAGS) -o $@ $<
$(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) $(THUMBNAILER_BIN) misc/gschemas.compiled
$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -o $@
format_string.patch
hardening.patch
02_desktop_translations.patch
06_uoa.patch
#!/usr/bin/make -f
CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
VALAFLAGS:=$(foreach w,$(CPPFLAGS) $(CFLAGS) $(LDFLAGS),-X $(w))
%:
dh $@ --dbg-package=shotwell-dbg --with-scour
override_dh_auto_configure:
./configure --prefix=/usr --libexec=/usr/lib/shotwell --disable-schemas-compile --disable-icon-update --unity-support
override_dh_installchangelogs:
dh_installchangelogs NEWS
.TH shotwell-video-thumbnailer 1 "August 21, 2011"
.SH NAME
shotwell-video-thumbnailer \- writes video thumbnail to stdout
.SH DESCRIPTION
Writes video thumbnail to stdout.
.PP
This program is designed to be called by shotwell directly, normally it is not
of any use for shotwell users.
.SH COPYRIGHT
This manual page is Copyright 2011 Luca Falavigna <dktrkranz@debian.org>.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Lesser General Public License, Version 2.1 or any
later version published by the Free Software Foundation.
.TH shotwell 1 "December 30, 2009"
.SH NAME
shotwell \- a digital photo organizer
.SH DESCRIPTION
.B shotwell
is a digital photo organizer designed for the GNOME desktop environment. It
allows you to import photos from disk or camera, organize them in various ways,
view them in full-window or fullscreen mode, and export them to share with
others.
.SH AUTHOR
shotwell was written by Jim Nelson, Lucas Beeler and Allison Barlow.
.PP
This manual page was written by Devid Antonio Filoni <d.filoni@ubuntu.com>,
for the Debian project (and may be used by others).
library-not-linked-against-libc
image-file-in-usr-lib
compression = "xz"
compression-level = 9
This diff is collapsed.
This diff is collapsed.
'''Test import from libgphoto camera (with umockdev)'''
__author__ = 'Martin Pitt <martin.pitt@ubuntu.com>'
__copyright__ = 'GNU LGPL 2.1+'
import os
import tempfile
import os.path
from autopilot.testcase import AutopilotTestCase
from autopilot.matchers import Eventually
from testtools.matchers import Equals
mydir = os.path.dirname(__file__)
class T(AutopilotTestCase):
def setUp(self):
self.workdir = tempfile.mkdtemp()
os.environ['HOME'] = self.workdir
os.environ['XDG_RUNTIME_DIR'] = self.workdir
os.environ['LC_ALL'] = 'C'
super(T, self).setUp()
self.app = self.launch_test_application(
'umockdev-run', '-d', os.path.join(mydir, 'powershot.umockdev'),
'-i', 'dev/bus/usb/001/011=' + os.path.join(mydir, 'powershot-import.ioctl'),
'--', 'shotwell', app_type='gtk')
# we expect the welcome dialog, otherwise we don't have a pristine
# config/data; wait until it's gone
wd = self.app.wait_select_single('WelcomeDialog')
self.mouse.click_object(wd)
self.keyboard.press_and_release('Enter')
self.assertThat(lambda: self.app.select_many('WelcomeDialog'),
Eventually(Equals([])))
def tearDown(self):
#shutil.rmtree(self.workdir)
super(T, self).tearDown()
def test_import(self):
'''Import pictures from libgphoto camera'''
# select SidebarTree; this is not introspectable, so we have to
# navigate to "Cameras" blindly
sidebar = self.app.select_single('SidebarTree')
self.assertNotEqual(sidebar, None)
self.assertThat(sidebar.visible, Eventually(Equals(True)))
self.keyboard.press_and_release('Tab')
self.keyboard.press_and_release('Tab')
self.assertThat(sidebar.has_focus, Eventually(Equals(True)))
# select first camera
self.keyboard.press_and_release('Down')
self.keyboard.press_and_release('Down')
btn_import = self.app.select_single('GtkToolButton', label='Import _All')
self.assertNotEqual(btn_import, None)
self.assertThat(btn_import.visible, Eventually(Equals(True)))
# properties window should show 2 photos
basic_props = self.app.select_single('BasicProperties')
self.assertNotEqual(basic_props.select_single('GtkLabel', label='2 Photos'), None)
# do import
self.mouse.click_object(btn_import)
# wait for success dialog
md = self.app.wait_select_single('GtkMessageDialog', visible=True)
self.assertEqual(md.title, 'Import Complete')
self.assertIn('2 photos successfully imported', md.text)
# do the default action which is "Keep on camera"
self.keyboard.press_and_release('Enter')
self.assertThat(lambda: self.app.select_many('GtkMessageDialog'),
Eventually(Equals([])))
page = self.app.select_single('LastImportPage')
self.assertNotEqual(page, None)
self.assertEqual(page.visible, True)
# should have imported photos
picture_dir = os.path.join(self.workdir, 'Pictures')
date_dir = os.path.join(picture_dir, '2013', '08', '22')
self.assertTrue(os.path.isdir(picture_dir), 'Created Pictures XDG dir')
self.assertTrue(os.path.isdir(date_dir), 'Created by-date Pictures subfolder')
self.assertTrue(os.path.exists(os.path.join(date_dir, 'IMG_0001.JPG')))
self.assertTrue(os.path.exists(os.path.join(date_dir, 'IMG_0002.JPG')))
Tests: import
Depends: shotwell,
xvfb,
dbus-x11,
umockdev,
autopilot-desktop (>= 1.4~),
libautopilot-gtk
#!/bin/sh
set -e
cd `dirname $0`
autopilot-sandbox-run autopilot_tests
version=3
http://yorba.org/download/shotwell/([\d\.]+)/shotwell-([\d\.]+)\.tar\.xz
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment