Author: jmtd Date: 2009-07-05 22:20:12 +0000 (Sun, 05 Jul 2009) New Revision: 9972
Modified: packages/branches/freedoom/no_iwad_alternatives/debian/changelog packages/branches/freedoom/no_iwad_alternatives/debian/compat packages/branches/freedoom/no_iwad_alternatives/debian/control packages/branches/freedoom/no_iwad_alternatives/debian/freedm.desktop packages/branches/freedoom/no_iwad_alternatives/debian/freedm.install packages/branches/freedoom/no_iwad_alternatives/debian/freedm.postinst packages/branches/freedoom/no_iwad_alternatives/debian/freedoom.desktop packages/branches/freedoom/no_iwad_alternatives/debian/freedoom.install packages/branches/freedoom/no_iwad_alternatives/debian/freedoom.postinst packages/branches/freedoom/no_iwad_alternatives/debian/rules Log: train hacking to remove alternatives Modified: packages/branches/freedoom/no_iwad_alternatives/debian/changelog =================================================================== --- packages/branches/freedoom/no_iwad_alternatives/debian/changelog 2009-07-05 22:12:49 UTC (rev 9971) +++ packages/branches/freedoom/no_iwad_alternatives/debian/changelog 2009-07-05 22:20:12 UTC (rev 9972) @@ -1,3 +1,22 @@ +freedoom (0.6.4-5) unstable; urgency=low + + * Stop providing doom2.wad alternative: we are not + vanilla compatible. Remove older alternatives in + postinst for upgrades. + * Adjust PATH in debian/rules to avoid needing to + patch Makefile: thus, remove quilt dependency and + patching boilerplate + * bump Debhelper and compat to 7 + * install "freedm" and "freedoom" invoke-scripts into + /usr/games. Reference these in the .desktop files. + * Remove lintian overrides. These were for calling + "boom" in the desktop files but not installing it + (fixed with invoke-scripts); creating a directory + with no files in it (which we installed alternatives + into). + + -- Jon Dowland <[email protected]> Sun, 05 Jul 2009 22:38:45 +0100 + freedoom (0.6.4-4) unstable; urgency=low * changes for debhelper 7 Modified: packages/branches/freedoom/no_iwad_alternatives/debian/compat =================================================================== --- packages/branches/freedoom/no_iwad_alternatives/debian/compat 2009-07-05 22:12:49 UTC (rev 9971) +++ packages/branches/freedoom/no_iwad_alternatives/debian/compat 2009-07-05 22:20:12 UTC (rev 9972) @@ -1 +1 @@ -5 +7 Modified: packages/branches/freedoom/no_iwad_alternatives/debian/control =================================================================== --- packages/branches/freedoom/no_iwad_alternatives/debian/control 2009-07-05 22:12:49 UTC (rev 9971) +++ packages/branches/freedoom/no_iwad_alternatives/debian/control 2009-07-05 22:20:12 UTC (rev 9972) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Games Team <[email protected]> Uploaders: Moritz Muehlenhoff <[email protected]>, Jon Dowland <[email protected]> -Build-Depends: debhelper (>= 5), quilt +Build-Depends: debhelper (>= 7) Build-Depends-Indep: deutex, imagemagick, gsfonts, python (>= 2.4) Standards-Version: 3.8.2 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/freedoom/ Modified: packages/branches/freedoom/no_iwad_alternatives/debian/freedm.desktop =================================================================== --- packages/branches/freedoom/no_iwad_alternatives/debian/freedm.desktop 2009-07-05 22:12:49 UTC (rev 9971) +++ packages/branches/freedoom/no_iwad_alternatives/debian/freedm.desktop 2009-07-05 22:20:12 UTC (rev 9972) @@ -2,7 +2,7 @@ Name=Free DM GenericName=Multiplayer-only Clone of the first person shooter Doom Comment=First Person Shooter Game -Exec=boom -iwad /usr/share/games/freedoom/freedm.wad +Exec=/usr/games/freedm Icon=freedm Terminal=false Type=Application Modified: packages/branches/freedoom/no_iwad_alternatives/debian/freedm.install =================================================================== --- packages/branches/freedoom/no_iwad_alternatives/debian/freedm.install 2009-07-05 22:12:49 UTC (rev 9971) +++ packages/branches/freedoom/no_iwad_alternatives/debian/freedm.install 2009-07-05 22:20:12 UTC (rev 9972) @@ -1,4 +1,4 @@ +debian/wrappers/freedm usr/games wads/freedm.wad usr/share/games/freedoom debian/freedm.desktop usr/share/applications freedm.xpm /usr/share/pixmaps -debian/overrides/freedm usr/share/lintian/overrides Modified: packages/branches/freedoom/no_iwad_alternatives/debian/freedm.postinst =================================================================== --- packages/branches/freedoom/no_iwad_alternatives/debian/freedm.postinst 2009-07-05 22:12:49 UTC (rev 9971) +++ packages/branches/freedoom/no_iwad_alternatives/debian/freedm.postinst 2009-07-05 22:20:12 UTC (rev 9972) @@ -5,10 +5,10 @@ case "$1" in configure|abort-upgrade) - update-alternatives --install /usr/share/games/doom/doom2.wad \ - doom2.wad \ - /usr/share/games/freedoom/freedm.wad \ - 12 + if dpkg --compare-versions "$2" lt "0.6.4-5"; then + update-alternatives --remove doom2.wad \ + /usr/share/games/freedoom/freedm.wad + fi ;; abort-remove|abort-deconfigure) Modified: packages/branches/freedoom/no_iwad_alternatives/debian/freedoom.desktop =================================================================== --- packages/branches/freedoom/no_iwad_alternatives/debian/freedoom.desktop 2009-07-05 22:12:49 UTC (rev 9971) +++ packages/branches/freedoom/no_iwad_alternatives/debian/freedoom.desktop 2009-07-05 22:20:12 UTC (rev 9972) @@ -2,7 +2,7 @@ Name=Freedoom GenericName=Clone of the legendary first person shooter Doom Comment=First Person Shooter Game -Exec=boom -iwad /usr/share/games/freedoom/doom2.wad +Exec=/usr/games/freedoom Icon=freedoom Terminal=false Type=Application Modified: packages/branches/freedoom/no_iwad_alternatives/debian/freedoom.install =================================================================== --- packages/branches/freedoom/no_iwad_alternatives/debian/freedoom.install 2009-07-05 22:12:49 UTC (rev 9971) +++ packages/branches/freedoom/no_iwad_alternatives/debian/freedoom.install 2009-07-05 22:20:12 UTC (rev 9972) @@ -1,4 +1,4 @@ +debian/wrappers/freedoom usr/games wads/doom2.wad usr/share/games/freedoom -debian/overrides/freedoom usr/share/lintian/overrides debian/freedoom.desktop usr/share/applications freedoom.xpm /usr/share/pixmaps Modified: packages/branches/freedoom/no_iwad_alternatives/debian/freedoom.postinst =================================================================== --- packages/branches/freedoom/no_iwad_alternatives/debian/freedoom.postinst 2009-07-05 22:12:49 UTC (rev 9971) +++ packages/branches/freedoom/no_iwad_alternatives/debian/freedoom.postinst 2009-07-05 22:20:12 UTC (rev 9972) @@ -5,10 +5,10 @@ case "$1" in configure|abort-upgrade) - update-alternatives --install /usr/share/games/doom/doom2.wad \ - doom2.wad \ - /usr/share/games/freedoom/doom2.wad \ - 25 + if dpkg --compare-versions "$2" lt "0.6.4-5"; then + update-alternatives --remove doom2.wad \ + /usr/share/games/freedoom/doom2.wad + fi ;; abort-remove|abort-deconfigure) Modified: packages/branches/freedoom/no_iwad_alternatives/debian/rules =================================================================== --- packages/branches/freedoom/no_iwad_alternatives/debian/rules 2009-07-05 22:12:49 UTC (rev 9971) +++ packages/branches/freedoom/no_iwad_alternatives/debian/rules 2009-07-05 22:20:12 UTC (rev 9972) @@ -6,10 +6,13 @@ # This is the debhelper compatability version to use. #export DH_COMPAT=3 +# upstream makefile invokes 'deutex' which lives in +# /usr/games +PATH := /usr/games:$(PATH) + configure: configure-stamp configure-stamp: dh_testdir - $(MAKE) -f /usr/share/quilt/quilt.make patch touch configure-stamp build: configure-stamp build-stamp @@ -33,7 +36,6 @@ rm -f build-stamp configure-stamp dh_clean $(MAKE) clean - $(MAKE) -f /usr/share/quilt/quilt.make unpatch rm -f freedoom.xpm freedm.xpm _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
