diff options
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | fltk.list.in | 8 | ||||
| -rw-r--r-- | fltk.spec.in | 8 | ||||
| -rw-r--r-- | fluid/Makefile | 6 | ||||
| -rw-r--r-- | test/Makefile | 6 |
5 files changed, 15 insertions, 14 deletions
@@ -6,6 +6,7 @@ CHANGES IN FLTK 1.1.8 STR #1742, STR #1777, STR #1794, STR #1827, STR #1843, STR #1796, STR #1815, STR #1726, STR #1753, STR #1855, STR #1862, STR #1867, STR #1874) + - Fixed KDE/Gnome icon paths (STR #1795) - Fixed Tab key to wrap around menu bars (STR #1877) - Fixed possible timer leak in Scrollbar (STR #1880) - Added documentation about the potential limitations diff --git a/fltk.list.in b/fltk.list.in index f1f53d2ad..7c54e5af4 100644 --- a/fltk.list.in +++ b/fltk.list.in @@ -129,7 +129,7 @@ f 0444 root sys /Applications/fluid.app/Contents/Resources/fluid.icns fluid/flui %postremove /bin/rm -rf /Applications/fluid.app %system !darwin -f 0444 root sys /usr/share/applnk/Development/fluid.desktop fluid/fluid.desktop +f 0444 root sys /usr/share/applications/fluid.desktop fluid/fluid.desktop f 0444 root sys /usr/share/icons/hicolor/16x16/apps/fluid.png fluid/icons/fluid-16.png f 0444 root sys /usr/share/icons/hicolor/32x32/apps/fluid.png fluid/icons/fluid-32.png f 0444 root sys /usr/share/icons/hicolor/48x48/apps/fluid.png fluid/icons/fluid-48.png @@ -394,17 +394,17 @@ f 0444 root sys /Applications/sudoku.app/Contents/Resources/sudoku.icns test/sud %system !darwin f 0555 root sys $bindir/blocks test/blocks -f 0444 root sys /usr/share/applnk/Games/blocks.desktop test/desktop/blocks.desktop +f 0444 root sys /usr/share/applications/blocks.desktop test/desktop/blocks.desktop f 0444 root sys /usr/share/icons/hicolor/32x32/apps/blocks.png test/icons/blocks-32.png f 0444 root sys /usr/share/icons/hicolor/128x128/apps/blocks.png test/icons/blocks-128.png f 0555 root sys $bindir/checkers test/checkers -f 0444 root sys /usr/share/applnk/Games/checkers.desktop test/desktop/checkers.desktop +f 0444 root sys /usr/share/applications/checkers.desktop test/desktop/checkers.desktop f 0444 root sys /usr/share/icons/hicolor/32x32/apps/checkers.png test/icons/checkers-32.png f 0444 root sys /usr/share/icons/hicolor/128x128/apps/checkers.png test/icons/checkers-128.png f 0555 root sys $bindir/sudoku test/sudoku -f 0444 root sys /usr/share/applnk/Games/sudoku.desktop test/desktop/sudoku.desktop +f 0444 root sys /usr/share/applications/sudoku.desktop test/desktop/sudoku.desktop f 0444 root sys /usr/share/icons/hicolor/32x32/apps/sudoku.png test/icons/sudoku-32.png f 0444 root sys /usr/share/icons/hicolor/128x128/apps/sudoku.png test/icons/sudoku-128.png diff --git a/fltk.spec.in b/fltk.spec.in index dec9d50aa..cd79d9a02 100644 --- a/fltk.spec.in +++ b/fltk.spec.in @@ -113,8 +113,8 @@ rm -rf $RPM_BUILD_ROOT %dir %{prefix}/share/doc/fltk %{prefix}/share/doc/fltk/* -%dir %{prefix}/share/applnk -%{prefix}/share/applnk/Development/* +%dir %{prefix}/share/applications +%{prefix}/share/applications/* %dir %{prefix}/share/icons %{prefix}/share/icons/hicolor/*/apps/fluid.png @@ -132,8 +132,8 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/cat6/* %{_mandir}/man6/* -%dir %{prefix}/share/applnk -%{prefix}/share/applnk/Games/* +%dir %{prefix}/share/applications +%{prefix}/share/applications/* %dir %{prefix}/share/icons %{prefix}/share/icons/hicolor/*/apps/blocks.png diff --git a/fluid/Makefile b/fluid/Makefile index aa8bb09b1..ada2f6501 100644 --- a/fluid/Makefile +++ b/fluid/Makefile @@ -84,8 +84,8 @@ install: all $(INSTALL_BIN) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT) install-linux: - -$(INSTALL_DIR) $(DESTDIR)/usr/share/applnk/Development - $(INSTALL_DATA) fluid.desktop $(DESTDIR)/usr/share/applnk/Development + -$(INSTALL_DIR) $(DESTDIR)/usr/share/applications + $(INSTALL_DATA) fluid.desktop $(DESTDIR)/usr/share/applications for size in 16 32 48 64 128; do \ if test ! -d $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; then \ $(INSTALL_DIR) $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; \ @@ -111,7 +111,7 @@ uninstall: $(RM) $(DESTDIR)$(bindir)/fluid$(EXEEXT) uninstall-linux: - $(RM) $(DESTDIR)/usr/share/applnk/Development/fluid.desktop + $(RM) $(DESTDIR)/usr/share/applications/fluid.desktop $(RM) $(DESTDIR)/usr/share/icons/hicolor/*/fluid.png $(RM) $(DESTDIR)/usr/share/mimelnk/application/x-fluid.desktop diff --git a/test/Makefile b/test/Makefile index 0da4908dd..abd0a8a34 100644 --- a/test/Makefile +++ b/test/Makefile @@ -203,12 +203,12 @@ install: all install-linux: echo Installing games to $(DESTDIR)$(bindir)... -$(INSTALL_DIR) $(DESTDIR)$(bindir) - -$(INSTALL_DIR) $(DESTDIR)/usr/share/applnk/Games + -$(INSTALL_DIR) $(DESTDIR)/usr/share/applications -$(INSTALL_DIR) $(DESTDIR)/usr/share/icons/hicolor/32x32/apps -$(INSTALL_DIR) $(DESTDIR)/usr/share/icons/hicolor/128x128/apps for game in blocks checkers sudoku; do \ $(INSTALL_BIN) $$game $(DESTDIR)$(bindir); \ - $(INSTALL_DATA) desktop/$$game.desktop $(DESTDIR)/usr/share/applnk/Games; \ + $(INSTALL_DATA) desktop/$$game.desktop $(DESTDIR)/usr/share/applications; \ $(INSTALL_DATA) desktop/$$game-32.png $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/$$game.png; \ $(INSTALL_DATA) desktop/$$game-128.png $(DESTDIR)/usr/share/icons/hicolor/128x128/apps/$$game.png; \ done @@ -236,7 +236,7 @@ uninstall-linux: echo Removing games from $(DESTDIR)$(bindir)... for game in blocks checkers sudoku; do \ $(RM) $(DESTDIR)$(bindir)/$$game; \ - $(RM) $(DESTDIR)/usr/share/applnk/Games/$$game.desktop; \ + $(RM) $(DESTDIR)/usr/share/applications/$$game.desktop; \ $(RM) $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/$$game.png; \ $(RM) $(DESTDIR)/usr/share/icons/hicolor/128x128/apps/$$game.png; \ done |