[jumpnbump] 01/06: adapt packaging to the new upstream release
Fabian Greffrath
fabian at moszumanska.debian.org
Sat Jun 24 15:10:29 UTC 2017
This is an automated email from the git hooks/post-receive script.
fabian pushed a commit to branch master
in repository jumpnbump.
commit 372528896a2378715d30bf3dd15758989ff53e51
Author: Fabian Greffrath <fabian at debian.org>
Date: Sat Jun 24 16:56:15 2017 +0200
adapt packaging to the new upstream release
- remove jumpnbump_menu from debian/contrib as well as the man page,
the desktop file and the png icon, all of which have been adopted by upstream
- install all upstream documentation
- remove debian/FAQ which doesn't apply anymore
- update Build-Depends in debian/control to the SDL2 library variants
- remove the Debian manu file and the XPM icon in favour of the xdg
approach
- remove all patches, thex have been applied upstream
- update the debian/copyright file
- install all game binaries into /usr/games
---
debian/FAQ | 38 -
debian/changelog | 6 +-
debian/contrib/jumpnbump_menu/AUTHOR | 1 -
debian/contrib/jumpnbump_menu/Makefile | 20 -
debian/contrib/jumpnbump_menu/NEWS | 27 -
debian/contrib/jumpnbump_menu/README | 16 -
debian/contrib/jumpnbump_menu/TODO | 4 -
debian/contrib/jumpnbump_menu/jumpnbump_menu.glade | 870 ---------------------
debian/contrib/jumpnbump_menu/jumpnbump_menu.py | 230 ------
debian/contrib/jumpnbump_menu/po/Makefile | 22 -
debian/contrib/jumpnbump_menu/po/fr.po | 140 ----
.../contrib/jumpnbump_menu/po/jumpnbump-menu.pot | 134 ----
debian/control | 6 +-
debian/copyright | 11 +-
debian/jumpnbump.6 | 142 ----
debian/jumpnbump.desktop | 9 -
debian/jumpnbump.docs | 7 +-
debian/jumpnbump.install | 10 -
debian/jumpnbump.links | 10 +-
debian/jumpnbump.manpages | 1 -
debian/jumpnbump.menu | 3 -
debian/jumpnbump.png | Bin 3037 -> 0 bytes
debian/jumpnbump.xpm | 91 ---
debian/patches/NetPacket_buffer_size.patch | 23 -
debian/patches/as-needed.patch | 14 -
debian/patches/buildflags.patch | 56 --
debian/patches/do-not-link-libm.patch | 13 -
debian/patches/exit-fullscreen.patch | 43 -
debian/patches/format-security.patch | 14 -
debian/patches/handle-SDL-quit-event.patch | 21 -
debian/patches/no-springs.patch | 29 -
debian/patches/remove-XF86Config-information.patch | 19 -
debian/patches/remove-outdated-network-info.patch | 25 -
debian/patches/safe-temporary-files.patch | 86 --
debian/patches/series | 12 -
debian/patches/use-usr-share-games.patch | 18 -
debian/rules | 13 +-
37 files changed, 20 insertions(+), 2164 deletions(-)
diff --git a/debian/FAQ b/debian/FAQ
deleted file mode 100644
index 5858b3a..0000000
--- a/debian/FAQ
+++ /dev/null
@@ -1,38 +0,0 @@
-
-little faq for jump n bump on linux
-
-Q: -nosound option doesn't werk?
-A: we know, it will be fixed some day... (contributions welcome)
-
-Q: sound effects sound other than on the dos version!
-A: i know, the *plop* (if you kill some bunnies) comes too late (lagged)
- and sounds completely wrong too?
- there's sound effects missing if you are near the flies and if
- you jump into the water (the *splash* is missing)
-
-Q: i can't download this or that level. you not have enough bandwith?
-A: longislandman did a mirror try it from there
- http://jonatkins.org/jumpnbump/levels/
- he has got most of the levels i have (some are missing maybe)
-
-Q: can i do my own level? how?
-A: yes, see the manpage
-
-Q: do i need click each level one by one to save them? i want all of them?
-A: no just go into your jumpnbump directory into data there type
- wget --no-parent -r -l1 http://jumpbump.mine.nu/levels.bz2
- mv jumpbump.mine.nu/*.bz2 .
- rm -rf jumpbump.mine.nu
- bunzip *.bz2
- (oh well i didn't thest it :)
-
-Q: my menuselector looks other than yours?
-A: that's probably because i have tkstep8.0 and changed the first
- line in jbrun.tcl to (wish8.0)
-
-Q: i want to do a link to your homepage?
-A: find banners here http://jumpbump.mine.nu/jbbanner1.jpg
- here http://jumpbump.mine.nu/jbbanner2.jpg
- and here http://jumpbump.mine.nu/jbbanner3.jpg
- add something like this to your homepage:
- <a href="http://jumpbump.mine.nu"><img src="http://jumpbump.mine.nu/jbbanner1.jpg" width="325" height="50">
diff --git a/debian/changelog b/debian/changelog
index bf5d616..7afe2db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
-jumpnbump (1.51+dfsg1-3) UNRELEASED; urgency=medium
+jumpnbump (1.60-1) UNRELEASED; urgency=medium
+ [ Ansgar Burchardt ]
* Remove myself from Uploaders.
+ [ Fabian Greffrath ]
+ *
+
-- Ansgar Burchardt <ansgar at debian.org> Fri, 01 May 2015 00:57:20 +0200
jumpnbump (1.51+dfsg1-2) unstable; urgency=medium
diff --git a/debian/contrib/jumpnbump_menu/AUTHOR b/debian/contrib/jumpnbump_menu/AUTHOR
deleted file mode 100644
index 55402c4..0000000
--- a/debian/contrib/jumpnbump_menu/AUTHOR
+++ /dev/null
@@ -1 +0,0 @@
-Martin Willemoes Hansen <mwh at sysrq.dk>
diff --git a/debian/contrib/jumpnbump_menu/Makefile b/debian/contrib/jumpnbump_menu/Makefile
deleted file mode 100644
index a5dd0d6..0000000
--- a/debian/contrib/jumpnbump_menu/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-PREFIX ?= /usr
-
-all:
- $(MAKE) -C po all
-
-clean:
- $(MAKE) -C po clean
-
-install:
- install -o root -g root -m 644 jumpnbump_menu.glade $(PREFIX)/share/games/jumpnbump/
- install -o root -g root -m 755 jumpnbump_menu.py $(PREFIX)/games/jumpnbump-menu
-
- $(MAKE) -C po install
-
-uninstall:
- rm $(PREFIX)/share/games/jumpnbump/jumpnbump_menu.glade
- rm $(PREFIX)/games/jumpnbump-menu
-
- $(MAKE) -C po uninstall
-
diff --git a/debian/contrib/jumpnbump_menu/NEWS b/debian/contrib/jumpnbump_menu/NEWS
deleted file mode 100644
index a5d64eb..0000000
--- a/debian/contrib/jumpnbump_menu/NEWS
+++ /dev/null
@@ -1,27 +0,0 @@
-0.6
-===
-o A couple of HIG issues where fixed.
-
-0.5
-===
-o GUI fixes.
-
-0.4
-===
-o Level preview implemented
-
-0.3
-===
-o UI tweaks.
-o jumpbump.dat is default level
-o Path to levels and binary has changed.
-
-0.2
-===
-o Added Makefile for installing/uninstalling
-o Fixed mirror checkbox.
-o Does not have to be run from shell.
-
-0.1
-===
-o Initial release.
diff --git a/debian/contrib/jumpnbump_menu/README b/debian/contrib/jumpnbump_menu/README
deleted file mode 100644
index 46dfb88..0000000
--- a/debian/contrib/jumpnbump_menu/README
+++ /dev/null
@@ -1,16 +0,0 @@
-Edit the Makefile to your liking.
-Also check the variables in the top of the python script.
-
-Then run
-make install
-
-====
-reqs
-====
-
-Python-2.2.1
-pygtk-1.99.13
-ImageMagick-5.4.6
-jumpnbump-1.39
-
-At least thats what I have ;)
diff --git a/debian/contrib/jumpnbump_menu/TODO b/debian/contrib/jumpnbump_menu/TODO
deleted file mode 100644
index a47100d..0000000
--- a/debian/contrib/jumpnbump_menu/TODO
+++ /dev/null
@@ -1,4 +0,0 @@
-o Enable a kill server. (it tends to lock)
-o Refactor level preview
-o Make jumpbump.dat the default level
-
diff --git a/debian/contrib/jumpnbump_menu/jumpnbump_menu.glade b/debian/contrib/jumpnbump_menu/jumpnbump_menu.glade
deleted file mode 100644
index 5f793c0..0000000
--- a/debian/contrib/jumpnbump_menu/jumpnbump_menu.glade
+++ /dev/null
@@ -1,870 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkWindow" id="main">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Jump n Bump menu</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_CENTER</property>
- <property name="modal">False</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <signal name="delete_event" handler="quit" last_modification_time="Sun, 25 Aug 2002 14:53:02 GMT"/>
-
- <child>
- <widget class="GtkVBox" id="vbox1">
- <property name="border_width">5</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">5</property>
-
- <child>
- <widget class="GtkFrame" id="frame6">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
- <child>
- <widget class="GtkHBox" id="hbox8">
- <property name="border_width">5</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">5</property>
-
- <child>
- <widget class="GtkRadioButton" id="standalone">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_Standalone</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="standalone_mode" last_modification_time="Wed, 28 Aug 2002 12:46:13 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkRadioButton" id="fireworks">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_Fireworks</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <property name="group">standalone</property>
- <signal name="toggled" handler="fireworks_mode" last_modification_time="Wed, 28 Aug 2002 12:46:22 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkRadioButton" id="client">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_Client</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <property name="group">standalone</property>
- <signal name="toggled" handler="client_mode" last_modification_time="Wed, 28 Aug 2002 12:46:31 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkRadioButton" id="server">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Ser_ver</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <property name="group">standalone</property>
- <signal name="toggled" handler="server_mode" last_modification_time="Wed, 28 Aug 2002 12:46:41 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label15">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Mode</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox9">
- <property name="border_width">5</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">5</property>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTreeView" id="level_treeview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">True</property>
- <property name="rules_hint">False</property>
- <property name="reorderable">False</property>
- <property name="enable_search">True</property>
- <signal name="cursor_changed" handler="level_changed" last_modification_time="Tue, 03 Sep 2002 21:46:46 GMT"/>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkImage" id="image">
- <property name="width_request">200</property>
- <property name="height_request">128</property>
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkFrame" id="frame4">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
- <child>
- <widget class="GtkTable" id="table3">
- <property name="border_width">5</property>
- <property name="visible">True</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="homogeneous">False</property>
- <property name="row_spacing">5</property>
- <property name="column_spacing">5</property>
-
- <child>
- <widget class="GtkHBox" id="hbox7">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">5</property>
-
- <child>
- <widget class="GtkEntry" id="server_entry">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="tooltip" translatable="yes">Remote server ip/name</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
- <property name="activates_default">False</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkSpinButton" id="player_num">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="tooltip" translatable="yes">Your are player number?</property>
- <property name="can_focus">True</property>
- <property name="climb_rate">1</property>
- <property name="digits">0</property>
- <property name="numeric">False</property>
- <property name="update_policy">GTK_UPDATE_IF_VALID</property>
- <property name="snap_to_ticks">False</property>
- <property name="wrap">True</property>
- <property name="adjustment">2 1 3 1 10 10</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Number of remote clients:</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="mnemonic_widget">num_of_clients</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label6">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Rem_ote server:</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="mnemonic_widget">server_entry</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkAlignment" id="alignment8">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">1</property>
-
- <child>
- <widget class="GtkSpinButton" id="num_of_clients">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="climb_rate">1</property>
- <property name="digits">0</property>
- <property name="numeric">False</property>
- <property name="update_policy">GTK_UPDATE_IF_VALID</property>
- <property name="snap_to_ticks">False</property>
- <property name="wrap">True</property>
- <property name="adjustment">1 1 3 1 10 10</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label13">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Network</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox6">
- <property name="visible">True</property>
- <property name="homogeneous">True</property>
- <property name="spacing">5</property>
-
- <child>
- <widget class="GtkFrame" id="frame2">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
- <child>
- <widget class="GtkVBox" id="vbox3">
- <property name="border_width">5</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkCheckButton" id="fullscreen">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Fullscr_een</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkCheckButton" id="nogore">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">No _gore</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkCheckButton" id="double_res">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_Double resolution</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkCheckButton" id="mirror">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_Mirror level</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label11">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Graphics</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkFrame" id="frame3">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
- <child>
- <widget class="GtkVBox" id="vbox4">
- <property name="border_width">5</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkCheckButton" id="nosound">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">No so_und</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkCheckButton" id="noflies">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">No f_lies</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkCheckButton" id="withmusic">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_With music but without sound.</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label12">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Sound</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox1">
- <property name="border_width">5</property>
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkButton" id="button1">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-quit</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <signal name="clicked" handler="quit" last_modification_time="Sun, 25 Aug 2002 15:11:35 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="button2">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <signal name="clicked" handler="run" last_modification_time="Sun, 25 Aug 2002 15:16:22 GMT"/>
-
- <child>
- <widget class="GtkAlignment" id="alignment4">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox3">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
-
- <child>
- <widget class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="stock">gtk-apply</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Run</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="button3">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_About</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <signal name="clicked" handler="about" last_modification_time="Sun, 25 Aug 2002 15:16:30 GMT"/>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
-<widget class="GtkWindow" id="about">
- <property name="visible">True</property>
- <property name="title" translatable="yes">About</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_CENTER</property>
- <property name="modal">False</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
-
- <child>
- <widget class="GtkVBox" id="vbox2">
- <property name="border_width">5</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">5</property>
-
- <child>
- <widget class="GtkEntry" id="entry3">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes">Jump n Bump menu 0.6</property>
- <property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
- <property name="activates_default">False</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label8">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Copyright (c) 2002 Martin Willemoes Hansen <mwh at sysrq.dk>
-
-Jump n Bump starter.
-
-Gtk+ and Python rocks!!</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHSeparator" id="hseparator3">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox2">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkButton" id="button4">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <signal name="clicked" handler="ok" last_modification_time="Sun, 25 Aug 2002 16:03:43 GMT"/>
-
- <child>
- <widget class="GtkAlignment" id="alignment5">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox5">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
-
- <child>
- <widget class="GtkImage" id="image2">
- <property name="visible">True</property>
- <property name="stock">gtk-ok</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label9">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Ok</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
-</glade-interface>
diff --git a/debian/contrib/jumpnbump_menu/jumpnbump_menu.py b/debian/contrib/jumpnbump_menu/jumpnbump_menu.py
deleted file mode 100644
index 8c45d0c..0000000
--- a/debian/contrib/jumpnbump_menu/jumpnbump_menu.py
+++ /dev/null
@@ -1,230 +0,0 @@
-#!/usr/bin/env python
-
-# Author: Martin Willemoes Hansen
-# License: Gnu GPL
-
-# Next two lines are a workaround for Debian bug 163794
-import sys
-
-import pygtk
-pygtk.require('2.0')
-import gtk
-import gtk.glade
-import gtk.gdk
-import gobject
-import os
-import tempfile
-import shutil
-import gettext
-
-RESOURCE_DIR='/usr/share/games/jumpnbump'
-BINARY_DIR='/usr/games'
-
-application = "jumpnbump-menu"
-gettext.install(application)
-
-def populate_treeview():
- levels = []
- add_levels (levels, RESOURCE_DIR)
- add_levels (levels, os.path.expanduser("~/.jumpnbump/levels"))
-
- levels = sorted(levels, key=lambda level: level[0])
-
- COLUMN_LEVEL = 0
- COLUMN_DIR = 1
- store = gtk.ListStore (gobject.TYPE_STRING, gobject.TYPE_STRING)
-
- for level in levels:
- iter = store.append()
- store.set (iter, COLUMN_LEVEL, level[0], COLUMN_DIR, level[1])
-
- treeview.set_model (store)
-
- renderer = gtk.CellRendererText()
- treeview.append_column (gtk.TreeViewColumn (_('Level'), renderer, text=COLUMN_LEVEL))
-
-def add_levels(levels, dir):
- try:
- for file in os.listdir (dir):
- if (file.endswith ('.dat') or file.endswith ('.DAT')):
- levels.append ((file, dir))
- except OSError, err:
- print("%s not found (%s)." % (dir, str(err)))
-
-def standalone_mode (widget):
- disable_enable_level (1)
- disable_enable_server (0)
- num_clients.set_sensitive (0)
- nogore.set_sensitive (1)
- noflies.set_sensitive (1)
-
-def client_mode (widget):
- disable_enable_level (1)
- disable_enable_server (1)
- num_clients.set_sensitive (0)
- nogore.set_sensitive (1)
- noflies.set_sensitive (1)
-
-def server_mode (widget):
- disable_enable_level (1)
- disable_enable_server (0)
- num_clients.set_sensitive (1)
- nogore.set_sensitive (1)
- noflies.set_sensitive (1)
-
-def fireworks_mode (widget):
- disable_enable_level (0)
- disable_enable_server (0)
- nogore.set_sensitive (0)
- nogore.set_active (0)
- noflies.set_sensitive (0)
- noflies.set_active (0)
-
-def disable_enable_server (setting):
- server_entry.set_sensitive (setting)
- player_num.set_sensitive (setting)
-
-def disable_enable_level (setting):
- treeview.set_sensitive (setting)
- mirror.set_sensitive (setting)
- if (not setting):
- mirror.set_active (setting)
-
-def level_changed (widget):
- model, iter = treeview.get_selection().get_selected()
- global choosen_level
- choosen_level = '%s/%s' % (model.get_value (iter, 1), model.get_value (iter, 0))
- unpackdir = None
- try:
- unpackdir = tempfile.mkdtemp ("", "jumpnbump-menu-")
- os.chdir(unpackdir)
- os.spawnlp (os.P_WAIT, '/usr/lib/jumpnbump/unpack', 'unpack', choosen_level)
- os.spawnlp (os.P_WAIT, 'convert', 'convert', '-scale', '50%', 'level.pcx', 'level_scaled.pcx')
- os.spawnlp (os.P_WAIT, 'convert', 'convert', 'level_scaled.pcx', 'level.png')
- image.set_from_file ('level.png')
- except Exception, err:
- print err
- finally:
- if unpackdir != None:
- shutil.rmtree(unpackdir)
-
- image.show()
-
-def about (widget):
- global about_dialog
-
- if (not about_dialog):
- gui = gtk.glade.XML (gladefile, 'about', domain=application)
- about_dialog = gui.get_widget ('about')
- gui.signal_connect ('ok', about_close)
-
-def about_close (widget):
- global about_dialog
-
- about_dialog.destroy()
- about_dialog = None
-
-def run (widget):
- if (standalone.get_active()):
- execute (*get_level()+common_options())
- elif (fireworks.get_active()):
- execute ('-fireworks', *common_options())
- elif (client.get_active()):
- execute ('-player', str (player_num.get_value_as_int()),
- '-connect', server_entry.get_text(),
- *get_level() + common_options())
- else:
- execute ('-server', str (num_clients.get_value_as_int()),
- *get_level() + common_options())
-
-def get_level():
- level = []
- if (mirror.get_active()):
- level.append ('-mirror')
- else:
- level.append ('-dat')
- level.append (choosen_level)
-
- return level
-
-def common_options():
- options = []
-
- if (fullscreen.get_active()):
- options.append ('-fullscreen')
- if (nogore.get_active()):
- options.append ('-nogore')
- if (double_res.get_active()):
- options.append ('-scaleup')
- if (nosound.get_active()):
- options.append ('-nosound')
- if (noflies.get_active()):
- options.append ('-noflies')
- if (withmusic.get_active()):
- options.append ('-musicnosound')
- if (mirror.get_active()):
- options.append ('-mirror')
-
- return options
-
-def execute (*cmd):
- try:
- os.spawnl (os.P_NOWAIT, BINARY_DIR + '/jumpnbump', 'jumpnbump', *cmd)
- except Exception, err:
- print err
-
-def main():
- global gladefile
-
- global_gladefile = RESOURCE_DIR + '/jumpnbump_menu.glade'
- local_gladefile = './jumpnbump_menu.glade'
-
- if (os.access (global_gladefile, os.R_OK)):
- gladefile = global_gladefile
- del local_gladefile
- elif (os.access (local_gladefile, os.R_OK)):
- gladefile = local_gladefile
- del global_gladefile
- else:
- print 'Could not find the glade file'
- return 0
-
- gui = gtk.glade.XML (gladefile, 'main', domain=application)
-
- global about_dialog, choosen_level, standalone, fireworks, client, server, treeview, \
- mirror, num_clients, server_entry, player_num, fullscreen, \
- nogore, double_res, nosound, noflies, withmusic, image
-
- about_dialog = None
- choosen_level = ''
- standalone = gui.get_widget ('standalone')
- fireworks = gui.get_widget ('fireworks')
- client = gui.get_widget ('client')
- server = gui.get_widget ('server')
- treeview = gui.get_widget ('level_treeview')
- populate_treeview()
- mirror = gui.get_widget ('mirror')
- num_clients = gui.get_widget ('num_of_clients')
- server_entry = gui.get_widget ('server_entry')
- player_num = gui.get_widget ('player_num')
- fullscreen = gui.get_widget ('fullscreen')
- nogore = gui.get_widget ('nogore')
- double_res = gui.get_widget ('double_res')
- nosound = gui.get_widget ('nosound')
- noflies = gui.get_widget ('noflies')
- withmusic = gui.get_widget ('withmusic')
- image = gui.get_widget ('image')
-
- gui.signal_autoconnect ({'standalone_mode': standalone_mode,
- 'client_mode': client_mode,
- 'server_mode': server_mode,
- 'fireworks_mode': fireworks_mode,
- 'level_changed': level_changed,
- 'quit': lambda *args: gtk.main_quit(),
- 'run': run,
- 'about': about})
-
- gtk.main()
-
-if __name__ == '__main__':
- main()
diff --git a/debian/contrib/jumpnbump_menu/po/Makefile b/debian/contrib/jumpnbump_menu/po/Makefile
deleted file mode 100644
index a37871d..0000000
--- a/debian/contrib/jumpnbump_menu/po/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-
-LANGS = $(subst .po,,$(wildcard *.po))
-MOS = $(subst .po,.mo,$(wildcard *.po))
-
-all: $(MOS)
-
-clean:
- rm -f $(MOS)
-
-install:
- for lang in $(LANGS) ; do \
- install -D -o root -g root -m 0644 $$lang.mo $(PREFIX)/share/locale/$$lang/LC_MESSAGES/jumpnbump-menu.mo ; \
- done
-
-uninstall:
- for lang in $(LANGS) ; do \
- rm $(PREFIX)/share/locale/$$lang/LC_MESSAGES/jumpnbumo-menu.mo ; \
- done
-
-%.mo: %.po
- msgfmt -o $@ $<
-
diff --git a/debian/contrib/jumpnbump_menu/po/fr.po b/debian/contrib/jumpnbump_menu/po/fr.po
deleted file mode 100644
index cb4a95f..0000000
--- a/debian/contrib/jumpnbump_menu/po/fr.po
+++ /dev/null
@@ -1,140 +0,0 @@
-# French translations for jumpnbump package
-# Traductions françaises du paquet jumpnbump.
-# Copyright (C) 2009 Stéphane Blondon
-# This file is distributed under the same license as the PACKAGE package.
-# stephane <stephane.blondon at gmail.com>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: fr\n"
-"Report-Msgid-Bugs-To: stephane.blondon at gmail.com\n"
-"POT-Creation-Date: 2009-02-23 22:47+0100\n"
-"PO-Revision-Date: 2009-02-23 23:21+0100\n"
-"Last-Translator: stephane <stephane.blondon at gmail.com>\n"
-"Language-Team: French\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: jumpnbump-menu:46
-msgid "Level"
-msgstr "Niveau"
-
-#: jumpnbump_menu.glade:8
-msgid "Jump n Bump menu"
-msgstr "Jump n Bump menu"
-
-#: jumpnbump_menu.glade:41
-msgid "_Standalone"
-msgstr "Au_tonome"
-
-#: jumpnbump_menu.glade:60
-msgid "_Fireworks"
-msgstr "_Feu d'artifice"
-
-#: jumpnbump_menu.glade:80
-msgid "_Client"
-msgstr "_Client"
-
-#: jumpnbump_menu.glade:100
-msgid "Ser_ver"
-msgstr "Ser_veur"
-
-#: jumpnbump_menu.glade:121
-msgid "Mode"
-msgstr "Mode"
-
-#: jumpnbump_menu.glade:230
-msgid "Remote server ip/name"
-msgstr "Serveur distant ip/nom"
-
-#: jumpnbump_menu.glade:237 jumpnbump_menu.glade:742
-msgid "*"
-msgstr "*"
-
-#: jumpnbump_menu.glade:251
-msgid "Your are player number?"
-msgstr "Votre numéro de joueur"
-
-#: jumpnbump_menu.glade:279
-msgid "_Number of remote clients:"
-msgstr "_Nombre de clients distants"
-
-#: jumpnbump_menu.glade:304
-msgid "Rem_ote server:"
-msgstr "Serveur _distant"
-
-#: jumpnbump_menu.glade:364
-msgid "Network"
-msgstr "Réseau"
-
-#: jumpnbump_menu.glade:411
-msgid "Fullscr_een"
-msgstr "Pl_ein écran"
-
-#: jumpnbump_menu.glade:429
-msgid "No _gore"
-msgstr "Pas de san_g"
-
-#: jumpnbump_menu.glade:447
-msgid "_Double resolution"
-msgstr "Résolution dou_blée"
-
-#: jumpnbump_menu.glade:465
-msgid "_Mirror level"
-msgstr "Niveau en _miroir"
-
-#: jumpnbump_menu.glade:484
-msgid "Graphics"
-msgstr "Vidéo"
-
-#: jumpnbump_menu.glade:525
-msgid "No so_und"
-msgstr "Pas de _son"
-
-#: jumpnbump_menu.glade:543
-msgid "No f_lies"
-msgstr "Pas de mouc_hes"
-
-#: jumpnbump_menu.glade:561
-msgid "_With music but without sound."
-msgstr "Ave_c musique mais sans son"
-
-#: jumpnbump_menu.glade:580
-msgid "Sound"
-msgstr "Son"
-
-#: jumpnbump_menu.glade:671
-msgid "_Run"
-msgstr "_Jouer"
-
-#: jumpnbump_menu.glade:700
-msgid "_About"
-msgstr "_A propos"
-
-#: jumpnbump_menu.glade:719
-msgid "About"
-msgstr "À propos"
-
-#: jumpnbump_menu.glade:740
-msgid "Jump n Bump menu 0.6"
-msgstr "Jump n Bump menu 0.6"
-
-#: jumpnbump_menu.glade:755
-msgid ""
-"Copyright (c) 2002 Martin Willemoes Hansen <mwh at sysrq.dk>\n"
-"\n"
-"Jump n Bump starter.\n"
-"\n"
-"Gtk+ and Python rocks!!"
-msgstr ""
-"Copyright (c) 2002 Martin Willemoes Hansen <mwh at sysrq.dk>\n"
-"\n"
-"Lanceur pour Jump'n Bump.\n"
-"\n"
-"Gtk+ et Python, c'est bon!"
-
-#: jumpnbump_menu.glade:836
-msgid "_Ok"
-msgstr "_Ok"
diff --git a/debian/contrib/jumpnbump_menu/po/jumpnbump-menu.pot b/debian/contrib/jumpnbump_menu/po/jumpnbump-menu.pot
deleted file mode 100644
index 13a3f70..0000000
--- a/debian/contrib/jumpnbump_menu/po/jumpnbump-menu.pot
+++ /dev/null
@@ -1,134 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-23 22:47+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: jumpnbump-menu:46
-msgid "Level"
-msgstr ""
-
-#: jumpnbump_menu.glade:8
-msgid "Jump n Bump menu"
-msgstr ""
-
-#: jumpnbump_menu.glade:41
-msgid "_Standalone"
-msgstr ""
-
-#: jumpnbump_menu.glade:60
-msgid "_Fireworks"
-msgstr ""
-
-#: jumpnbump_menu.glade:80
-msgid "_Client"
-msgstr ""
-
-#: jumpnbump_menu.glade:100
-msgid "Ser_ver"
-msgstr ""
-
-#: jumpnbump_menu.glade:121
-msgid "Mode"
-msgstr ""
-
-#: jumpnbump_menu.glade:230
-msgid "Remote server ip/name"
-msgstr ""
-
-#: jumpnbump_menu.glade:237 jumpnbump_menu.glade:742
-msgid "*"
-msgstr ""
-
-#: jumpnbump_menu.glade:251
-msgid "Your are player number?"
-msgstr ""
-
-#: jumpnbump_menu.glade:279
-msgid "_Number of remote clients:"
-msgstr ""
-
-#: jumpnbump_menu.glade:304
-msgid "Rem_ote server:"
-msgstr ""
-
-#: jumpnbump_menu.glade:364
-msgid "Network"
-msgstr ""
-
-#: jumpnbump_menu.glade:411
-msgid "Fullscr_een"
-msgstr ""
-
-#: jumpnbump_menu.glade:429
-msgid "No _gore"
-msgstr ""
-
-#: jumpnbump_menu.glade:447
-msgid "_Double resolution"
-msgstr ""
-
-#: jumpnbump_menu.glade:465
-msgid "_Mirror level"
-msgstr ""
-
-#: jumpnbump_menu.glade:484
-msgid "Graphics"
-msgstr ""
-
-#: jumpnbump_menu.glade:525
-msgid "No so_und"
-msgstr ""
-
-#: jumpnbump_menu.glade:543
-msgid "No f_lies"
-msgstr ""
-
-#: jumpnbump_menu.glade:561
-msgid "_With music but without sound."
-msgstr ""
-
-#: jumpnbump_menu.glade:580
-msgid "Sound"
-msgstr ""
-
-#: jumpnbump_menu.glade:671
-msgid "_Run"
-msgstr ""
-
-#: jumpnbump_menu.glade:700
-msgid "_About"
-msgstr ""
-
-#: jumpnbump_menu.glade:719
-msgid "About"
-msgstr ""
-
-#: jumpnbump_menu.glade:740
-msgid "Jump n Bump menu 0.6"
-msgstr ""
-
-#: jumpnbump_menu.glade:755
-msgid ""
-"Copyright (c) 2002 Martin Willemoes Hansen <mwh at sysrq.dk>\n"
-"\n"
-"Jump n Bump starter.\n"
-"\n"
-"Gtk+ and Python rocks!!"
-msgstr ""
-
-#: jumpnbump_menu.glade:836
-msgid "_Ok"
-msgstr ""
diff --git a/debian/control b/debian/control
index 671ccc2..d9337e3 100644
--- a/debian/control
+++ b/debian/control
@@ -7,9 +7,9 @@ Uploaders:
Build-Depends:
debhelper (>= 9),
libbz2-dev,
- libsdl-mixer1.2-dev (>= 1.2.0-1.1),
- libsdl-net1.2-dev (>= 1.2.0-5.1),
- libsdl1.2-dev (>= 1.2.2-3.1),
+ libsdl2-mixer-dev (>> 2.0.1),
+ libsdl2-net-dev (>> 2.0.1),
+ libsdl2-dev (>> 2.0.4),
zlib1g-dev
Standards-Version: 3.9.5
Homepage: https://gitlab.com/LibreGames/jumpnbump/
diff --git a/debian/copyright b/debian/copyright
index 1631e65..f5efb2e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,21 +7,20 @@ Files: *
Copyright: 1998, Brainchild Design - http://brainchilddesign.com/
2001, "timecop" <timecop at japan.co.jp>
2001, Chuck Mason <cemason at users.sourceforge.net>
+ 2002, Martin Willemoes Hansen <mwh at sysrq.dk>
2002-2003, Florian Schulze <crow at icculus.org>
+ 2009, stephane <stephane.blondon at gmail.com>
+ 2015, Côme Chilliet <come at chilliet.eu>
+ 2017, Rémi Verschelde <remi at verschelde.fr>
License: GPL-2+
-Files: debian/contrib/jumpnbump_menu/*
-Copyright: Martin Willemoes Hansen <mwh at sysrq.dk>
-License: GPL-2+
-Comment: downloaded from http://www.sysrq.dk/applications
-
Files: debian/*
Copyright: 2001-2003, Ivo Timmermans <ivo at debian.org>
2004, Sam Hocevar (Debian packages) <sam+deb at zoy.org>
2005-2008, Francois Marier <francois at debian.org>
2008-2011, Ansgar Burchardt <ansgar at 43-1.org>
2011, Paul Wise <pabs at debian.org>
- 2014, Fabian Greffrath <fabian+debian at greffrath.com>
+ 2014-2017, Fabian Greffrath <fabian at debian.org>
License: GPL-2+
License: GPL-2+
diff --git a/debian/jumpnbump.6 b/debian/jumpnbump.6
deleted file mode 100644
index 01fe2e0..0000000
--- a/debian/jumpnbump.6
+++ /dev/null
@@ -1,142 +0,0 @@
-.TH jumpnbump 6 "June 4th, 2006"
-.SH NAME
-jumpnbump \- Cute multiplayer platform game with bunnies
-.SH SYNOPSIS
-jumpnbump \fR[ options... ]
-jumpnbump-menu
-.SH DESCRIPTION
-You, as a bunny, have to jump on your opponents to make them
-explode. It's a true multiplayer game, you can't play this alone.
-It has network support.
-.br
-Use the jumpnbump-menu command to launch a graphical menu allowing
-you to select the level and set any command line parameter.
-.SH OPTIONS
-.IP "-h"
-Print help.
-.IP "-v"
-Print version.
-.IP "-dat \fIlevelname\fR"
-Load \fIlevelname\fR and use it as the level for this game.
-.IP "-server \fIplayercount\fR"
-Start as server waiting for players.
-.IP "-connect \fIhostname\fR"
-Connect (using a network) to another person running jump'n'bump on
-\fIhostname\fR.
-.IP "-player \fInum\fR"
-Set main player to num (0-3). Needed for networking.
-.IP "-fireworks"
-Run the program in "screensaver" mode. This is useful with \-fullscreen.
-.IP "-fullscreen"
-Run jump'n'bump in fullscreen mode.
-.IP "-nosound"
-Play without sound.
-.IP "-nogore"
-Play without blood.
-.IP "-noflies"
-Disable flies.
-.IP "-mirror"
-Play with mirrored level.
-.IP "-scaleup"
-Play with doubled resolution (800x512).
-.IP "-musicnosound"
-Play with music but without sound.
-.SH USAGE
-The goal of the game is to jump on the other players. Each rabbit has
-three control keys.
-.IP "Player 1 (Dott)"
-Left - Left
-.br
-Right - Right
-.br
-Jump - Up
-.IP "Player 2 (Jiffy)"
-Left - A
-.br
-Right - D
-.br
-Jump - W
-.IP "Player 3 (Fizz)"
-Left - J
-.br
-Right - L
-.br
-Jump - I
-.IP "Player 4 (Mijji)"
-Left - 4
-.br
-Right - 5
-.br
-Jump - 8
-.IP "In the game"
-Turn on/off computer play (AI) of bunny 1 - 1
-.br
-Turn on/off computer play (AI) of bunny 2 - 2
-.br
-Turn on/off computer play (AI) of bunny 3 - 3
-.br
-Turn on/off computer play (AI) of bunny 4 - 4
-.br
-.SH SECRETS
-You can type these while in the game
- jetpack - you can fly
- pogostick - the bunnies keep jumping
- bunniesinspace - gravity is lower, you can jump higher
- lordoftheflies - the flies are attracted
- bloodisthickerthanwater - water turns to blood
-.SH ADD LEVELS
-You can add levels in ~/.jumpnbump/levels directory (create it if necessary).
-To see the added level, you have to restart jumpnbump-menu. The extension name
-for level is ".dat".
-.SH CREATE LEVELS
-There are two programs in /usr/lib/jumpnbump to help you make
-your own levels: pack and unpack.
-.IP pack
-.br
-/usr/lib/jumpnbump/pack \-o /tmp/newlevel.dat <file1> <file2> <file3> ...
-.br
-or you can just put all the files in a dir, cd to
-that dir and do
-.br
-/usr/lib/jumpnbump/pack \-o /tmp/newlevel.dat *
-.br
-and it will put all the files
-in the current dir inside the packfile. Don't try things like
-pack \-o stuff.dat ../file.c because it will add ../file.c as the filename in the packfile, which won't work.
-.br
-.IP unpack
-.br
-/usr/lib/jumpnbump/unpack level.dat
-.br
-will unpack it in the current directory.
-.IP gobpack
-.br
-With gobpack you can convert .gob files (which are sprites,
-described in /usr/share/doc/jumpnbump/gob.txt) into .pcx files
-which you can edit with The Gimp for example, then convert back
-to a .gob and use it in your own level.
-.br
-/usr/lib/jumpnbump/gobpack \-u font menu.pcx
-.br
-will unpack font.gob using the color palette from menu.pcx and
-write the files font.pcx font.txt. The other gob files should
-use level.pcx for the correct palette.
-.br
-/usr/lib/jumpnbump/gobpack font
-.br
-will generate font.gob from font.pcx and the specifications
-in font.txt. The .pcx files should be resaved with another
-program, as they are not packed and are thus very large.
-.SH AUTHORS
-.PP
-Chuck Mason <cemason at users.sourceforge.net>, Jon Atkins <jcatki at home.com>,
-Philippe Brochard <phil.brochard at wanadoo.fr>, G\[:u]rkan Seng\[:u]n <tarzeau at space.ch>,
-and "timecop" <timecop at japan.co.jp> are the authors of jump'n'bump.
-.PP
-This program is a UNIX port of the old DOS game by brainchilddesign.
-.PP
-This manual page was written for the Debian GNU/Linux distribution because
-the original program does not have a manual page.
-.PP
-This manual page was written by Joe Wreschnig <piman at sacredchao.net>, for the
-Debian GNU/Linux system (but may be used by others).
diff --git a/debian/jumpnbump.desktop b/debian/jumpnbump.desktop
deleted file mode 100644
index 893f76b..0000000
--- a/debian/jumpnbump.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Jump'n'Bump
-Comment=Jump on your opponents to make them explode
-Exec=jumpnbump-menu
-Icon=jumpnbump
-Terminal=false
-Type=Application
-Categories=Game;ActionGame;
-Keywords=cute;fluffy;little;rabbit;bunny;jump;hop;head;explode;blood;gore;fireworks;
diff --git a/debian/jumpnbump.docs b/debian/jumpnbump.docs
index 896fc80..05fe936 100644
--- a/debian/jumpnbump.docs
+++ b/debian/jumpnbump.docs
@@ -1,5 +1,2 @@
-debian/FAQ
-README
-gob.txt
-LINKS
-source.txt
+README*
+docs/*
diff --git a/debian/jumpnbump.install b/debian/jumpnbump.install
deleted file mode 100644
index 5e56dd3..0000000
--- a/debian/jumpnbump.install
+++ /dev/null
@@ -1,10 +0,0 @@
-data/jumpbump.dat usr/share/games/jumpnbump
-debian/jumpnbump.desktop usr/share/applications
-debian/jumpnbump.png usr/share/icons/hicolor/128x128/apps
-debian/jumpnbump.xpm usr/share/pixmaps
-gobpack usr/lib/jumpnbump
-jnbpack usr/lib/jumpnbump
-jnbunpack usr/lib/jumpnbump
-jumpnbump usr/games
-jumpnbump.fbcon usr/games
-jumpnbump.svgalib usr/games
diff --git a/debian/jumpnbump.links b/debian/jumpnbump.links
index 44c05af..4257f1f 100644
--- a/debian/jumpnbump.links
+++ b/debian/jumpnbump.links
@@ -1,8 +1,4 @@
-usr/lib/jumpnbump/jnbpack usr/lib/jumpnbump/pack
-usr/lib/jumpnbump/jnbunpack usr/lib/jumpnbump/unpack
-usr/share/man/man6/jumpnbump.6.gz usr/share/man/man6/jumpnbump.svgalib.6.gz
+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
-usr/share/man/man6/jumpnbump.6.gz usr/share/man/man6/jumpnbump.fbcon.6.gz
-usr/share/man/man6/jumpnbump.6.gz usr/share/man/man6/jumpnbump-pack.6.gz
-usr/share/man/man6/jumpnbump.6.gz usr/share/man/man6/jumpnbump-unpack.6.gz
-usr/share/man/man6/jumpnbump.6.gz usr/share/man/man6/jumpnbump-gobpack.6.gz
diff --git a/debian/jumpnbump.manpages b/debian/jumpnbump.manpages
deleted file mode 100644
index b394a94..0000000
--- a/debian/jumpnbump.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/jumpnbump.6
diff --git a/debian/jumpnbump.menu b/debian/jumpnbump.menu
deleted file mode 100644
index 02c1e8d..0000000
--- a/debian/jumpnbump.menu
+++ /dev/null
@@ -1,3 +0,0 @@
-?package(jumpnbump):needs="X11" section="Games/Action" \
- title="Jump'n'Bump" command="/usr/games/jumpnbump-menu" \
- icon="/usr/share/pixmaps/jumpnbump.xpm"
diff --git a/debian/jumpnbump.png b/debian/jumpnbump.png
deleted file mode 100644
index 4c5232b..0000000
Binary files a/debian/jumpnbump.png and /dev/null differ
diff --git a/debian/jumpnbump.xpm b/debian/jumpnbump.xpm
deleted file mode 100644
index 6247206..0000000
--- a/debian/jumpnbump.xpm
+++ /dev/null
@@ -1,91 +0,0 @@
-/* XPM */
-static char * jumpnbump_xpm[] = {
-"32 32 56 1",
-" c None",
-". c #999998",
-"+ c #746D6A",
-"@ c #8B8A89",
-"# c #767676",
-"$ c #ABA7A5",
-"% c #585757",
-"& c #504C4C",
-"* c #C8C1BB",
-"= c #434143",
-"- c #6D6D6B",
-"; c #B8B5B2",
-"> c #E0DDDB",
-", c #FFFFFF",
-"' c #EAB68A",
-") c #EFE8E4",
-"! c #FDA744",
-"~ c #DAB69E",
-"{ c #F68627",
-"] c #EF9A47",
-"^ c #DCCEC6",
-"/ c #FDB055",
-"( c #C86917",
-"_ c #6A4E3A",
-": c #CA7C30",
-"< c #9B4E10",
-"[ c #5E3A1E",
-"} c #F97B13",
-"| c #A05618",
-"1 c #DB8434",
-"2 c #E28A32",
-"3 c #B8590D",
-"4 c #EC7818",
-"5 c #E6A86C",
-"6 c #864C1E",
-"7 c #2A262A",
-"8 c #F8DCC2",
-"9 c #261814",
-"0 c #967A60",
-"a c #F6993C",
-"b c #AE9276",
-"c c #894209",
-"d c #3A363A",
-"e c #B83A18",
-"f c #733403",
-"g c #823E06",
-"h c #C2610F",
-"i c #AB530B",
-"j c #F6C29E",
-"k c #D6A67A",
-"l c #661834",
-"m c #5E2E06",
-"n c #6B3203",
-"o c #B66016",
-"p c #846A54",
-"q c #8B6241",
-" ",
-" ",
-" .. ",
-" + @@# ",
-" .$ %& @## ",
-" $.* @%= @-. ",
-" $;; $#.%& @#@ ",
-" >>;,,';@;%+. at .. ",
-" .,)*!~**,&##@@ ",
-" {!!!]>))'>)^/%%#@@(_ ",
-" :!!!/$),),)*]<=#@.#[{}{ ",
-" |1//),,,,,)23&%@.%+-4{{{{{ ",
-" |//,,,,,,,567&#@#%@4{4{{{ ",
-" <:5)^))),,8_9&##@-03(}aa ",
-" <((}44b#,.,,,8c9d%--#efgha ",
-" i4}}}41j;,,,^|99dd&_e1a]!a ",
-" <(}}4}4a),>k3llm_1a!!!!!! ",
-" fg(}}}}{]k(3<(a!!!!!!a!!! ",
-" nmn<3(3<|<(a/!!!!!!!!!!!a! ",
-" nnnnnfmnncha!!/!!!!!!!aaaa ",
-" nnnnnnnnng(2/!/!!!!!!]:0 ",
-" nnnmnnnnn<(32///!!2oop- ",
-" nnnfnnmnn3(ii]a1oiiii+-- ",
-" mnnnnnnnf3h3i(oiiiii|##++ ",
-" nnnnnnfh(hiiiiiiiq+--+-- ",
-" nnnfnghho3ii|iq-++#+### ",
-" nnnng(h3ii|q++--#--- ",
-" nnchhhq+----- ",
-" n<3 -+-## ",
-" ",
-" ",
-" "};
diff --git a/debian/patches/NetPacket_buffer_size.patch b/debian/patches/NetPacket_buffer_size.patch
deleted file mode 100644
index 7356401..0000000
--- a/debian/patches/NetPacket_buffer_size.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Subject: Fix NetPacket buffer size by adapting its member types
-Author: Fabian Greffrath <fabian+debian at greffrath.com>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=762698
-
---- a/main.c
-+++ b/main.c
-@@ -273,11 +273,11 @@ NetInfo net_info[JNB_MAX_PLAYERS];
-
- typedef struct
- {
-- unsigned long cmd;
-- long arg;
-- long arg2;
-- long arg3;
-- long arg4;
-+ Uint32 cmd;
-+ Sint32 arg;
-+ Sint32 arg2;
-+ Sint32 arg3;
-+ Sint32 arg4;
- } NetPacket;
-
- #define NETPKTBUFSIZE (4 + 4 + 4 + 4 + 4)
diff --git a/debian/patches/as-needed.patch b/debian/patches/as-needed.patch
deleted file mode 100644
index bc19cb0..0000000
--- a/debian/patches/as-needed.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Fix order of parameters passed to ld. Fixes FTBFS when linking
- with --as-needed.
-Author: Ilya Barygin <barygin at gmail.com>
---- a/Makefile
-+++ b/Makefile
-@@ -23,7 +23,7 @@ $(MODIFY_TARGET): globals.h
- cd modify && make
-
- $(TARGET): $(OBJS) $(SDL_TARGET) data globals.h
-- $(CC) -o $(TARGET) $(OBJS) $(LIBS) $(SDL_TARGET)
-+ $(CC) -o $(TARGET) $(OBJS) $(SDL_TARGET) $(LIBS)
-
- $(OBJS): globals.h
-
diff --git a/debian/patches/buildflags.patch b/debian/patches/buildflags.patch
deleted file mode 100644
index e010cfb..0000000
--- a/debian/patches/buildflags.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Subject: Adhere build flags to enable compilation with hardening flags
-Author: Fabian Greffrath <fabian+debian at greffrath.com>
-
---- a/Makefile
-+++ b/Makefile
-@@ -1,6 +1,6 @@
- SDL_CFLAGS = `sdl-config --cflags`
- SDL_LIBS = `sdl-config --libs`
--CFLAGS = -Wall -O2 -ffast-math -funroll-loops -Dstricmp=strcasecmp \
-+CFLAGS += -Wall -O2 -ffast-math -funroll-loops -Dstricmp=strcasecmp \
- -Dstrnicmp=strncasecmp -DUSE_SDL -DNDEBUG -I. $(SDL_CFLAGS) \
- -DUSE_NET -DZLIB_SUPPORT -DBZLIB_SUPPORT
- LIBS = -lm $(SDL_LIBS) -lSDL_mixer -lSDL_net -lbz2 -lz
-@@ -23,7 +23,7 @@ $(MODIFY_TARGET): globals.h
- cd modify && make
-
- $(TARGET): $(OBJS) $(SDL_TARGET) data globals.h
-- $(CC) -o $(TARGET) $(OBJS) $(SDL_TARGET) $(LIBS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET) $(OBJS) $(SDL_TARGET) $(LIBS)
-
- $(OBJS): globals.h
-
---- a/modify/Makefile
-+++ b/modify/Makefile
-@@ -1,4 +1,4 @@
--CFLAGS = -Wall -ansi -pedantic -O2 -ffast-math -funroll-loops \
-+CFLAGS += $(CPPFLAGS) -Wall -ansi -pedantic -O2 -ffast-math -funroll-loops \
- -Dstricmp=strcasecmp -Dstrnicmp=strncasecmp -DNDEBUG \
- -I. -I.. -DUSE_NET -D_BSD_SOURCE
- LIBS =
-@@ -9,13 +9,13 @@ TARGETS = ../gobpack ../jnbpack ../jnbun
- all: $(TARGETS)
-
- ../gobpack: gobpack.c
-- $(CC) $(CFLAGS) -o ../gobpack $(LIBS) gobpack.c
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o ../gobpack $(LIBS) gobpack.c
-
- ../jnbpack: jnbpack.c
-- $(CC) $(CFLAGS) -o ../jnbpack $(LIBS) jnbpack.c
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o ../jnbpack $(LIBS) jnbpack.c
-
- ../jnbunpack: jnbunpack.c
-- $(CC) $(CFLAGS) -o ../jnbunpack $(LIBS) jnbunpack.c
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o ../jnbunpack $(LIBS) jnbunpack.c
-
- clean:
- rm -f $(TARGETS) $(OBJS)
---- a/sdl/Makefile
-+++ b/sdl/Makefile
-@@ -1,5 +1,5 @@
- SDL_CFLAGS = `sdl-config --cflags`
--CFLAGS = -Wall -ansi -pedantic -O2 -ffast-math -funroll-loops \
-+CFLAGS += -Wall -ansi -pedantic -O2 -ffast-math -funroll-loops \
- -Dstricmp=strcasecmp -Dstrnicmp=strncasecmp -DNDEBUG \
- -I. -I.. $(SDL_CFLAGS) -DUSE_SDL -DUSE_NET
-
diff --git a/debian/patches/do-not-link-libm.patch b/debian/patches/do-not-link-libm.patch
deleted file mode 100644
index c3d91ec..0000000
--- a/debian/patches/do-not-link-libm.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Subject: Do not link libm
-
---- a/modify/Makefile
-+++ b/modify/Makefile
-@@ -1,7 +1,7 @@
- CFLAGS = -Wall -ansi -pedantic -O2 -ffast-math -funroll-loops \
- -Dstricmp=strcasecmp -Dstrnicmp=strncasecmp -DNDEBUG \
- -I. -I.. -DUSE_NET -D_BSD_SOURCE
--LIBS = -lm
-+LIBS =
- SRCS = gobpack.c jnbpack.c jnbunpack.c
- OBJS = gobpack.o jnbpack.o jnbunpack.o
- TARGETS = ../gobpack ../jnbpack ../jnbunpack
diff --git a/debian/patches/exit-fullscreen.patch b/debian/patches/exit-fullscreen.patch
deleted file mode 100644
index 935417e..0000000
--- a/debian/patches/exit-fullscreen.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Subject: Exit fullscreen mode on quit
-From: Dan Carpenter <error27 at gmail.com>
-Date: Tue, 17 Jan 2006 08:37:51 -0800
-
-See http://bugs.debian.org/338705
-
---- a/globals.pre
-+++ b/globals.pre
-@@ -344,6 +344,7 @@ void register_mask(void *pixels);
- #ifdef USE_SDL
- /* long filelength(int handle); */
- void fs_toggle();
-+void exit_fullscreen();
- int intr_sysupdate();
- #endif
-
---- a/main.c
-+++ b/main.c
-@@ -3375,6 +3375,8 @@ void deinit_program(void)
- __dpmi_regs regs;
- #endif
-
-+ exit_fullscreen();
-+
- dj_stop();
- dj_free_mod(MOD_MENU);
- dj_free_mod(MOD_GAME);
---- a/sdl/gfx.c
-+++ b/sdl/gfx.c
-@@ -227,6 +227,13 @@ void fs_toggle()
- }
-
-
-+void exit_fullscreen()
-+{
-+ if (fullscreen)
-+ fs_toggle();
-+}
-+
-+
- void wait_vrt(int mix)
- {
- return;
diff --git a/debian/patches/format-security.patch b/debian/patches/format-security.patch
deleted file mode 100644
index 4506b74..0000000
--- a/debian/patches/format-security.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Subject: Fix format-security vulnerability
-Author: Fabian Greffrath <fabian+debian at greffrath.com>
-
---- a/main.c
-+++ b/main.c
-@@ -3400,7 +3400,7 @@ void deinit_program(void)
- #endif
-
- if (main_info.error_str[0] != 0) {
-- printf(main_info.error_str);
-+ printf("%s", main_info.error_str);
- #ifdef _MSC_VER
- MessageBox(0, main_info.error_str, "Jump'n'Bump", 0);
- #endif
diff --git a/debian/patches/handle-SDL-quit-event.patch b/debian/patches/handle-SDL-quit-event.patch
deleted file mode 100644
index d542c37..0000000
--- a/debian/patches/handle-SDL-quit-event.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Subject: Handle SQL quit event
-From: Ansgar Burchardt <ansgar at 43-1.org>
-Date: Sat Dec 13 15:00:01 2008 +0100
-
-This patch makes Jump'n'bump quit when pressing the close button or
-using other means to ask Jump'n'bump to quit (e.g. Alt+F4).
-
-Closes: #487333
-
---- a/sdl/interrpt.c
-+++ b/sdl/interrpt.c
-@@ -419,6 +419,9 @@ int intr_sysupdate()
- break;
- }
- break;
-+ case SDL_QUIT:
-+ deinit_program();
-+ break;
- default:
- break;
- }
diff --git a/debian/patches/no-springs.patch b/debian/patches/no-springs.patch
deleted file mode 100644
index e0b232d..0000000
--- a/debian/patches/no-springs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 4a0a965547b52afc953d9bd11ab059f543551459 Mon Sep 17 00:00:00 2001
-From: Fabian Greffrath <fabian at greffrath.com>
-Date: Tue, 16 Sep 2014 19:02:37 +0200
-Subject: [PATCH] fix rabbit disappearing in upper left corner
-
-aka "undesired springs added above the screen"
-
-If the bunny jumps out of the screen, its
-y-coordinate becomes negative. Thus, the array that is checked for the
-position of the objects on the map overflows and returns some bogus,
-e.g. that there are springs whereas there aren't. This patch
-checks for the y-coordinate and caps it at zero.
-
-c.f. https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=370650
----
- main.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/main.c
-+++ b/main.c
-@@ -2096,6 +2096,8 @@ void steer_players(void)
-
- s1 = (player[c1].x >> 16);
- s2 = (player[c1].y >> 16);
-+ if (s2 < 0)
-+ s2 = 0;
- if (GET_BAN_MAP_XY((s1 + 8), (s2 + 15)) == BAN_SPRING || ((GET_BAN_MAP_XY(s1, (s2 + 15)) == BAN_SPRING && GET_BAN_MAP_XY((s1 + 15), (s2 + 15)) != BAN_SOLID) || (GET_BAN_MAP_XY(s1, (s2 + 15)) != BAN_SOLID && GET_BAN_MAP_XY((s1 + 15), (s2 + 15)) == BAN_SPRING))) {
- player[c1].y = ((player[c1].y >> 16) & 0xfff0) << 16;
- player[c1].y_add = -400000L;
diff --git a/debian/patches/remove-XF86Config-information.patch b/debian/patches/remove-XF86Config-information.patch
deleted file mode 100644
index 2e11fd8..0000000
--- a/debian/patches/remove-XF86Config-information.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Subject: Remove modeline for XF86Config-4 from README
-
---- a/README
-+++ b/README
-@@ -24,14 +24,6 @@ Thanks to ben for making patches to run
- Thanks to ivo for doing debian packages.
-
- f10 change between windowed/fullscreen mode
--(see the XF86Config-4, copy n paste the modeline 400x256
--then add the mode "400x256" to whatever bpp you have by default, restart x)
--example: add following line in Section "Monitor" of your
--/etc/X11/XF86Config (or XF86Config-4)
--Modeline "400x256" 22.00 400 416 480 504 256 259 262 269 doublescan
--then in Section "Screen" if your DefaultDepth is 24 do be sure you have
--something like:
--Modes "1024x768" "640x480" "512x384" "400x256" "320x240"
- esc/f12 exit
-
- For compilation you will need:
diff --git a/debian/patches/remove-outdated-network-info.patch b/debian/patches/remove-outdated-network-info.patch
deleted file mode 100644
index e955be0..0000000
--- a/debian/patches/remove-outdated-network-info.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Subject: Remove outdated network information from README
-From: Francois Marier <francois at debian.org>
-Date: Sun, 26 Jun 2005 13:02:29 -0400
-
-See http://bugs.debian.org/314221.
-
---- a/README
-+++ b/README
-@@ -44,16 +44,6 @@ which you can start with: jumpnbump -dat
- there's a screensaver mode as well:
- jumpnbump -fireworks -fullscreen
-
--Network play works like this, oh well here's an example
--Player 1: jumpnbump -port 7777 -net 0 ip_or_hostname_of_player2 port_of_player2
--Player 2: jumpnbump -port 7777 -net 1 ip_or_hostname_of_player1 port_of_player1
--just take port 7777 for all ports and hope it's open and you aren't
--firewalled (it's all udp!)
--You can add -net 3 and -net 4 for 3rd and 4th player, and be sure.
--All the players use the same -dat level.dat
--(the scoreboards is different on each player and strange things like
--that, but longislandman is working on it (isn't it? longislandman? you alive?))
--
- You can find the original dos game (which runs in dos/win9x (dosextender!))
- at http://www.brainchilddesign.com/games/jumpnbump/index.html
-
diff --git a/debian/patches/safe-temporary-files.patch b/debian/patches/safe-temporary-files.patch
deleted file mode 100644
index e1e13c6..0000000
--- a/debian/patches/safe-temporary-files.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Subject: Handle temporary files in a safe way
-From: Ansgar Burchardt <ansgar at 43-1.org>
-Date: Mon, 29 Sep 2008 22:01:59 +0200
-
-See http://bugs.debian.org/500611.
-
---- a/modify/jnbunpack.c
-+++ b/modify/jnbunpack.c
-@@ -23,6 +23,7 @@
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-+#include <errno.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <fcntl.h>
-@@ -83,8 +84,13 @@ int main(int argc, char **argv)
- memset(filename, 0, sizeof(filename));
- strncpy(filename, datafile[i].filename, 12);
- printf("Extracting %s ", filename);
-+ fflush(stdout);
-
-- outfd = open(filename, O_RDWR | O_CREAT | O_BINARY, 0644);
-+ if (unlink(filename) == -1 && errno != ENOENT) {
-+ perror("cannot unlink file");
-+ exit(1);
-+ }
-+ outfd = open(filename, O_RDWR | O_CREAT | O_EXCL | O_BINARY, 0644);
- if (!outfd) {
- perror("cant open file");
- exit(1);
---- a/sdl/sound.c
-+++ b/sdl/sound.c
-@@ -23,6 +23,8 @@
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-+#include <stdlib.h>
-+#include <string.h>
- #include "globals.h"
- #include <limits.h>
- #ifndef _MSC_VER
-@@ -463,11 +465,8 @@ char dj_ready_mod(char mod_num)
- {
- #ifndef NO_SDL_MIXER
- FILE *tmp;
--# if ((defined _MSC_VER) || (defined __MINGW32__))
-- char filename[] = "jnb.tmpmusic.mod";
--# else
-- char filename[] = "/tmp/jnb.tmpmusic.mod";
--# endif
-+ int tmp_fd;
-+ char* filename;
- unsigned char *fp;
- int len;
-
-@@ -506,15 +505,24 @@ char dj_ready_mod(char mod_num)
- return 0;
- }
-
-- tmp = fopen(filename, "wb");
-- if (tmp) {
-- fwrite(fp, len, 1, tmp);
-- fflush(tmp);
-- fclose(tmp);
-+ filename = strdup("/tmp/jumpnbump.mod.XXXXXX");
-+ tmp_fd = mkstemp(filename);
-+ if (tmp_fd == -1) {
-+ free(filename);
-+ return 0;
-+ }
-+ tmp = fdopen(tmp_fd, "wb");
-+ if (!tmp) {
-+ free(filename);
-+ return 0;
- }
-+ fwrite(fp, len, 1, tmp);
-+ fflush(tmp);
-+ fclose(tmp);
-
- current_music = Mix_LoadMUS(filename);
- unlink(filename);
-+ free(filename);
- if (current_music == NULL) {
- fprintf(stderr, "Couldn't load music: %s\n", SDL_GetError());
- return 0;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 4dbefc7..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,12 +0,0 @@
-exit-fullscreen.patch
-safe-temporary-files.patch
-use-usr-share-games.patch
-do-not-link-libm.patch
-remove-outdated-network-info.patch
-remove-XF86Config-information.patch
-handle-SDL-quit-event.patch
-no-springs.patch
-as-needed.patch
-buildflags.patch
-format-security.patch
-NetPacket_buffer_size.patch
diff --git a/debian/patches/use-usr-share-games.patch b/debian/patches/use-usr-share-games.patch
deleted file mode 100644
index cd25741..0000000
--- a/debian/patches/use-usr-share-games.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Subject: Use /usr/share/games/jumpnbump
-From: Ivo Timmermans <ivo at debian.org>
-Date: Wed, 9 Oct 2002 21:01:32 +0200
-
-Make jumpnbump use /usr/share/games/jumpnbump instead of
-/usr/local/share/jumpnbump.
-
---- a/globals.pre
-+++ b/globals.pre
-@@ -168,7 +168,7 @@ extern int ai[JNB_MAX_PLAYERS];
- #elif _WIN32
- #define DATA_PATH "data/jumpbump.dat"
- #else
--#define DATA_PATH "%%PREFIX%%/share/jumpnbump/jumpbump.dat"
-+#define DATA_PATH "%%PREFIX%%/share/games/jumpnbump/jumpbump.dat"
- #endif
- #endif
-
diff --git a/debian/rules b/debian/rules
index 88598e1..290f875 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,10 @@
#!/usr/bin/make -f
-debian/jumpnbump.png: sdl/jumpnbump128.xpm
- convert $^ $@
-
%:
dh $@
override_dh_auto_build:
- dh_auto_build -- PREFIX=/usr all data
- $(MAKE) -C debian/contrib/jumpnbump_menu PREFIX=/usr all
-
-override_dh_auto_clean:
- dh_auto_clean
- $(MAKE) -C debian/contrib/jumpnbump_menu clean
+ dh_auto_build -- PREFIX=/usr BINDIR=/usr/games GAMEDATADIR=/usr/share/games
override_dh_auto_install:
- dh_installdirs --all usr/games usr/share/games/jumpnbump
- $(MAKE) -C debian/contrib/jumpnbump_menu PREFIX=$(CURDIR)/debian/jumpnbump/usr install
+ dh_auto_install -- 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
More information about the Pkg-games-commits
mailing list