Commit 91fdd120 authored by Jim Nelson's avatar Jim Nelson

#441: Ubuntu packaging. #460: Cross-compilation under Launchpad. #461: Man...

#441: Ubuntu packaging.  #460: Cross-compilation under Launchpad.  #461: Man page.  #462: Debian menu file.  
#530: Tarball provides top-level directory.  #538: configure.in -> configure.mk  #544: Proper "make distclean".  
#554: Makefile builds .tar.gz.  #572: Only require libgee 0.1.3.
parent 5e0a4307
......@@ -4,7 +4,7 @@ VERSION = 0.1.2
BUILD_ROOT = 1
VALAC = valac
VALAC_VERSION = vala-1.0 >= 0.7.3
MIN_VALAC_VERSION = 0.7.4
INSTALL_PROGRAM = install
INSTALL_DATA = install -m 644
......@@ -17,7 +17,7 @@ endif
ALL_VALAFLAGS = $(VALAFLAGS) $(DEVFLAGS) --Xcc=-std=c99
PREFIX=/usr/local
-include configure.in
-include configure.mk
DEFINES=_PREFIX='"$(PREFIX)"' _VERSION='"$(VERSION)"'
......@@ -102,7 +102,7 @@ EXT_PKGS = \
EXT_PKG_VERSIONS = \
gtk+-2.0 >= 2.14.4 \
sqlite3 >= 3.5.9 \
gee-1.0 >= 0.1.5 \
gee-1.0 >= 0.1.3 \
hal >= 0.5.11 \
dbus-glib-1 >= 0.76 \
unique-1.0 >= 1.0.0 \
......@@ -117,7 +117,7 @@ endif
EXPANDED_SRC_FILES = $(foreach src,$(SRC_FILES),src/$(src))
EXPANDED_C_FILES = $(foreach src,$(SRC_FILES),$(BUILD_DIR)/$(src:.vala=.c))
EXPANDED_SAVE_TEMPS_FILES = $(foreach src,$(SRC_FILES),$(BUILD_DIR)/$(src:.vala=..vala.c))
EXPANDED_SAVE_TEMPS_FILES = $(foreach src,$(SRC_FILES),$(BUILD_DIR)/$(src:.vala=.vala.c))
EXPANDED_OBJ_FILES = $(foreach src,$(SRC_FILES),$(BUILD_DIR)/$(src:.vala=.o))
EXPANDED_VAPI_FILES = $(foreach vapi,$(VAPI_FILES),src/$(vapi))
EXPANDED_SRC_HEADER_FILES = $(foreach header,$(SRC_HEADER_FILES),src/$(header))
......@@ -129,6 +129,8 @@ DIST_FILES = Makefile configure $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) \
DIST_TAR = $(PROGRAM)-$(VERSION).tar
DIST_TAR_BZ2 = $(DIST_TAR).bz2
DIST_TAR_GZ = $(DIST_TAR).gz
PACKAGE_ORIG_GZ = $(PROGRAM)_$(VERSION).orig.tar.gz
all: $(PROGRAM)
......@@ -137,7 +139,7 @@ clean:
rm -f $(EXPANDED_SAVE_TEMPS_FILES)
rm -f $(EXPANDED_OBJ_FILES)
rm -f $(VALA_STAMP)
rm -f $(DIST_TAR_BZ2)
rm -rf $(PROGRAM)-$(VERSION)
rm -f $(PROGRAM)
cleantemps:
......@@ -146,36 +148,44 @@ cleantemps:
rm -f $(EXPANDED_OBJ_FILES)
rm -f $(VALA_STAMP)
dist: $(DIST_TAR_BZ2)
dist-clean:
package:
$(MAKE) dist
cp $(DIST_TAR_GZ) ../$(PACKAGE_ORIG_GZ)
rm -f $(DIST_TAR_GZ)
rm -f $(DIST_TAR_BZ2)
install: $(PROGRAM) misc/shotwell.desktop
dist: $(DIST_FILES)
mkdir -p $(PROGRAM)-$(VERSION)
cp --parents $(DIST_FILES) $(PROGRAM)-$(VERSION)
tar --bzip2 -cvf $(DIST_TAR_BZ2) $(PROGRAM)-$(VERSION)
tar --gzip -cvf $(DIST_TAR_GZ) $(PROGRAM)-$(VERSION)
rm -rf $(PROGRAM)-$(VERSION)
distclean: clean
rm -f configure.mk
install:
$(INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(PREFIX)/bin
mkdir -p $(DESTDIR)$(PREFIX)/share/shotwell/icons
$(INSTALL_DATA) icons/* $(DESTDIR)$(PREFIX)/share/shotwell/icons
mkdir -p $(DESTDIR)/usr/share/icons/hicolor/scalable/apps
$(INSTALL_DATA) icons/shotwell.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/apps
update-icon-caches $(DESTDIR)/usr/share/icons/hicolor
-update-icon-caches $(DESTDIR)/usr/share/icons/hicolor
mkdir -p $(DESTDIR)$(PREFIX)/share/shotwell/ui
$(INSTALL_DATA) ui/* $(DESTDIR)$(PREFIX)/share/shotwell/ui
xdg-desktop-menu install --novendor misc/shotwell.desktop
update-desktop-database
$(INSTALL_DATA) misc/shotwell.desktop $(DESTDIR)/usr/share/applications
-update-desktop-database
uninstall:
rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGRAM)
rm -fr $(DESTDIR)$(PREFIX)/share/shotwell
rm -fr $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/shotwell.svg
xdg-desktop-menu uninstall shotwell.desktop
update-desktop-database
$(DIST_TAR_BZ2): $(PROGRAM) $(DIST_FILES)
tar -cv $(DIST_FILES) > $(DIST_TAR)
bzip2 $(DIST_TAR)
rm -f $(DESTDIR)/usr/share/applications/shotwell.desktop
-update-desktop-database
$(VALA_STAMP): $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) $(EXPANDED_SRC_HEADER_FILES) Makefile \
configure $(CONFIG_IN)
pkg-config --print-errors --exists '$(VALAC_VERSION)'
@ bash -c "[ '`valac --version`' '>' 'Vala $(MIN_VALAC_VERSION)' ]" || bash -c "[ '`valac --version`' '==' 'Vala $(MIN_VALAC_VERSION)' ]" || ( echo 'Shotwell requires Vala compiler $(MIN_VALAC_VERSION) or greater. You are running' `valac --version` '\b.'; exit 1 )
ifndef ASSUME_PKGS
ifdef EXT_PKG_VERSIONS
pkg-config --print-errors --exists '$(EXT_PKG_VERSIONS)'
......
Shotwell 0.1.2 - 23 July 2009
-----------------------------
* Red-eye reduction feature now available.
* File/Import From Folder offers one more way to import photos into the
library.
Shotwell 0.1.1 - 30 June 2009
-----------------------------
- Bug fix: Dragging a selection band to the bottom of the window to start
scrolling results in compiz crashing. This fixes that problem, although
another reported problem still exists (#380).
- Changed package dependency from vala-1.0 to gee-1.0. Although Vala is
required to build Shotwell, it does not need to be installed to execute
it. Gee provides the collections library Shotwell requires.
- Fixed code to compile with Vala 0.7.4.
* Bug fix: Dragging a selection band to the bottom of the window to start
scrolling results in compiz crashing. This fixes that problem, although
another reported problem still exists (#380).
* Changed package dependency from vala-1.0 to gee-1.0. Although Vala is
required to build Shotwell, it does not need to be installed to execute
it. Gee provides the collections library Shotwell requires.
* Fixed code to compile with Vala 0.7.4.
Shotwell 0.1.0 - 26 June 2009
-----------------------------
- Initial release. Features include:
* Importing photos from file manager or camera via libgphoto2.
* Photos automatically sorted into time-grouped events.
* Thumbnails viewable at various sizes.
* Sort by photo name or date of exposure.
* Fullscreen mode.
* Photos may be rotated or cropped.
* Export photos as stored or at varying dimensions and JPEG quality.
* Desktop integration with Applications menu and media device handling.
* Initial release. Features include:
- Importing photos from file manager or camera via libgphoto2.
- Photos automatically sorted into time-grouped events.
- Thumbnails viewable at various sizes.
- Sort by photo name or date of exposure.
- Fullscreen mode.
- Photos may be rotated or cropped.
- Export photos as stored or at varying dimensions and JPEG quality.
- Desktop integration with Applications menu and media device handling.
......@@ -5,7 +5,7 @@
# This software is licensed under the GNU LGPL (version 2.1 or later).
# See the COPYING file in this distribution.
CONFIG_IN=configure.in
CONFIG_IN=configure.mk
configure_help() {
printf "\nUsage:\n"
......@@ -66,11 +66,10 @@ do
done
rm -f $CONFIG_IN
touch $0
if [ $variables ]
then
echo -n $variables > $CONFIG_IN
echo "CONFIG_IN=${CONFIG_IN}" >> $CONFIG_IN
fi
echo "CONFIG_IN=${CONFIG_IN}" >> $CONFIG_IN
printf "Configured. Type 'make' to build, 'make install' to install.\n"
shotwell (0.1.2-1) jaunty; urgency=low
* Red-eye reduction feature now available.
* File/Import From Folder offers one more way to import photos into the
library.
-- Jim Nelson <jim@yorba.org> Thu, 23 Jul 2009 17:01:23 -0700
Source: shotwell
Section: gnome
Priority: optional
Maintainer: Jim Nelson <jim@yorba.org>
Build-Depends: debhelper (>= 7),
valac (>= 0.7.3),
libgee-dev (>= 0.1.3),
libgtk2.0-dev (>= 2.14.4),
libgphoto2-2-dev (>= 2.4.2),
libexif-dev (>= 0.6.16),
libsqlite3-dev (>= 3.5.9),
libunique-dev (>= 1.0.0),
libhal-dev (>= 0.5.11),
libdbus-glib-1-dev (>= 0.76)
Standards-Version: 3.8.0
Homepage: http://www.yorba.org/shotwell
Package: shotwell
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
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 and share them with others.
.
This is an early alpha release with a limited feature set. Visit
http://www.yorba.org/shotwell to read about the current state of Shotwell's
development.
This package was debianized by Jim Nelson <jim@yorba.org> on
Thu, 23 Jul 2009 17:02:10 -0700.
It was downloaded from http://yorba.org/download/shotwell/
Upstream Author:
Jim Nelson <jim@yorba.org>
Copyright:
Copyright 2009 Yorba Foundation
License:
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
On Debian systems, the complete text of the GNU Lesser General Public
License 2.1, can be found in /usr/share/common-licenses/LGPL-2.1.
The Debian packaging is copyright 2009, Jim Nelson <jim@yorba.org> and
is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
/usr
/usr/bin
/usr/share/applications
NEWS
README
THANKS
debian/shotwell.1
?package(shotwell):needs="X11" section="Applications/Viewers"\
title="Shotwell" command="/usr/bin/shotwell"
#!/usr/bin/make -f
#
# Shotwell debian/rules file
# http://www.yorba.org/shotwell
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
build: build-stamp
build-stamp: configure
dh_testdir
./configure --prefix=/usr
$(MAKE)
touch $@
clean:
dh_testdir
dh_testroot
rm -f build-stamp
[ ! -f Makefile ] || $(MAKE) distclean
dh_clean
install: build
dh_testdir
dh_testroot
dh_prep
dh_installdirs
$(MAKE) DESTDIR=$(CURDIR)/debian/shotwell install
binary-indep: install
binary-arch: install
dh_testdir
dh_testroot
dh_installchangelogs
dh_installdocs
dh_installexamples
dh_installmenu
dh_installman
dh_icons
dh_link
dh_strip
dh_compress
dh_fixperms
dh_installdeb
dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
.TH "shotwell" "1"
.SH "NAME"
shotwell \- Digital photo organizer
.SH "SYNOPSIS"
\fBshotwell
.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"
.PP
This manual page was written by Jim Nelson jim@yorba.org.
# watch control file for uscan
version=3
http://yorba.org/download/shotwell/([\d\.]+)/shotwell-(.*)\.tar\.gz
......@@ -194,7 +194,7 @@ public class PhotoPage : SinglePhotoPage {
// if the tool has an auxilliary window, move it properly on the screen
place_tool_window();
// repaint entire view, with the tool now hooked in
// repaint entire view, with the tool now hooked in
default_repaint();
}
......
......@@ -8,7 +8,7 @@ public abstract class Comparator<G> {
public abstract int64 compare(G a, G b);
}
public class SortedList<G> : Object, Gee.Iterable<G>, Gee.Collection<G>, Gee.List<G> {
public class SortedList<G> : Object, Gee.Iterable<G> {
private Gee.List<G> list;
private Comparator<G> cmp;
......@@ -92,10 +92,6 @@ public class SortedList<G> : Object, Gee.Iterable<G>, Gee.Collection<G>, Gee.Lis
public void remove_at(int index) {
list.remove_at(index);
}
public Gee.List<G>? slice(int start, int stop) {
return list.slice(start, stop);
}
}
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