Commit 76d4e4ec authored by Paolo Bacchilega's avatar Paolo Bacchilega

fixed all distcheck errors

parent a9719369
......@@ -47,10 +47,12 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
CLEANFILES = ChangeLog
# Build ChangeLog from GIT history
CHANGELOG_START = GTHUMB_2_10_11
ChangeLog:
@echo Creating $@
@if test -d $(top_srcdir)/.git; then \
(GIT_DIR=$(top_srcdir)/.git $(top_srcdir)/missing --run git log --stat -M -C --name-status --date=short --no-color) | fmt --split-only > $@.tmp \
(GIT_DIR=$(top_srcdir)/.git $(top_srcdir)/missing --run git log $(CHANGELOG_START).. --stat -M -C --name-status --date=short --no-color) | fmt --split-only > $@.tmp \
&& mv -f $@.tmp $@ \
|| ($(RM) $@.tmp; \
echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
......
......@@ -204,6 +204,7 @@ AC_CONFIG_FILES([
Makefile
copy-n-paste/Makefile
data/Makefile
data/gthumb.desktop.in
data/icons/Makefile
data/icons/16x16/Makefile
data/icons/16x16/apps/Makefile
......
SUBDIRS = icons ui
desktop_in_in_files = gthumb.desktop.in.in
desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
desktopdir = $(datadir)/applications
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
schemadir = @GCONF_SCHEMA_FILE_DIR@
schema_in_files = gthumb.schemas.in
schema_DATA = $(schema_in_files:.schemas.in=.schemas)
......@@ -11,10 +18,17 @@ install-data-local:
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$(schema_DATA)
endif
EXTRA_DIST = \
gthumb.schemas \
gthumb.schemas.in
EXTRA_DIST = \
$(desktop_in_in_files) \
$(schema_in_files)
DISTCLEANFILES = \
DISTCLEANFILES = \
$(desktop_in_in_files) \
$(desktop_in_files) \
$(schema_in_files)
CLEANFILES = \
$(desktop_DATA) \
$(schema_DATA)
-include $(top_srcdir)/git.mk
[Desktop Entry]
_Name=gThumb Image Viewer
_GenericName=Image Viewer
_Comment=View and organize your images
Categories=GNOME;GTK;Graphics;Viewer;RasterGraphics;2DGraphics;Photography;
Exec=gthumb %U
Icon=gthumb
MimeType=image/bmp;image/jpeg;image/gif;image/png;image/tiff;image/x-bmp;image/x-ico;image/x-png;image/x-pcx;image/x-tga;image/xpm;image/svg+xml;
StartupNotify=true
Terminal=false
Type=Application
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gthumb
X-GNOME-Bugzilla-Component=general
X-GNOME-DocPath=gthumb/gthumb.xml
......@@ -3168,47 +3168,36 @@
file modification date will be used. Ordinary text can be mixed with the date codes.
If the format code starts with a "#" sign, then the text will not be replaced, but
the value will be remembered for date prompts (see below).
</para>
<para>
Example:
<para>
<command>mkdir -p %p/{%A photos}; cp %f %p/{%A photos}/</command>
This script will create a subfolder prefixed with the weekday name
(like "/home/user/Sunday photos") and copy photos to it.
</para>
</para>
<para>
Refer to your system's documentation for a list of strftime format codes that you can use.
</para></entry>
</row>
<row valign="top">
<entry><para>{TEXT}</para></entry>
<entry align="left"><para>A user prompt dependent on the previous date format string.
The prompt will be used once for each different result of the date. All future
prompts with the same name will use the same value.The text supplied by the user
through the prompt dialog will replace this code. You can put a "#" sign at the
beginning of the prompt name to prevent the replacement. This can be used to store
a prompted value to insert later on. (To treat a bracket-enclosed block of text
literally, precede the opening bracket with a backslash.)
</para>
<para>
Examples:
<para>
<command>mkdir -p %p/{%Y-%m-%d_}{COMMENT}; cp %f %p/{%Y-%m-%d_}{COMMENT}/</command>
This script will create a subfolder prefixed with the date of the picture and a user comment
(like "/home/user/2007-05-04_MyBirthday" or "/home/user/2007-03-17_St. Patrick's Day") and
copy photos to it.
</para>
<para>
<command>mkdir -p %p/{#%B}{FOLDER}; cp %f %p/{FOLDER}/</command>
This script will create a series of subfolders based on the month the picture was taken,
but they will be named according to the user's comments on the date. So if you enter
the word 'Ides' for March, all the photos taken in March will be copied to
"/home/user/photos/Ides/".
</para>
</para>
</entry>
</row>
<row valign="top">
<entry><para>{TEXT}</para></entry>
<entry align="left">
<para>A user prompt dependent on the previous date format string.
The prompt will be used once for each different result of the date. All future
prompts with the same name will use the same value.The text supplied by the user
through the prompt dialog will replace this code. You can put a "#" sign at the
beginning of the prompt name to prevent the replacement. This can be used to store
a prompted value to insert later on. (To treat a bracket-enclosed block of text
literally, precede the opening bracket with a backslash.)
Examples:
<command>mkdir -p %p/{%Y-%m-%d_}{COMMENT}; cp %f %p/{%Y-%m-%d_}{COMMENT}/</command>
This script will create a subfolder prefixed with the date of the picture and a user comment
(like "/home/user/2007-05-04_MyBirthday" or "/home/user/2007-03-17_St. Patrick's Day") and
copy photos to it.
<command>mkdir -p %p/{#%B}{FOLDER}; cp %f %p/{FOLDER}/</command>
This script will create a series of subfolders based on the month the picture was taken,
but they will be named according to the user's comments on the date. So if you enter
the word 'Ides' for March, all the photos taken in March will be copied to
"/home/user/photos/Ides/".
</para>
</entry>
</row>
</tbody>
</tgroup>
</informaltable>
......
......@@ -33,8 +33,6 @@ extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension)
EXTRA_DIST = $(extensionini_in_files)
CLEANFILES = $(extensionini_DATA)
DISTCLEANFILES = $(extensionini_DATA)
-include $(top_srcdir)/git.mk
......@@ -31,8 +31,6 @@ extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension)
EXTRA_DIST = $(extensionini_in_files)
CLEANFILES = $(extensionini_DATA)
DISTCLEANFILES = $(extensionini_DATA)
-include $(top_srcdir)/git.mk
......@@ -27,9 +27,8 @@ extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension)
EXTRA_DIST = $(extensionini_in_files)
CLEANFILES = $(extensionini_DATA)
DISTCLEANFILES = $(extensionini_DATA)
endif
-include $(top_srcdir)/git.mk
......@@ -27,8 +27,6 @@ extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension)
EXTRA_DIST = $(extensionini_in_files)
CLEANFILES = $(extensionini_DATA)
DISTCLEANFILES = $(extensionini_DATA)
-include $(top_srcdir)/git.mk
......@@ -33,8 +33,6 @@ extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension)
EXTRA_DIST = $(extensionini_in_files)
CLEANFILES = $(extensionini_DATA)
DISTCLEANFILES = $(extensionini_DATA)
-include $(top_srcdir)/git.mk
......@@ -23,8 +23,6 @@ extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension)
EXTRA_DIST = $(extensionini_in_files)
CLEANFILES = $(extensionini_DATA)
DISTCLEANFILES = $(extensionini_DATA)
-include $(top_srcdir)/git.mk
......@@ -29,8 +29,6 @@ extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension)
EXTRA_DIST = $(extensionini_in_files)
CLEANFILES = $(extensionini_DATA)
DISTCLEANFILES = $(extensionini_DATA)
-include $(top_srcdir)/git.mk
......@@ -8,12 +8,13 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas)
if GCONF_SCHEMAS_INSTALL
install-data-local:
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$(schema_DATA)
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/image_viewer/data/$(schema_DATA)
endif
EXTRA_DIST = \
gthumb-image-viewer.schemas \
gthumb-image-viewer.schemas.in
EXTRA_DIST = $(schema_in_files)
DISTCLEANFILES = $(schema_in_files)
CLEANFILES = $(schema_DATA)
DISTCLEANFILES = $(schema_DATA)
-include $(top_srcdir)/git.mk
......@@ -33,8 +33,6 @@ extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension)
EXTRA_DIST = $(extensionini_in_files)
CLEANFILES = $(extensionini_DATA)
DISTCLEANFILES = $(extensionini_DATA)
-include $(top_srcdir)/git.mk
......@@ -38,7 +38,7 @@ PUBLIC_HEADER_FILES = \
gth-edit-metadata-dialog.h \
gth-embedded-dialog.h \
gth-empty-list.h \
gth-enum-types.h \
gth-enum-types.h \
gth-extensions.h \
gth-file-data.h \
gth-file-list.h \
......@@ -66,7 +66,6 @@ PUBLIC_HEADER_FILES = \
gth-image-viewer-tool.h \
gth-location-chooser.h \
gth-main.h \
gth-marshal.h \
gth-metadata.h \
gth-metadata-provider.h \
gth-monitor.h \
......@@ -115,10 +114,10 @@ PRIVATE_HEADER_FILES = \
gthumb_SOURCES = \
$(ENUM_TYPES) \
$(MARSHALLERS) \
$(EXTERNAL) \
$(PUBLIC_HEADER_FILES) \
$(PRIVATE_HEADER_FILES) \
$(MARSHALLERS) \
dlg-bookmarks.c \
dlg-edit-metadata.c \
dlg-personalize-filters.c \
......@@ -268,33 +267,30 @@ gth-marshal.c: gth-marshal.h gth-marshal.list $(GLIB_GENMARSHAL)
echo "#include \"gth-marshal.h\"" > $@ \
&& $(GLIB_GENMARSHAL) $(srcdir)/gth-marshal.list --body --prefix=gth_marshal >> $@
gthumb.h: make-header.sh gthumb.h.template
$^ $(PUBLIC_HEADER_FILES) > xgen-$(@F) \
gthumb.h: make-header.sh gthumb.h.template Makefile.am
$(srcdir)/make-header.sh $(srcdir)/gthumb.h.template $(PUBLIC_HEADER_FILES) > xgen-$(@F) \
&& (cmp -s xgen-$(@F) gthumb.h || cp xgen-$(@F) gthumb.h ) \
&& rm -f xgen-$(@F)
AUTHORS.tab : $(top_srcdir)/AUTHORS
sed -e 's/^/"/' -e 's/$$/",/' < $(top_srcdir)/AUTHORS > $@.tmp
mv $@.tmp $@
gthumbincludedir = $(includedir)/gthumb-2.0
gthumbinclude_HEADERS = gthumb.h
gthumbsubincludedir = $(includedir)/gthumb-2.0/gthumb
gthumbsubinclude_HEADERS = $(PUBLIC_HEADER_FILES)
AUTHORS.tab : $(top_srcdir)/AUTHORS
sed -e 's/^/"/' -e 's/$$/",/' < $(top_srcdir)/AUTHORS > $@.tmp
mv $@.tmp $@
BUILT_SOURCES = AUTHORS.tab gthumb.h
CLEANFILES = \
$(BUILT_SOURCES) \
$(MARSHALLERS) \
$(ENUM_TYPES)
BUILT_SOURCES = AUTHORS.tab gthumb.h $(MARSHALLERS) $(ENUM_TYPES)
CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST = \
gth-marshal.list \
gthumb.h.template \
make-header.sh
BUILT_EXTRA_DIST = AUTHORS.tab gthumb.h
dist-hook:
cd $(distdir); rm -f $(CLEANFILES)
-include $(top_srcdir)/git.mk
......@@ -353,7 +353,6 @@ gth_browser_activate_action_help_about (GtkAction *action,
GthWindow *window = GTH_WINDOW (data);
const char *authors[] = {
#include "AUTHORS.tab"
"",
NULL
};
const char *documenters [] = {
......
# List of source files which contain translatable strings.
[encoding: UTF-8]
copy-n-paste/eggdesktopfile.c
copy-n-paste/eggsmclient.c
data/gthumb.desktop.in.in
data/gthumb.schemas.in
[type: gettext/glade]data/ui/bookmarks.ui
[type: gettext/glade]data/ui/filter-editor.ui
[type: gettext/glade]data/ui/personalize-filters.ui
[type: gettext/glade]data/ui/preferences.ui
[type: gettext/glade]data/ui/sort-order.ui
extensions/catalogs/actions.c
extensions/catalogs/callbacks.c
[type: gettext/glade]extensions/catalogs/data/ui/add-to-catalog.ui
extensions/catalogs/dlg-add-to-catalog.c
extensions/catalogs/gth-catalog.c
extensions/catalogs/gth-file-source-catalogs.c
extensions/catalogs/main.c
[type: gettext/glade]extensions/catalogs/data/ui/add-to-catalog.ui
extensions/comments/gth-comment.c
extensions/comments/gth-edit-comment-page.c
extensions/comments/gth-metadata-provider-comment.c
extensions/comments/gth-test-category.c
extensions/comments/main.c
[type: gettext/glade]extensions/comments/data/ui/edit-comment-page.ui
extensions/exiv2/exiv2-utils.cpp
extensions/exiv2/gth-metadata-provider-exiv2.c
extensions/exiv2/main.c
extensions/file_manager/actions.c
extensions/file_manager/callbacks.c
extensions/file_manager/gth-duplicate-task.c
extensions/file_manager/main.c
extensions/file_tools/gth-file-tool-crop.c
extensions/file_tools/gth-file-tool-desaturate.c
extensions/file_tools/gth-file-tool-redo.c
extensions/file_tools/gth-file-tool-save.c
extensions/file_tools/gth-file-tool-undo.c
extensions/file_tools/main.c
[type: gettext/glade]extensions/file_tools/data/ui/crop-options.ui
extensions/file_viewer/gth-file-viewer-page.c
extensions/file_viewer/main.c
extensions/image_viewer/gth-image-viewer-page.c
extensions/image_viewer/gth-metadata-provider-image.c
extensions/image_viewer/main.c
extensions/image_viewer/preferences.c
extensions/image_viewer/data/gthumb-image-viewer.schemas.in
[type: gettext/glade]extensions/image_viewer/data/ui/image-viewer-preferences.ui
extensions/search/actions.c
[type: gettext/glade]extensions/search/data/ui/search-editor.ui
extensions/search/callbacks.c
extensions/search/gth-search.c
extensions/search/gth-search-editor-dialog.c
src/dlg-personalize-filters.c
src/dlg-preferences.c
src/gth-browser-actions-entries.h
src/gth-browser.c
src/gth-filter-bar.c
src/gth-filter-editor-dialog.c
src/gth-filter.c
src/gth-folder-tree.c
src/gth-location-chooser.c
src/gth-main-default-sort-types.c
src/gth-main-default-tests.c
src/gth-test-selector.c
src/gth-test-simple.c
src/gth-window-actions-entries.h
src/gtk-utils.c
src/main.c
extensions/search/gth-search-task.c
extensions/search/main.c
[type: gettext/glade]extensions/search/data/ui/search-editor.ui
gthumb/dlg-bookmarks.c
gthumb/dlg-edit-metadata.c
gthumb/dlg-personalize-filters.c
gthumb/dlg-preferences.c
gthumb/dlg-sort-order.c
gthumb/dom.c
gthumb/eggfileformatchooser.c
gthumb/file-cache.c
gthumb/gconf-utils.c
gthumb/gedit-message-area.c
gthumb/gio-utils.c
gthumb/glib-utils.c
gthumb/gnome-desktop-thumbnail.c
gthumb/gnome-thumbnail-pixbuf-utils.c
gthumb/gth-browser-actions-callbacks.c
gthumb/gth-browser-actions-entries.h
gthumb/gth-browser.c
gthumb/gth-cell-renderer-thumbnail.c
gthumb/gth-cursors.c
gthumb/gth-dumb-notebook.c
gthumb/gth-duplicable.c
gthumb/gth-edit-metadata-dialog.c
gthumb/gth-embedded-dialog.c
gthumb/gth-empty-list.c
gthumb/gth-extensions.c
gthumb/gth-file-data.c
gthumb/gth-file-list.c
gthumb/gth-file-properties.c
gthumb/gth-file-selection.c
gthumb/gth-file-source.c
gthumb/gth-file-source-vfs.c
gthumb/gth-file-store.c
gthumb/gth-file-tool.c
gthumb/gth-file-view.c
gthumb/gth-filterbar.c
gthumb/gth-filter.c
gthumb/gth-filter-editor-dialog.c
gthumb/gth-filter-file.c
gthumb/gth-folder-tree.c
gthumb/gth-hook.c
gthumb/gth-icon-cache.c
gthumb/gth-icon-view.c
gthumb/gth-image-dragger.c
gthumb/gth-image-history.c
gthumb/gth-image-loader.c
gthumb/gth-image-preloader.c
gthumb/gth-image-selector.c
gthumb/gth-image-viewer.c
gthumb/gth-image-viewer-tool.c
gthumb/gth-location-chooser.c
gthumb/gth-main.c
gthumb/gth-main-default-hooks.c
gthumb/gth-main-default-metadata.c
gthumb/gth-main-default-sort-types.c
gthumb/gth-main-default-tests.c
gthumb/gth-main-default-types.c
gthumb/gth-metadata.c
gthumb/gth-metadata-provider.c
gthumb/gth-metadata-provider-file.c
gthumb/gth-monitor.c
gthumb/gth-multipage.c
gthumb/gth-nav-window.c
gthumb/gth-pixbuf-task.c
gthumb/gth-preferences.c
gthumb/gth-sidebar.c
gthumb/gth-source-tree.c
gthumb/gth-statusbar.c
gthumb/gth-string-list.c
gthumb/gth-task.c
gthumb/gth-test.c
gthumb/gth-test-chain.c
gthumb/gth-test-selector.c
gthumb/gth-test-simple.c
gthumb/gth-thumb-loader.c
gthumb/gth-time.c
gthumb/gth-toolbox.c
gthumb/gthumb-error.c
gthumb/gth-uri-list.c
gthumb/gth-user-dir.c
gthumb/gth-viewer-page.c
gthumb/gth-window-actions-callbacks.c
gthumb/gth-window-actions-entries.h
gthumb/gth-window.c
gthumb/gtk-utils.c
gthumb/main.c
gthumb/pixbuf-io.c
gthumb/pixbuf-utils.c
gthumb/zlib-utils.c
data/gthumb.desktop.in
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