diff -Nru redeclipse-1.2/debian/changelog redeclipse-1.2/debian/changelog --- redeclipse-1.2/debian/changelog 2012-02-12 19:47:38.000000000 +0000 +++ redeclipse-1.2/debian/changelog 2012-02-25 23:24:06.000000000 +0000 @@ -1,3 +1,13 @@ +redeclipse (1.2-2) unstable; urgency=low + + * debian/patches/backported-fix-icon-sizes.patch + - Fix icon size and location, cherry-picked from upstream SVN + * Standards-Version 3.9.3 + - Set final copyright Format: link + * Instruct to use -h before -r in reportbug instrutions + + -- Martin Erik Werner Sun, 26 Feb 2012 00:20:12 +0100 + redeclipse (1.2-1) unstable; urgency=low * Initial release (Closes: #626161) diff -Nru redeclipse-1.2/debian/control redeclipse-1.2/debian/control --- redeclipse-1.2/debian/control 2012-02-12 19:47:38.000000000 +0000 +++ redeclipse-1.2/debian/control 2012-02-25 22:53:20.000000000 +0000 @@ -12,7 +12,7 @@ libsdl1.2-dev, libx11-dev, zlib1g-dev -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: http://www.redeclipse.net Vcs-Git: git://git.debian.org/pkg-games/redeclipse.git Vcs-Browser: http://git.debian.org/?p=pkg-games/redeclipse.git;a=summary diff -Nru redeclipse-1.2/debian/copyright redeclipse-1.2/debian/copyright --- redeclipse-1.2/debian/copyright 2012-02-12 19:47:38.000000000 +0000 +++ redeclipse-1.2/debian/copyright 2012-02-25 22:53:20.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://dep.debian.net/deps/dep5/ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Red Eclipse Upstream-Contact: Quinton "Quin" Reeves Lee "Eihrul" Salzman diff -Nru redeclipse-1.2/debian/patches/backported-fix-icon-sizes.patch redeclipse-1.2/debian/patches/backported-fix-icon-sizes.patch --- redeclipse-1.2/debian/patches/backported-fix-icon-sizes.patch 1970-01-01 00:00:00.000000000 +0000 +++ redeclipse-1.2/debian/patches/backported-fix-icon-sizes.patch 2012-02-25 22:53:20.000000000 +0000 @@ -0,0 +1,66 @@ +From 32f8e90b46d86599a2de26d937b72655cbfd2873 Mon Sep 17 00:00:00 2001 +From: arand-2 +Date: Sat, 25 Feb 2012 01:56:08 +0000 +Subject: [PATCH] system-install.mk: Fix icon sizes + +* Fix x32 and x48 icon sizes to match location, add x16 icon + - Worth backporting to Ubuntu for Unity + +git-svn-id: https://redeclipse.svn.sourceforge.net/svnroot/redeclipse@3614 2cd6abe5-5779-42d9-9038-cec04ae5ff40 +--- + src/system-install.mk | 12 ++++++++++-- + 1 files changed, 10 insertions(+), 2 deletions(-) + +--- a/src/system-install.mk ++++ b/src/system-install.mk +@@ -1,6 +1,7 @@ + GZIP=gzip + + ICONS= \ ++ install/nix/redeclipse_x16.png \ + install/nix/redeclipse_x32.png \ + install/nix/redeclipse_x48.png \ + install/nix/redeclipse_x64.png \ +@@ -19,12 +20,15 @@ + menudir=$(DESTDIR)$(prefix)/share/applications + icondir=$(DESTDIR)$(prefix)/share/icons/hicolor + +-install/nix/redeclipse_x32.png: redeclipse.ico ++install/nix/redeclipse_x16.png: redeclipse.ico + convert 'redeclipse.ico[0]' $@ + +-install/nix/redeclipse_x48.png: redeclipse.ico ++install/nix/redeclipse_x32.png: redeclipse.ico + convert 'redeclipse.ico[1]' $@ + ++install/nix/redeclipse_x48.png: redeclipse.ico ++ convert 'redeclipse.ico[2]' -resize 48x48 $@ ++ + install/nix/redeclipse_x64.png: redeclipse.ico + convert 'redeclipse.ico[2]' $@ + +@@ -85,6 +89,7 @@ + + system-install-menus: icons + install -d $(menudir) ++ install -d $(icondir)/16x16/apps + install -d $(icondir)/32x32/apps + install -d $(icondir)/48x48/apps + install -d $(icondir)/64x64/apps +@@ -95,6 +100,8 @@ + -e 's,@REDECLIPSE@,$(redeclipse),g' \ + install/nix/redeclipse.desktop.am > \ + $(menudir)/$(redeclipse).desktop ++ install -m644 install/nix/redeclipse_x16.png \ ++ $(icondir)/16x16/apps/$(redeclipse).png + install -m644 install/nix/redeclipse_x32.png \ + $(icondir)/32x32/apps/$(redeclipse).png + install -m644 install/nix/redeclipse_x48.png \ +@@ -134,6 +141,7 @@ + + system-uninstall-menus: + @rm -fv $(menudir)/$(redeclipse).desktop ++ @rm -fv $(icondir)/16x16/apps/$(redeclipse).png + @rm -fv $(icondir)/32x32/apps/$(redeclipse).png + @rm -fv $(icondir)/48x48/apps/$(redeclipse).png + @rm -fv $(icondir)/64x64/apps/$(redeclipse).png diff -Nru redeclipse-1.2/debian/patches/series redeclipse-1.2/debian/patches/series --- redeclipse-1.2/debian/patches/series 2012-02-12 19:47:38.000000000 +0000 +++ redeclipse-1.2/debian/patches/series 2012-02-25 22:53:20.000000000 +0000 @@ -1,3 +1,4 @@ windowed-by-default.patch build-with-debug-symbols.patch build-with-system-enet.patch +backported-fix-icon-sizes.patch diff -Nru redeclipse-1.2/debian/redeclipse.bug-presubj redeclipse-1.2/debian/redeclipse.bug-presubj --- redeclipse-1.2/debian/redeclipse.bug-presubj 2012-02-12 19:47:38.000000000 +0000 +++ redeclipse-1.2/debian/redeclipse.bug-presubj 2012-02-25 22:53:20.000000000 +0000 @@ -20,7 +20,7 @@ Once at the gdb prompt, start Red Eclipse via - run -r -df0 -h/tmp/recfg + run -h/tmp/recfg -r -df0 Once Red Eclipse has crashed, type