From ce6c06eca559dc7b2fc0e7eb35e6bc79cb44d0e9 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha <[email protected]> Date: Thu, 28 Dec 2017 12:04:16 -0500 Subject: [PATCH 1/5] Add 03_dont_use_scrollkeeper.patch
--- debian/patches/03_dont_use_scrollkeeper.patch | 36 +++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 37 insertions(+) create mode 100644 debian/patches/03_dont_use_scrollkeeper.patch diff --git a/debian/patches/03_dont_use_scrollkeeper.patch b/debian/patches/03_dont_use_scrollkeeper.patch new file mode 100644 index 0000000..706b863 --- /dev/null +++ b/debian/patches/03_dont_use_scrollkeeper.patch @@ -0,0 +1,36 @@ +From: Jeremy Bicha <[email protected]> +Date: Thu, 28 Dec 2017 12:02:05 -0500 +Subject: don't use scrollkeeper + +--- + Makefile.in | 10 ---------- + 1 file changed, 10 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 8f62e7a..e34c4d6 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -510,8 +510,6 @@ install : install_mkdir + $(INSTALL_DATA) "$(srcdir)/corner5x2.bin" "$(DESTDIR)$(pattern_dir)/corner5x2.bin" + $(INSTALL_DATA) "$(srcdir)/book.bin" "$(DESTDIR)$(book_dir)/book.bin" + $(INSTALL_DATA) "$(srcdir)/help/C/legal.xml" "$(DESTDIR)$(helpdir)/C/legal.xml" +- -scrollkeeper-preinstall "$(helpdir)/C/grhino.xml" \ +- "$(srcdir)/help/C/grhino-C.omf.in" "$(DESTDIR)$(omfdir)/grhino-C.omf" + $(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" \ + "$(DESTDIR)$(helpdir)/C/grhino.xml" + $(INSTALL_DATA) "$(srcdir)/help/C/figures/gamelist.png" \ +@@ -549,14 +547,6 @@ install : install_mkdir + cd po; \ + $(MAKE) prefix="$(prefix)" DESTDIR="$(DESTDIR)" install; \ + fi +- -if [ "x$(DESTDIR)" = "x" ]; then \ +- scrollkeeper-update -q -o "$(omfdir)"; \ +- fi +- +-# Run scrollkeeper-update. +-# Intended for installation script in pre-built package +-post_install: +- scrollkeeper-update -q -o "$(omfdir)" + + # + # Development rules diff --git a/debian/patches/series b/debian/patches/series index b06d5c7..26fc41b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 01_dirname_no_version.diff 02_hardening_flags.patch +03_dont_use_scrollkeeper.patch -- 2.14.1
From 0caf51502e35bf32240523a272799119dd5af28d Mon Sep 17 00:00:00 2001 From: Jeremy Bicha <[email protected]> Date: Thu, 28 Dec 2017 11:00:38 -0500 Subject: [PATCH 2/5] Drop obsolete Build-Depends on scrollkeeper Closes: #885624 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 1e451fb..86c8b43 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: games Priority: optional Maintainer: Debian Games Team <[email protected]> Uploaders: Vincent Legout <[email protected]> -Build-Depends: debhelper (>= 9), autotools-dev, libgtk2.0-dev, libgnome2-dev, libgnomeui-dev, imagemagick, scrollkeeper +Build-Depends: debhelper (>= 9), autotools-dev, libgtk2.0-dev, libgnome2-dev, libgnomeui-dev, imagemagick Standards-Version: 3.9.4 Homepage: http://rhino.sourceforge.net/ Vcs-Git: git://anonscm.debian.org/pkg-games/grhino.git -- 2.14.1
From 3b3a0d6ce530b4e1d78f841d1d1f77ac650e6a00 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha <[email protected]> Date: Thu, 28 Dec 2017 11:01:25 -0500 Subject: [PATCH 3/5] Drop obsolete menu and .xpm --- debian/clean | 1 - debian/control | 2 +- debian/grhino.install | 1 - debian/menu | 4 ---- debian/rules | 1 - 5 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 debian/menu diff --git a/debian/clean b/debian/clean index 49a3caa..14f8667 100644 --- a/debian/clean +++ b/debian/clean @@ -4,5 +4,4 @@ Makefile config.h config.log config.status -grhino_icon_menu.xpm desktop/grhino.desktop diff --git a/debian/control b/debian/control index 86c8b43..9cb3a34 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: games Priority: optional Maintainer: Debian Games Team <[email protected]> Uploaders: Vincent Legout <[email protected]> -Build-Depends: debhelper (>= 9), autotools-dev, libgtk2.0-dev, libgnome2-dev, libgnomeui-dev, imagemagick +Build-Depends: debhelper (>= 9), autotools-dev, libgtk2.0-dev, libgnome2-dev, libgnomeui-dev Standards-Version: 3.9.4 Homepage: http://rhino.sourceforge.net/ Vcs-Git: git://anonscm.debian.org/pkg-games/grhino.git diff --git a/debian/grhino.install b/debian/grhino.install index b84ea7d..c6e7250 100644 --- a/debian/grhino.install +++ b/debian/grhino.install @@ -1,4 +1,3 @@ debian/tmp/usr/games debian/tmp/usr/share/pixmaps -grhino_icon_menu.xpm /usr/share/pixmaps/ desktop/grhino.desktop /usr/share/applications/ diff --git a/debian/menu b/debian/menu deleted file mode 100644 index 040add6..0000000 --- a/debian/menu +++ /dev/null @@ -1,4 +0,0 @@ -?package(grhino):needs="X11" section="Games/Board"\ - icon="/usr/share/pixmaps/grhino_icon_menu.xpm"\ - longtitle="Othello/Reversi boardgame"\ - title="grhino" command="/usr/games/grhino" diff --git a/debian/rules b/debian/rules index 879b7bd..62dee24 100755 --- a/debian/rules +++ b/debian/rules @@ -11,7 +11,6 @@ override_dh_auto_configure: for f in $(TOSAVE) ; \ do [ -e $$f.debian-rules-orig ] || cp -rpv $$f $$f.debian-rules-orig ; \ done - [ -e grhino_icon_menu.xpm ] || convert -resize 32x32 icon_new.xpm grhino_icon_menu.xpm dh_auto_configure -- --bindir=/usr/games override_dh_auto_clean: -- 2.14.1
From 5fa470cbf212a8841e91a15f327f20338c3b54d3 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha <[email protected]> Date: Thu, 28 Dec 2017 11:03:57 -0500 Subject: [PATCH 4/5] Update Vcs fields --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 9cb3a34..bc625cc 100644 --- a/debian/control +++ b/debian/control @@ -6,8 +6,8 @@ Uploaders: Vincent Legout <[email protected]> Build-Depends: debhelper (>= 9), autotools-dev, libgtk2.0-dev, libgnome2-dev, libgnomeui-dev Standards-Version: 3.9.4 Homepage: http://rhino.sourceforge.net/ -Vcs-Git: git://anonscm.debian.org/pkg-games/grhino.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/grhino.git +Vcs-Git: https://anonscm.debian.org/git/pkg-games/grhino.git +Vcs-Browser: https://anonscm.debian.org/git/pkg-games/grhino.git Package: grhino Architecture: any -- 2.14.1
From dec443b19b96d6d8a12f76a353406cf4745d5a18 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha <[email protected]> Date: Thu, 28 Dec 2017 11:04:22 -0500 Subject: [PATCH 5/5] Bump Standards-Version to 4.1.3 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index bc625cc..5d82954 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian Games Team <[email protected]> Uploaders: Vincent Legout <[email protected]> Build-Depends: debhelper (>= 9), autotools-dev, libgtk2.0-dev, libgnome2-dev, libgnomeui-dev -Standards-Version: 3.9.4 +Standards-Version: 4.1.3 Homepage: http://rhino.sourceforge.net/ Vcs-Git: https://anonscm.debian.org/git/pkg-games/grhino.git Vcs-Browser: https://anonscm.debian.org/git/pkg-games/grhino.git -- 2.14.1
