* Replaced debian dir with 'pinball_0.3.1-7.diff.gz'

debian/changelog

@@ -1,14 +1,114 @@
+pinball (0.3.1-7) unstable; urgency=low
+
+  * Acknowledge NMU from Matthias Klose <[email protected]>.
+  * Fix menu entry (Closes: #386409)
+  * Update watch file for new sourceforge support.
+
+ -- Jochen Friedrich <[email protected]>  Wed, 23 Nov 2006 12:30:53 +0100
+
+pinball (0.3.1-6.1) unstable; urgency=high
+
+  * NMU.
+  * pinball-dev: Fix libstdc++-dev dependency.
+
+ -- Matthias Klose <[email protected]>  Mon,  4 Sep 2006 02:20:07 +0200
+
+pinball (0.3.1-6) unstable; urgency=high
+
+  * Avoid loading levels and compiled plugins from user-controllable
+    locations. Patch from Steve Kemp ([email protected])
+    [CVE-2006-2196]
+  * Bump Standards-Version to 3.7.2 (No changes)
+  * Changing depends on data to allow binary NMUs (Closes: #373141)
+  * Removing libasound2-dev dependency for FreeBSD (Closes: #327688)
+  * Updated auto* and libtool (Closes: #342261)
+  * Updated watch file.
+
+ -- Jochen Friedrich <[email protected]>  Fri, 16 Jun 2006 14:14:07 +0200
+
+pinball (0.3.1-5) unstable; urgency=low
+
+  * Fix CXX transition (Closes: #334167)
+    Thanks to Frank Lichtenheld <[email protected]>.
+
+ -- Jochen Friedrich <[email protected]>  Wed, 19 Oct 2005 14:54:10 +0200
+
+pinball (0.3.1-4) unstable; urgency=low
+
+  * aalib1 -> libaa1 transition (Closes: #320878)
+  * Install menu icon properly (Closes: #275636)
+    Thanks to Mark Purcell <[email protected]> for the patch.
+  * Bumped standards version to 3.6.2.
+
+ -- Jochen Friedrich <[email protected]>  Tue,  2 Aug 2005 18:58:45 +0200
+
+pinball (0.3.1-3) unstable; urgency=low
+
+  * Add "libtiff4-dev" to build dependencies to force recompile
+    against 3.6.1 with changed API.
+  * Included watch file.
+
+ -- Jochen Friedrich <[email protected]>  Fri, 30 Jul 2004 20:17:35 +0200
+
+pinball (0.3.1-2) unstable; urgency=low
+
+  * Add "aalib1-dev" and "libasound2-dev" to the build dependencies
+    Thanks to Helge Kreutzmann for testing this and pointing me
+    to #240120 (Closes: #239696)
+
+ -- Jochen Friedrich <[email protected]>  Sun,  4 Apr 2004 19:44:27 +0200
+
 pinball (0.3.1-1) unstable; urgency=low
 
-  * debian goes mainstream
+  * New upstream release
+    (Closes: #150140, #180957, #230733, #149858)
+  * New maintainer (Closes: #236233)
+  * Cleaned up debian dir (Closes: #230732)
+  * Fixed build dependencies (Closes: #180957)
+  * Acknowledge NMUs (Closes: #230741, #175896, #172599, #230053)
+    (Also closes: #210505, #212219)
+
+ -- Jochen Friedrich <[email protected]>  Fri, 26 Mar 2004 00:37:42 +0100
+
+pinball (0.3.1-0.2) unstable; urgency=low
+
+  * Non-maintainer upload (sponsored upload of 0.3.1-0.1 with changes)
+  * Add xlibmesa-gl-dev as preferred alternative for libgl-dev
+  * Lintian stuff:
+    - Quote strings in debian/pinball.menu
+    - Bump debhelper build-dependency to 4.0.0 to match debian/compat
+  * Remove config.log in clean target
+
+ -- Matt Zimmerman <[email protected]>  Fri, 12 Mar 2004 18:50:15 -0800
+
+pinball (0.3.1-0.1) unstable; urgency=low
+
+  * Non-Maintainer Upload.
+  * New upstream version (Closes: #172599) which starts on alpha
+    (Closes: #230053) and fixes menu display (Closes: #212219).
+  * Now includes man page (Closes: #230741).
+  * Recompiled with gcc 3.3 (Closes: #210505).
+  * Removed "The" and "." in short description to make linda/lintian happy.
+  * There are now two tables/levels. Updated the description.
+  * Support noopt for DEB_BUILD_OPTIONS and make "-g" the default.
+  * Compile with -mieee on alpha, so it now runs on this platform as well.
+    This Closes: #175896.
+  * Create highscore-directories in /var/games/pinball; this does not work
+    yet, unfortunately.
+  * Removed the .ex-files in the debian/-directory, Closes: FIXME.
+  * There are now binary dependent libs for each table which are therefore
+    in pinball, so that pinball-data remains arch=all. This is an intrim
+    solution, which should be fixed on the next upload by either integrating
+    the tables into the main packages, or switching the -data package into
+    arch=any.
 
- -- Philippe COVAL <[email protected]>  Mon, 19 Jan 2004 14:22:43 +0100
+ -- Helge Kreutzmann <[email protected]>  Mon,  16 Feb 2004 20:41:10 +0100
 
-pinball (0.3.0-1) unstable; urgency=low
+pinball (0.0.7-1) unstable; urgency=low
 
-  * New version
+  * New Release.
 
- -- Debian User <dhollan@free.fr>  Sun, 29 Jun 2003 19:30:04 +0200
+ -- Didier Dhollande <dholland@free.fr>  Sun, 16 Jun 2002 19:38:07 +0200
 
 pinball (0.0.6-2) unstable; urgency=low
 

debian/control

@@ -1,30 +1,30 @@
 Source: pinball
 Section: games
 Priority: optional
-Maintainer: Yann Dirson <[email protected]>
-Build-Depends: debhelper (>> 3.0.0), libgl-dev, libpng-dev, libsdl1.2-dev
-Standards-Version: 3.5.2
+Maintainer: Jochen Friedrich <[email protected]>
+Build-Depends: debhelper (>> 4.0.0), xlibmesa-gl-dev | libgl-dev, libpng-dev, libsdl1.2-dev, glutg3-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libogg-dev, libvorbis-dev, sp, sgmlspl, docbook-utils, libaa1-dev, libasound2-dev [!kfreebsd-i386], libtiff4-dev
+Standards-Version: 3.7.2
 
 Package: pinball
 Architecture: any
-Depends: ${shlibs:Depends}, pinball-data (= ${Source-Version})
-Description: The Emilia Pinball Emulator
-<<<<<<< control
- The Emilia Pinball Project is a pinball simulator
- for Linux and other Unix systems.
+Depends: ${shlibs:Depends}, pinball-data (>= 0.3.1-1), pinball-data (<< 0.3.2-1)
+Description: Emilia Pinball Emulator
+ The Emilia Pinball Project is a pinball simulator for Linux and other Unix
+ systems. There are only two levels to play with, but they are very addictive.
+
+Package: pinball-dev
+Architecture: any
+Depends: libc6-dev, pinball (= ${Source-Version}), c++abi2-dev | libstdc++6-4.1-dev
+Description: Development files for the Emilia Pinball Emulator
+ The Emilia Pinball Project is a pinball simulator for Linux and other Unix
+ systems. There are only two levels to play with, but they are very addictive.
  .
- There is only two levels to play with, but it is very addictive.
-=======
- The Emilia Pinball Project is a pinball simulator for Linux and other Unix systems.
- . 
- There is only two levels to play with, but it is very addictive.
->>>>>>> 1.3
+ This package contains header files and configuration for creating new levels.
 
 Package: pinball-data
 Architecture: all
 Description: Data files for the Emilia Pinball Emulator
- The Emilia Pinball Project is a pinball simulator
- for Linux and other Unix systems.
- There is only two levels to play with, but it is very addictive.
+ The Emilia Pinball Project is a pinball simulator for Linux and other Unix
+ systems. There are only two levels to play with, but they are very addictive.
  .
  This package contains various data files used by the pinball emulator.

debian/copyright

@@ -1,8 +1,11 @@
-This package was debianized by Debian User <dhollan@free.fr> on
-Sun, 29 Jun 2003 19:30:04 +0200.
+This package was debianized by Didier Dhollande <dholland@free.fr> on
+Sun, 17 Jun 2002
 
 It was downloaded from <http://prdownloads.sourceforge.net/pinball/>
 
+It is now maintained by Jochen Friedrich <[email protected]> on
+Fri, 05 Mar 2004
+
 Upstream Author: Henrik Enqvist <[email protected]>
 
 Copyright:
@@ -18,9 +21,12 @@ Copyright:
 
    You should have received a copy of the GNU General Public License
    along with this package; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.
 
 On Debian GNU/Linux systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
 
+It is now maintained by Jochen Friedrich <[email protected]> on
+Fri, 05 Mar 2004
+

debian/dirs

@@ -1,2 +1 @@
-usr/games
-
+/usr/games

debian/pinball-config.6

@@ -1,27 +1,50 @@
-.\"Generated by db2man.xsl. Don't modify this, modify the source.
-.de Sh \" Subsection
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Ip \" List item
-.br
-.ie \\n(.$>=3 .ne \\$3
-.el .ne 3
-.IP "\\$1" \\$2
-..
-.TH "PINBALL-CONGIG" 6 "" "" ""
-.SH NAME
-pinball-config \- 3D Pinball Compilation tool
+.TH "PINBALL-CONFIG" "6"
+.SH "NAME"
+pinball-config \- returns information about installed pinball libraries and
+binaries
 .SH SYNOPSIS
-.B pinball
-[\fIOPTION\fR]
+.B pinball-config
+[OPTIONS]
 .SH DESCRIPTION
-This helps to build pinedit (works as sdl-config)
+The
+.B pinball-config
+shell script is designed to retrieve the configuration information about
+the libraries and binaries of the
+.B pinball
+package.
+.SH "OPTIONS"
+.TP
+\fB\-\-version\fR
+displays the pinball version number
+.TP
+\fB\-\-libs\fR
+lists libraries needed for building new levels
+.TP
+\fB\-\-cflags\fR
+lists additional compilation flags needed
+.TP
+\fB\-\-datadir\fR
+Display the installation datadir
+.TP
+\fB\-\-libdir\fR
+Display the installation libdir
+.TP
+\fB\-\-prefix\fR
+Display the installation prefix
+.TP
+\fB\-\-exec\-prefix\fR
+Display the installation exec-prefix
+.SH "SEE ALSO"
+.PP
+The program is documented fully by the 
+.B README
+file that can be found under
+.B /usr/share/doc/pinball/README
+on
+.B Debian GNU/Linux.
+.SH "AUTHOR"
+.PP
+This manual page was written by Jochen Friedrich <[email protected]> for
+the
+.B Debian GNU/Linux
+system (but may be used by others).

debian/pinball.docs

@@ -1,3 +1 @@
 README
-AUTHORS
-NEWS

debian/pinball.files

@@ -1,3 +1,5 @@
-usr/games
-usr/lib
-usr/include
+usr/games/pinball
+usr/lib/pinball/*.so.*
+usr/lib/pinball/*.la
+usr/share/applications/pinball.desktop
+usr/share/pixmaps/pinball.xpm

debian/pinball.menu

@@ -1,6 +1,8 @@
-?package(pinball):needs=X11 section=Games/Arcade\
-  title="pinball" command="/usr/games/pinball"
+?package(pinball):needs="X11" section="Games/Arcade"\
+  title="Pinball" command="/usr/games/pinball"\
+  icon="/usr/share/pixmaps/pinball.xpm"
 
-?package(pinball):needs=vc section=Games/Arcade\
-  title="pinball" command="/usr/games/pinball"
+?package(pinball):needs="vc" section="Games/Arcade"\
+  title="Pinball" command="/usr/games/pinball"\
+  icon="/usr/share/pixmaps/pinball.xpm"