[jumpnbump] 01/02: do not build and install the jumpnbump-menu anymore

[Fabian Greffrath]

This is an automated email from the git hooks/post-receive script.

fabian pushed a commit to branch master
in repository jumpnbump.

commit 40236b5379048f9c7134c8f02821101c89ae2ac1
Author: Fabian Greffrath <fabian at debian.org>
Date:   Mon Jan 15 17:39:44 2018 +0100

    do not build and install the jumpnbump-menu anymore
    
    Closes: #885310
---
 debian/control                  |  6 -----
 debian/jumpnbump.links          |  1 -
 debian/patches/no-jnbmenu.patch | 50 +++++++++++++++++++++++++++++++++++++++++
 debian/patches/series           |  1 +
 debian/rules                    |  2 +-
 5 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index 6d64a72..e1c8269 100644
--- a/debian/control
+++ b/debian/control
@@ -6,12 +6,10 @@ Uploaders:
  Fabian Greffrath <fabian at debian.org>
 Build-Depends:
  debhelper (>= 10~),
- dh-python,
  libbz2-dev,
  libsdl2-dev (>> 2.0.4),
  libsdl2-mixer-dev (>> 2.0.1),
  libsdl2-net-dev (>> 2.0.1),
- python:any | python-all:any | python-dev:any | python-all-dev:any,
  zlib1g-dev
 Standards-Version: 3.9.8
 Homepage: https://gitlab.com/LibreGames/jumpnbump/
@@ -23,11 +21,7 @@ Architecture: any
 Suggests:
  jumpnbump-levels
 Depends:
- imagemagick,
- python-glade2,
- python-gtk2,
  ${misc:Depends},
- ${python:Depends},
  ${shlibs:Depends}
 Description: cute multiplayer platform game with bunnies
  You, as a bunny, have to jump on your opponents to make them
diff --git a/debian/jumpnbump.links b/debian/jumpnbump.links
index 4257f1f..096b332 100644
--- a/debian/jumpnbump.links
+++ b/debian/jumpnbump.links
@@ -1,4 +1,3 @@
 usr/share/man/man6/jumpnbump.6.gz usr/share/man/man6/gobpack.6.gz
 usr/share/man/man6/jumpnbump.6.gz usr/share/man/man6/jnbpack.6.gz
 usr/share/man/man6/jumpnbump.6.gz usr/share/man/man6/jnbunpack.6.gz
-usr/share/man/man6/jumpnbump.6.gz usr/share/man/man6/jumpnbump-menu.6.gz
diff --git a/debian/patches/no-jnbmenu.patch b/debian/patches/no-jnbmenu.patch
new file mode 100644
index 0000000..a1107fd
--- /dev/null
+++ b/debian/patches/no-jnbmenu.patch
@@ -0,0 +1,50 @@
+Author: Fabian Greffrath <fabian at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=885310
+Subject: do not build and install the jumpnbump-menu anymore
+
+We have to remove this in order to get rid of the dependency on pygtk.
+
+--- a/Makefile
++++ b/Makefile
+@@ -49,13 +49,13 @@ data: $(MODIFY_TARGET)
+ 	$(MAKE) -C data
+ 
+ jnbmenu:
+-	$(MAKE) -C menu
++#	$(MAKE) -C menu
+ 
+ clean:
+ 	for dir in data modify sdl; do $(MAKE) clean -C $$dir; done
+ 	$(RM) $(TARGET) *.exe *.o globals.h
+ 
+-	$(MAKE) -C menu clean
++#	$(MAKE) -C menu clean
+ 
+ install:
+ 	mkdir -p $(DESTDIR)$(BINDIR)
+@@ -71,13 +71,13 @@ install:
+ 		$(DESTDIR)$(DATADIR)/appdata/jumpnbump.appdata.xml
+ 	install -m 644 dist/jumpnbump.desktop \
+ 		$(DESTDIR)$(DATADIR)/applications/jumpnbump.desktop
+-	install -m 644 dist/jumpnbump-menu.desktop \
+-		$(DESTDIR)$(DATADIR)/applications/jumpnbump-menu.desktop
++#	install -m 644 dist/jumpnbump-menu.desktop \
++#		$(DESTDIR)$(DATADIR)/applications/jumpnbump-menu.desktop
+ 	install -m 644 dist/jumpnbump.png \
+ 		$(DESTDIR)$(DATADIR)/icons/jumpnbump.png
+ 	install -m 644 dist/jumpnbump.6 $(DESTDIR)$(DATADIR)/man/man6/
+ 
+-	$(MAKE) -C menu install
++#	$(MAKE) -C menu install
+ 
+ uninstall:
+ 	for bin in $(BINARIES); do $(RM) $(DESTDIR)$(BINDIR)/$$bin; done
+@@ -87,7 +87,7 @@ uninstall:
+ 	$(RM) $(DESTDIR)$(DATADIR)/icons/jumpnbump.png
+ 	$(RM) $(DESTDIR)$(DATADIR)/man/man6/jumpnbump.6
+ 
+-	$(MAKE) -C menu uninstall
++#	$(MAKE) -C menu uninstall
+ 
+ doc:
+ 	rman dist/jumpnbump.6 -f HTML > docs/jumpnbump.html
diff --git a/debian/patches/series b/debian/patches/series
index 5d34a2b..641dabc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-menu-Make-python-shebang-more-explicit.patch
 0003-dist-fix-some-meta-data-syntax.patch
 0004-Makefile-Fix-occasional-parallel-FTBFS.patch
+no-jnbmenu.patch
diff --git a/debian/rules b/debian/rules
index ab6c0f8..846b823 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 %:
-	dh $@ --with python2
+	dh $@
 
 override_dh_auto_build:
 	dh_auto_build -- PREFIX=/usr BINDIR=/usr/games GAMEDATADIR=/usr/share/games

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/jumpnbump.git