diff -Nru feh-2.1/ChangeLog feh-2.2/ChangeLog --- feh-2.1/ChangeLog 2011-11-02 09:59:20.000000000 +0000 +++ feh-2.2/ChangeLog 2012-01-02 10:55:04.000000000 +0000 @@ -1,3 +1,15 @@ +Mon, 02 Jan 2012 11:54:01 +0100 Daniel Friesel + +* Release v2.2 + * Add --no-fehbg option to disable ~/.fehbg creation (patch by Felix Crux) + * Pause slideshow when editing captions + * Makefile: Respect CPPFLAGS when creating deps.mk + + * Fix --montage mode + + * Follow HTTP redirects + + Wed, 02 Nov 2011 10:56:10 +0100 Daniel Friesel * Release v2.1 diff -Nru feh-2.1/config.mk feh-2.2/config.mk --- feh-2.1/config.mk 2011-11-02 09:59:20.000000000 +0000 +++ feh-2.2/config.mk 2012-01-02 10:55:04.000000000 +0000 @@ -1,5 +1,5 @@ PACKAGE ?= feh -VERSION ?= 2.1 +VERSION ?= 2.2 # Prefix for all installed files PREFIX ?= /usr/local diff -Nru feh-2.1/debian/changelog feh-2.2/debian/changelog --- feh-2.1/debian/changelog 2011-11-03 14:08:39.000000000 +0000 +++ feh-2.2/debian/changelog 2012-01-02 20:57:55.000000000 +0000 @@ -1,3 +1,10 @@ +feh (2.2-1) unstable; urgency=low + + * New upstream version (+ adapted patch) + Closes: #653689 + + -- Andreas Tille Mon, 02 Jan 2012 21:54:16 +0100 + feh (2.1-1) unstable; urgency=low * New upstream version diff -Nru feh-2.1/debian/patches/do_not_touch_deps_mk.patch feh-2.2/debian/patches/do_not_touch_deps_mk.patch --- feh-2.1/debian/patches/do_not_touch_deps_mk.patch 2011-04-26 06:46:23.000000000 +0000 +++ feh-2.2/debian/patches/do_not_touch_deps_mk.patch 2012-01-02 20:56:35.000000000 +0000 @@ -1,5 +1,5 @@ ---- feh-1.13.orig/src/Makefile -+++ feh-1.13/src/Makefile +--- feh-2.2.orig/src/Makefile ++++ feh-2.2/src/Makefile @@ -6,7 +6,7 @@ I_SRCS = ${shell echo *.raw} I_DSTS = ${I_SRCS:.raw=.inc} @@ -15,7 +15,7 @@ - -deps.mk: ${TARGETS} ${I_DSTS} -- ${CC} -MM ${TARGETS} > $@ +- ${CC} ${CPPFLAGS} -MM ${TARGETS} > $@ - clean: rm -f feh *.o *.inc diff -Nru feh-2.1/man/feh.pre feh-2.2/man/feh.pre --- feh-2.1/man/feh.pre 2011-11-02 09:59:20.000000000 +0000 +++ feh-2.2/man/feh.pre 2012-01-02 10:55:04.000000000 +0000 @@ -667,8 +667,9 @@ .Sh BACKGROUND SETTING . .Nm -can also be used as a background setter. It will store the command line -necessary to set the background in +can also be used as a background setter. Unless you pass the +.Cm --no-fehbg +option, it will store the command line necessary to set the background in .Pa ~/.fehbg , so to have your background restored everytime you start X, you can add .Qq eval $(cat ~/.fehbg) @@ -726,6 +727,12 @@ .Pq repeat the image in case it is too small for the screen . +.It Cm --no-fehbg +. +Do not write a +.Pa ~/.fehbg +file +. .El . . @@ -1363,7 +1370,7 @@ . This is a known bug and will hopefully get fixed some time. For now, it can be avoided by using -.Cm --geometry 500x500 No Pq or any other geometry . +.Cm --geometry 500x500 Pq or any other geometry . This will have the same behaviour as .Cm --scale-down , but without the flickering. diff -Nru feh-2.1/src/help.raw feh-2.2/src/help.raw --- feh-2.1/src/help.raw 2011-11-02 09:59:20.000000000 +0000 +++ feh-2.2/src/help.raw 2012-01-02 10:55:04.000000000 +0000 @@ -74,6 +74,7 @@ fill the whole background, but the images' aspect ratio may not be preserved --bg-tile FILE Set FILE as tiled desktop background + --no-fehbg Do not write a ~/.fehbg file -C, --fontpath PATH Specify an extra directory to look in for fonts, can be used multiple times to add multiple paths. -M, --menu-font FONT Use FONT for the font in menus. diff -Nru feh-2.1/src/imlib.c feh-2.2/src/imlib.c --- feh-2.1/src/imlib.c 2011-11-02 09:59:20.000000000 +0000 +++ feh-2.2/src/imlib.c 2012-01-02 10:55:04.000000000 +0000 @@ -270,6 +270,7 @@ ebuff = emalloc(CURL_ERROR_SIZE); curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, ebuff); curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1L); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); res = curl_easy_perform(curl); curl_easy_cleanup(curl); diff -Nru feh-2.1/src/index.c feh-2.2/src/index.c --- feh-2.1/src/index.c 2011-11-02 09:59:20.000000000 +0000 +++ feh-2.2/src/index.c 2012-01-02 10:55:04.000000000 +0000 @@ -425,8 +425,11 @@ gib_list *line, *lines; int max_w = 0, total_h = 0; - if (!opt.index_info) + if (!opt.index_info) { + *fw = 0; + *fh = 0; return; + } /* called with file = NULL in the setup phase. * We need a fake file, otherwise feh_printf will remove format specifiers, diff -Nru feh-2.1/src/keyevents.c feh-2.2/src/keyevents.c --- feh-2.1/src/keyevents.c 2011-11-02 09:59:20.000000000 +0000 +++ feh-2.2/src/keyevents.c 2012-01-02 10:55:04.000000000 +0000 @@ -640,8 +640,15 @@ slideshow_change_image(winwid, SLIDE_RAND, 1); } else if (feh_is_kp(&keys.toggle_caption, keysym, state)) { - if (opt.caption_path) + if (opt.caption_path) { + /* + * editing captions in slideshow mode does not make any sense + * at all; this is just in case someone accidentally does it... + */ + if (opt.slideshow_delay) + opt.paused = 1; winwid->caption_entry = 1; + } winwidget_render_image(winwid, 0, 0); } else if (feh_is_kp(&keys.reload_image, keysym, state)) { diff -Nru feh-2.1/src/Makefile feh-2.2/src/Makefile --- feh-2.1/src/Makefile 2011-11-02 09:59:20.000000000 +0000 +++ feh-2.2/src/Makefile 2012-01-02 10:55:04.000000000 +0000 @@ -19,7 +19,7 @@ deps.mk: ${TARGETS} ${I_DSTS} - ${CC} -MM ${TARGETS} > $@ + ${CC} ${CPPFLAGS} -MM ${TARGETS} > $@ clean: rm -f feh *.o *.inc diff -Nru feh-2.1/src/options.c feh-2.2/src/options.c --- feh-2.1/src/options.c 2011-11-02 09:59:20.000000000 +0000 +++ feh-2.2/src/options.c 2012-01-02 10:55:04.000000000 +0000 @@ -390,6 +390,7 @@ {"thumb-redraw" , 1, 0, 'J'}, {"info" , 1, 0, 234}, {"force-aliasing", 0, 0, 235}, + {"no-fehbg" , 0, 0, 236}, {0, 0, 0, 0} }; @@ -703,6 +704,9 @@ case 235: opt.force_aliasing = 1; break; + case 236: + opt.no_fehbg = 1; + break; default: break; } diff -Nru feh-2.1/src/options.h feh-2.2/src/options.h --- feh-2.1/src/options.h 2011-11-02 09:59:20.000000000 +0000 +++ feh-2.2/src/options.h 2012-01-02 10:55:04.000000000 +0000 @@ -68,6 +68,7 @@ unsigned char hold_actions[10]; unsigned char text_bg; unsigned char image_bg; + unsigned char no_fehbg; char *output_file; char *output_dir; diff -Nru feh-2.1/src/wallpaper.c feh-2.2/src/wallpaper.c --- feh-2.1/src/wallpaper.c 2011-11-02 09:59:20.000000000 +0000 +++ feh-2.2/src/wallpaper.c 2012-01-02 10:55:04.000000000 +0000 @@ -395,7 +395,7 @@ fehbg = estrjoin(" ", "feh --bg-tile", filbuf, NULL); } - if (fehbg) { + if (fehbg && !opt.no_fehbg) { home = getenv("HOME"); if (home) { FILE *fp;