[adonthell-wastesedge-commits] master 2120713 19/21: REMOVED Debian specific files; those are taken care of by the package maintainer

[Kai Sterker]

branch: master
commit 2120713e2d181872e3c37347163adfb6569bad5e
Author: Kai Sterker <address@hidden>
Commit: Kai Sterker <address@hidden>

    REMOVED Debian specific files; those are taken care of by the package 
maintainer
    ADDED Debian man page for general use
    FIXES to .desktop file (Thanks Markus!)
---
 .cvsignore                                         |    6 ++
 Makefile.am                                        |   10 +--
 ...donthell-wastesedge.6 => adonthell-wastesedge.6 |    2 +-
 debian/README.debian                               |    8 --
 debian/changelog                                   |   26 ------
 debian/compat                                      |    1 -
 debian/control                                     |   18 -----
 debian/copyright                                   |   20 -----
 debian/dirs                                        |    3 -
 debian/docs                                        |    4 -
 debian/menu                                        |    4 -
 debian/rules                                       |   85 --------------------
 wastesedge.desktop.in                              |    3 +-
 13 files changed, 14 insertions(+), 176 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 46f70f8..b9deadc 100755
--- a/.cvsignore
+++ b/.cvsignore
@@ -5,3 +5,9 @@ config.cache
 config.log
 config.status
 configure
+adonthell-wastesedge
+config.guess
+wastesedge.desktop
+config.sub
+compile
+autom4te.cache
diff --git a/Makefile.am b/Makefile.am
index e133d08..ffeadc4 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,15 +2,15 @@ SUBDIRS = . audio gfx m4 maps pixmaps po scripts
 
 pkgdatadir = $(gamedatadir)
 
-pkgdata_DATA = gamename.txt achievements.data character.data mapengine.data 
quest.data audio.data
+dist_pkgdata_DATA = gamename.txt achievements.data character.data 
mapengine.data quest.data audio.data
 
 desktopdir = $(datadir)/applications
 dist_desktop_DATA = wastesedge.desktop
 
-EXTRA_DIST = config.rpath mkinstalldirs  config.rpath  $(pkgdata_DATA) PLAYING 
autogen.sh ABOUT-NLS \
-       debian/README.debian debian/adonthell-wastesedge.6 debian/changelog \
-       debian/control debian/copyright debian/dirs debian/rules debian/menu \
-       debian/compat debian/docs wastesedge.spec.in wastesedge.spec 
wastesedge.desktop.in \
+dist_man_MANS = adonthell-wastesedge.6
+
+EXTRA_DIST = config.rpath mkinstalldirs PLAYING autogen.sh ABOUT-NLS \
+       wastesedge.spec.in wastesedge.spec wastesedge.desktop.in \
        win32/COPYING win32/PLAYING.txt win32/make_msi.sh win32/README.txt \
        win32/wastesedge.ico win32/icon32.bmp win32/wastesedge-x64.wxs \
        osx/Copying.html osx/Install.html osx/Playing.html osx/ReadMe.html \
diff --git a/debian/adonthell-wastesedge.6 b/adonthell-wastesedge.6
similarity index 95%
rename from debian/adonthell-wastesedge.6
rename to adonthell-wastesedge.6
index c991f9d..281e635 100644
--- a/debian/adonthell-wastesedge.6
+++ b/adonthell-wastesedge.6
@@ -1,4 +1,4 @@
-.TH NAME SECTION
+.TH ADONTHELL-WASTESEDGE "6"
 .SH NAME
 adonthell-wastesedge \- Waste's Edge game for the Adonthell engine.
 .SH SYNOPSIS
diff --git a/debian/README.debian b/debian/README.debian
deleted file mode 100644
index ed35050..0000000
--- a/debian/README.debian
+++ /dev/null
@@ -1,8 +0,0 @@
-adonthell-data for Debian
--------------------------
-
-This is the official game-data for Adonthell 0.3, and it is
-a demo of the current engine. Story and gameplay will change
-with newer releases.
-
- -- Gordon Fraser <address@hidden>, Tue, 17 Sep 2002 15:16:21 +0200
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index 69480b1..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,26 +0,0 @@
-adonthell-data (0.3.3-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Gordon Fraser <address@hidden>  Thu, 19 Sep 2002 16:28:26 +0200
-
-adonthell-data (0.3.1.cvs.20020917-2) unstable; urgency=low
-
-  * Change Architecture to all
-
- -- Gordon Fraser <address@hidden>  Wed, 18 Sep 2002 22:23:40 +0200
-
-adonthell-data (0.3.1.cvs.20020917-1) unstable; urgency=low
-
-  * New CVS snapshot:
-    Lady Silverhair now follows to the cellar (Closes: #160820)
-  * Includes PLAYING file (Closes: #160814)
-  * Updated Debian standards version
-
- -- Gordon Fraser <address@hidden>  Tue, 17 Sep 2002 15:16:21 +0200
-
-adonthell-data (0.3.1.cvs.20020906-1) unstable; urgency=low
-
-  * Initial Debian upload (Closes: #158681)
-
- -- Gordon Fraser <address@hidden>  Wed, 28 Aug 2002 22:43:42 +0200
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b8626c4..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/debian/control b/debian/control
deleted file mode 100644
index b08c3a1..0000000
--- a/debian/control
+++ /dev/null
@@ -1,18 +0,0 @@
-Source: adonthell-data
-Section: games
-Priority: optional
-Maintainer: Gordon Fraser <address@hidden>
-Build-Depends-Indep: debhelper (>= 4), adonthell (>= 0.3), adonthell (<< 0.4)
-Standards-Version: 3.5.7
-
-Package: adonthell-data
-Architecture: all
-Depends: adonthell (>= 0.3), adonthell (<< 0.4)
-Description: Data files needed by Adonthell
- This is the official game for Adonthell 0.3
- .
- As a loyal servant of the elven Lady Silverhair, you arrive at the remote
- trading post of Waste's Edge, where she is engaged in negotiations with the
- dwarish merchant Bjarn Fingolson. But not all is well at Waste's Edge, and
- soon you are confronted with circumstances that are about to destroy your
- mistress' high reputation. And you are the only one to avert this ...
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index 181c50e..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,20 +0,0 @@
-This package was debianized by Gordon Fraser <address@hidden> on
-Wed, 28 Aug 2002 20:37:34 +0200.
-
-It was downloaded from http://adonthell.linuxgames.com/download/
-
-Upstream Authors: Kai Sterker & the Adonthell team <address@hidden>
-
-Copyright:
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-The GNU GPL may be viewed on Debian systems in /usr/share/common-licenses/GPL
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 78584ac..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/games
-usr/share/games/adonthell/games/wastesedge
-usr/share/man/man6
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 32fa764..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,4 +0,0 @@
-AUTHORS
-NEWS
-README
-PLAYING
diff --git a/debian/menu b/debian/menu
deleted file mode 100644
index 3a7a913..0000000
--- a/debian/menu
+++ /dev/null
@@ -1,4 +0,0 @@
-?package(adonthell-data):needs=X11 section=Games/Adventure \
-  title="Adonthell - Waste's Edge" \
-  command="/usr/games/adonthell-wastesedge" \
-  icon="/usr/share/pixmaps/wastesedge_16x16.xpm"
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index 2c3e813..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/make -f
-#export DH_VERBOSE=1
-
-
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-INSTALL = /usr/bin/install -c
-INSTALL_PROGRAM = ${INSTALL} -p -o root -g root  -m 755
-
-#ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-#      CFLAGS += -g
-#endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-       INSTALL_PROGRAM += -s
-endif
-
-config.status: configure
-       dh_testdir
-       ./configure --host=$(DEB_HOST_GNU_TYPE) \
-                    --build=$(DEB_BUILD_GNU_TYPE) \
-                    --prefix=/usr \
-                    --mandir=\$${prefix}/share/man \
-                    --with-data-dir=\$${prefix}/share/games/adonthell \
-                    --with-adonthell-binary=/usr/games/adonthell \
-                    --bindir=\$${prefix}/games
-
-build: build-stamp
-
-build-stamp:  config.status
-       dh_testdir
-       $(MAKE) INSTALL_PROGRAM="$(INSTALL_PROGRAM)" \
-                DESTDIR="$(CURDIR)/debian/adonthell-data"
-       touch build-stamp
-
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp 
-
-       -$(MAKE) distclean
-       -test -r /usr/share/misc/config.sub && \
-         cp -f /usr/share/misc/config.sub config.sub
-       -test -r /usr/share/misc/config.guess && \
-         cp -f /usr/share/misc/config.guess config.guess
-       -rm -f config.status
-       -rm -f `find . -name "*~"`
-       -rm -f `find . -name "*.pyc"`
-
-       dh_clean
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k
-       dh_installdirs
-
-       $(MAKE) install DESTDIR="$(CURDIR)/debian/adonthell-data" \
-                INSTALL_PROGRAM="$(INSTALL_PROGRAM)"
-#                
gamedatadir="$(CURDIR)/debian/adonthell-data/usr/share/games/adonthell-data"
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installdocs
-       dh_installmenu
-       dh_installman debian/adonthell-wastesedge.6
-       dh_installchangelogs ChangeLog
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
diff --git a/wastesedge.desktop.in b/wastesedge.desktop.in
index b03572d..0317982 100644
--- a/wastesedge.desktop.in
+++ b/wastesedge.desktop.in
@@ -1,10 +1,11 @@
 [Desktop Entry]
 Type=Application
 Version=1.0
-Encoding=UTF-8
 Name=Waste's Edge
 Comment=A 2D graphical RPG
+Comment[de]=Ein grafisches Rollenspiel in 2D
 address@hidden@ wastesedge
 Icon=wastesedge
 Terminal=false
 Categories=Game;RolePlaying;
+Keywords=fantasy;rpg;