diff options
| author | Daniel Friesel <derf@derf.homelinux.org> | 2010-02-05 17:57:27 +0100 |
|---|---|---|
| committer | Daniel Friesel <derf@derf.homelinux.org> | 2010-02-05 17:57:27 +0100 |
| commit | e1e9355dcd3ffd61e4cacf77fa682556b82dda06 (patch) | |
| tree | 144023f5596b4da48192f109aeb800f9b1002a50 | |
| parent | 21c4996c71d76b01a4333ef9905589b3fffa687d (diff) | |
Apply 01_remove_britney_references.patch from Debian
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/menubg_britney.png | bin | 34250 -> 0 bytes | |||
| -rw-r--r-- | src/options.c | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 5b78eec..d4a347f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,7 +24,7 @@ feh_LDADD = -lX11 -lz -lpng @IMLIB_LIBS@ @GIBLIB_LIBS@ images_DATA = about.png menubg_default.png menubg_sky.png \ menubg_chrome.png menubg_brushed.png \ menubg_pastel.png menubg_aluminium.png menubg_aqua.png \ -menubg_wood.png menubg_britney.png menubg_black.png +menubg_wood.png menubg_black.png imagesdir=$(prefix)/share/feh/images EXTRA_DIST = $(images_DATA) diff --git a/src/menubg_britney.png b/src/menubg_britney.png Binary files differdeleted file mode 100644 index 1b1b94e..0000000 --- a/src/menubg_britney.png +++ /dev/null diff --git a/src/options.c b/src/options.c index d9d803d..20f4ea6 100644 --- a/src/options.c +++ b/src/options.c @@ -1196,7 +1196,7 @@ feh_create_default_config(char *rcfile) "orange --menu-bg " PREFIX "/share/feh/images/menubg_orange.png\n" "light --menu-bg " PREFIX "/share/feh/images/menubg_light.png\n" "black --menu-bg " PREFIX "/share/feh/images/menubg_black.png --menu-style " PREFIX "/share/feh/fonts/black.style\n" - "britney --menu-bg " PREFIX "/share/feh/images/menubg_britney.png\n"); + ); fclose(fp); D_RETURN_(4); |
