Bug#442029: opencity: Patch

[Thanasis Kinias]

Package: opencity
Version: 0.0.4stable-2.1
Followup-For: Bug #442029

Attached is a patch to do the following:

* fix the FHS issues (docs not under /usr/share/doc and config files not under /etc);
* skip installi the unnecessary and/or redundant files;
* add missing and necessary README as well as nice-to-haves like
  AUTHORS, TODO, etc.; and
* a minor debian/rules fix to quiet lintian.

I hope it is helpful.

-- System Information:
Debian Release: lenny/sid
  APT prefers testing
  APT policy: (990, 'testing'), (990, 'stable'), (989, 'stable'), (50, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.17-tk (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages opencity depends on:
ii  libc6                         2.6.1-1    GNU C Library: Shared libraries
ii  libgcc1                       1:4.2.1-4  GCC support library
ii  libgl1-mesa-glx [libgl1]      7.0.1-1    A free implementation of the OpenG
ii  libglu1-mesa [libglu1]        7.0.1-1    The OpenGL utility library (GLU)
ii  libsdl-image1.2               1.2.6-1    image loading library for Simple D
ii  libsdl-mixer1.2               1.2.6-3    mixer library for Simple DirectMed
ii  libsdl-net1.2                 1.2.7-2    network library for Simple DirectM
ii  libsdl1.2debian               1.2.11-9   Simple DirectMedia Layer
ii  libstdc++6                    4.2.1-4    The GNU Standard C++ Library v3

opencity recommends no packages.

-- no debconf information
-------------- next part --------------
diff -ruNad opencity-0.0.4stable~/debian/opencity.dirs opencity-0.0.4stable/debian/opencity.dirs
--- opencity-0.0.4stable~/debian/opencity.dirs	1969-12-31 17:00:00.000000000 -0700
+++ opencity-0.0.4stable/debian/opencity.dirs	2007-09-12 11:42:17.000000000 -0700
@@ -0,0 +1,2 @@
+etc/opencity
+usr/share/games/opencity
diff -ruNad opencity-0.0.4stable~/debian/opencity.docs opencity-0.0.4stable/debian/opencity.docs
--- opencity-0.0.4stable~/debian/opencity.docs	1969-12-31 17:00:00.000000000 -0700
+++ opencity-0.0.4stable/debian/opencity.docs	2007-09-12 09:58:39.000000000 -0700
@@ -0,0 +1,6 @@
+AUTHORS
+README
+TODO
+docs/LEGGIMI.txt
+docs/FAQ.txt
+
diff -ruNad opencity-0.0.4stable~/debian/opencity.links opencity-0.0.4stable/debian/opencity.links
--- opencity-0.0.4stable~/debian/opencity.links	1969-12-31 17:00:00.000000000 -0700
+++ opencity-0.0.4stable/debian/opencity.links	2007-09-12 11:45:59.000000000 -0700
@@ -0,0 +1,3 @@
+etc/opencity/graphism.conf usr/share/games/opencity/config/graphism.conf
+etc/opencity/opencity.conf usr/share/games/opencity/config/opencity.conf
+
diff -ruNad opencity-0.0.4stable~/debian/rules opencity-0.0.4stable/debian/rules
--- opencity-0.0.4stable~/debian/rules	2007-09-12 09:53:42.000000000 -0700
+++ opencity-0.0.4stable/debian/rules	2007-09-12 11:49:25.000000000 -0700
@@ -41,7 +41,10 @@
 	rm -f build-stamp 
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
+	#-$(MAKE) distclean
+	# use this format to satisfy lintian:
+	[ ! -f Makefile ] || $(MAKE) distclean
+
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
 endif
@@ -52,17 +55,27 @@
 	rm -f config.log config.status
 	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 
+OC_DATADIR = $(CURDIR)/debian/opencity/usr/share/games/opencity
+
 install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k 
-	dh_installdirs
+	dh_installdirs 
 
 	# Add here commands to install the package into debian/opencity.
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/opencity
+
+	# fix installation locations
 	mv $(CURDIR)/debian/opencity/usr/bin $(CURDIR)/debian/opencity/usr/games
+
+	# delete unnecessary & redundant files
+	rm -f $(OC_DATADIR)/OpenCity.desktop
+	rm -rf $(OC_DATADIR)/{autopackage,config,docs}
 	dh_install debian/opencity.desktop usr/share/applications
 	dh_install debian/opencity.xpm usr/share/pixmaps
+	dh_install config/* etc/opencity
+	dh_link
 
 binary-indep: build install