diff -Nru /tmp/lU161zAgXi/fltk1.1-1.1.7/debian/changelog /tmp/gwfpkiBLFO/fltk1.1-1.1.7/debian/changelog --- /tmp/lU161zAgXi/fltk1.1-1.1.7/debian/changelog 2007-09-23 18:20:37.000000000 -0400 +++ /tmp/gwfpkiBLFO/fltk1.1-1.1.7/debian/changelog 2007-09-23 18:20:37.000000000 -0400 @@ -1,3 +1,10 @@ +fltk1.1 (1.1.7-4ubuntu1) gutsy; urgency=low + + * Fix shortcuts so they appear on Gutsy. + Changed "applnk/Development" to "applications". (LP: #139980) + + -- Andy Matteson Sun, 23 Sep 2007 18:12:46 -0400 + fltk1.1 (1.1.7-4) unstable; urgency=low * configure(.in), {src,test}/Makefile: drop unnecessary hardcoded diff -Nru /tmp/lU161zAgXi/fltk1.1-1.1.7/debian/fluid.install /tmp/gwfpkiBLFO/fltk1.1-1.1.7/debian/fluid.install --- /tmp/lU161zAgXi/fltk1.1-1.1.7/debian/fluid.install 2007-09-23 18:20:37.000000000 -0400 +++ /tmp/gwfpkiBLFO/fltk1.1-1.1.7/debian/fluid.install 2007-09-23 18:20:37.000000000 -0400 @@ -1,5 +1,5 @@ usr/bin/fluid -usr/share/applnk/Development/fluid.desktop +usr/share/applications/fluid.desktop usr/share/icons/hicolor/*/apps/fluid.png usr/share/locale/*/LC_MESSAGES/fluid.mo usr/share/mimelnk/application/x-fluid.desktop diff -Nru /tmp/lU161zAgXi/fltk1.1-1.1.7/debian/rules /tmp/gwfpkiBLFO/fltk1.1-1.1.7/debian/rules --- /tmp/lU161zAgXi/fltk1.1-1.1.7/debian/rules 2007-09-23 18:20:37.000000000 -0400 +++ /tmp/gwfpkiBLFO/fltk1.1-1.1.7/debian/rules 2007-09-23 18:20:37.000000000 -0400 @@ -40,3 +40,6 @@ debian/tmp/usr/share/CMake/Modules binary-predeb/fluid:: binary-fixup/libfltk1.1 + +binary-install/fluid:: + dh_icons diff -Nru /tmp/lU161zAgXi/fltk1.1-1.1.7/fltk.list.in /tmp/gwfpkiBLFO/fltk1.1-1.1.7/fltk.list.in --- /tmp/lU161zAgXi/fltk1.1-1.1.7/fltk.list.in 2006-01-15 15:33:10.000000000 -0500 +++ /tmp/gwfpkiBLFO/fltk1.1-1.1.7/fltk.list.in 2007-09-23 18:20:37.000000000 -0400 @@ -129,7 +129,7 @@ %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 @@ -384,12 +384,12 @@ %system !darwin f 0555 root sys $bindir/checkers test/checkers -f 0444 root sys /usr/share/applnk/Games/checkers.desktop test/checkers.desktop +f 0444 root sys /usr/share/applications/checkers.desktop test/checkers.desktop f 0444 root sys /usr/share/icons/hicolor/32x32/apps/checkers.png checkers/checkers-32.png f 0444 root sys /usr/share/icons/hicolor/128x128/apps/checkers.png checkers/checkers-128.png f 0555 root sys $bindir/sudoku test/sudoku -f 0444 root sys /usr/share/applnk/Games/sudoku.desktop test/sudoku.desktop +f 0444 root sys /usr/share/applications/sudoku.desktop test/sudoku.desktop f 0444 root sys /usr/share/icons/hicolor/32x32/apps/sudoku.png sudoku/sudoku-32.png f 0444 root sys /usr/share/icons/hicolor/128x128/apps/sudoku.png sudoku/sudoku-128.png diff -Nru /tmp/lU161zAgXi/fltk1.1-1.1.7/fltk.spec /tmp/gwfpkiBLFO/fltk1.1-1.1.7/fltk.spec --- /tmp/lU161zAgXi/fltk1.1-1.1.7/fltk.spec 2006-01-17 21:30:48.000000000 -0500 +++ /tmp/gwfpkiBLFO/fltk1.1-1.1.7/fltk.spec 2007-09-23 18:20:37.000000000 -0400 @@ -113,8 +113,8 @@ %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 @@ -131,8 +131,8 @@ %{_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/checkers.png diff -Nru /tmp/lU161zAgXi/fltk1.1-1.1.7/fltk.spec.in /tmp/gwfpkiBLFO/fltk1.1-1.1.7/fltk.spec.in --- /tmp/lU161zAgXi/fltk1.1-1.1.7/fltk.spec.in 2006-01-15 13:36:16.000000000 -0500 +++ /tmp/gwfpkiBLFO/fltk1.1-1.1.7/fltk.spec.in 2007-09-23 18:20:37.000000000 -0400 @@ -113,8 +113,8 @@ %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 @@ -131,8 +131,8 @@ %{_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/checkers.png diff -Nru /tmp/lU161zAgXi/fltk1.1-1.1.7/fluid/Makefile /tmp/gwfpkiBLFO/fltk1.1-1.1.7/fluid/Makefile --- /tmp/lU161zAgXi/fltk1.1-1.1.7/fluid/Makefile 2007-09-23 18:20:37.000000000 -0400 +++ /tmp/gwfpkiBLFO/fltk1.1-1.1.7/fluid/Makefile 2007-09-23 18:20:37.000000000 -0400 @@ -107,8 +107,8 @@ cd po && $(MAKE) install LOCALEDIR=$(DESTDIR)$(datadir)/locale/ install-linux: - -$(MKDIR) $(DESTDIR)/usr/share/applnk/Development - $(CP) fluid.desktop $(DESTDIR)/usr/share/applnk/Development + -$(MKDIR) $(DESTDIR)/usr/share/applications + $(CP) 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 \ $(MKDIR) $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; \ @@ -133,7 +133,7 @@ cd po && $(MAKE) uninstall LOCALEDIR=$(DESTDIR)$(datadir)/locale/ 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 -Nru /tmp/lU161zAgXi/fltk1.1-1.1.7/test/Makefile /tmp/gwfpkiBLFO/fltk1.1-1.1.7/test/Makefile --- /tmp/lU161zAgXi/fltk1.1-1.1.7/test/Makefile 2007-09-23 18:20:37.000000000 -0400 +++ /tmp/gwfpkiBLFO/fltk1.1-1.1.7/test/Makefile 2007-09-23 18:20:37.000000000 -0400 @@ -183,13 +183,13 @@ install-linux: echo Installing games to $(DESTDIR)$(bindir)... -$(MKDIR) $(DESTDIR)$(bindir) - -$(MKDIR) $(DESTDIR)/usr/share/applnk/Games + -$(MKDIR) $(DESTDIR)/usr/share/applications -$(MKDIR) $(DESTDIR)/usr/share/icons/hicolor/32x32/apps -$(MKDIR) $(DESTDIR)/usr/share/icons/hicolor/128x128/apps for game in checkers sudoku; do \ $(CP) $$game $(DESTDIR)$(bindir); \ $(CHMOD) 755 $(DESTDIR)$(bindir)/$$game; \ - $(CP) $$game.desktop $(DESTDIR)/usr/share/applnk/Games; \ + $(CP) $$game.desktop $(DESTDIR)/usr/share/applications; \ $(CP) $$game-32.png $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/$$game.png; \ $(CP) $$game-128.png $(DESTDIR)/usr/share/icons/hicolor/128x128/apps/$$game.png; \ done @@ -217,7 +217,7 @@ echo Removing games from $(DESTDIR)$(bindir)... for game in 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