[opencity] 47/91: * upload to experimental because of the Lenny freeze * fix a little syntaxe error in the manpage * clean config.guess * add opencity-data, thanks Guillem Jover (Closes: #496237) * use dh_install to install the files - add opencity{, -data}.install - do some clean up around this part of the rules file * bump the standards version to 3.8.0. No change.

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository opencity.

commit bcc4abdcd9d367a884dcf8d78429761833614106
Author: Gonéri Le Bouder <goneri at rulezlan.org>
Date:   Sun Aug 24 19:25:22 2008 +0000

      * upload to experimental because of the Lenny freeze
      * fix a little syntaxe error in the manpage
      * clean config.guess
      * add opencity-data, thanks Guillem Jover (Closes: #496237)
      * use dh_install to install the files
       - add opencity{,-data}.install
       - do some clean up around this part of the rules file
      * bump the standards version to 3.8.0. No change.
---
 debian/changelog             | 13 ++++++---
 debian/control               | 11 ++++++--
 debian/opencity-data.install |  2 ++
 debian/opencity.install      |  3 +++
 debian/rules                 | 64 +++++++++++++++++++++++++++-----------------
 5 files changed, 63 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8f418fa..7ab2601 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,17 @@
-opencity (0.0.5.1stable-2) UNRELEASED; urgency=low
+opencity (0.0.5.1stable-2) experimental; urgency=low
 
   [ Ansgar Burchardt ]
   * debian/control: Change XS-Vcs-* to Vcs-*
 
   [ Gonéri Le Bouder ]
-  * fix a little syntaxe error in the manpage 
+  * upload to experimental because of the Lenny freeze
+  * fix a little syntaxe error in the manpage
+  * clean config.guess
+  * add opencity-data, thanks Guillem Jover (Closes: #496237)
+  * use dh_install to install the files
+   - add opencity{,-data}.install
+   - do some clean up around this part of the rules file
+  * bump the standards version to 3.8.0. No change.
 
   [ Ansgar Burchardt ]
   * debian/control: Add Homepage field
@@ -15,7 +22,7 @@ opencity (0.0.5.1stable-2) UNRELEASED; urgency=low
     adjusting the series file appropriately (i.e. by deleting the “-p0”
     option), thanks to Raphaël Hertzog for the notice (Closes: #485352).
 
- -- Goneri Le Bouder <goneri at rulezlan.org>  Sun, 23 Mar 2008 13:53:23 +0100
+ -- Gonéri Le Bouder <goneri at rulezlan.org>  Sun, 24 Aug 2008 21:12:23 +0200
 
 opencity (0.0.5.1stable-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 8895972..b8e1cfa 100644
--- a/debian/control
+++ b/debian/control
@@ -6,14 +6,14 @@ Uploaders: Gonéri Le Bouder <goneri at rulezlan.org>
 Build-Depends: debhelper (>= 5.0.0), autotools-dev, libsdl1.2-dev,
  libsdl-mixer1.2-dev, libsdl-image1.2-dev, libsdl-net1.2-dev (>= 1.2.5-7),
  docbook-to-man, libglu1-mesa-dev, quilt, imagemagick
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/opencity/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/opencity/?op=log
 Homepage: http://www.opencity.info/
 
 Package: opencity
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, opencity-data (>= ${source:Version})
 Description: a 3D city simulator game
  OpenCity is 3D city construction simulator. You can build some zones of 
  housing, trading and industry, electric plant and roads. Besides you can also 
@@ -21,3 +21,10 @@ Description: a 3D city simulator game
  OpenCity is similar in spirit to other city construction games, heading
  towards a classic SimCity feeling, although with some additional features.
  It is not intended to be a clone of any famous city simulator.
+
+Package: opencity-data
+Architecture: all 
+Recommends: opencity
+Description: data for opencity, a 3D city simulator game
+ This package contains the architecture-independent data for opencity. For more
+ information, see the etw package. 
diff --git a/debian/opencity-data.install b/debian/opencity-data.install
new file mode 100644
index 0000000..7b80bd3
--- /dev/null
+++ b/debian/opencity-data.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/games
+debian/tmp/etc
diff --git a/debian/opencity.install b/debian/opencity.install
new file mode 100644
index 0000000..d9f3f41
--- /dev/null
+++ b/debian/opencity.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/games
+debian/opencity.xpm usr/share/pixmaps/
+debian/opencity.desktop usr/share/applications/
diff --git a/debian/rules b/debian/rules
index a1449a5..631b440 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,7 +39,7 @@ build-stamp:  config.status
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp 
+	rm -f build-stamp config.guess
 
 	# Add here commands to clean up after the build process.
 	[ ! -f Makefile ] || $(MAKE) distclean
@@ -60,34 +60,48 @@ install: build
 	dh_installdirs
 
 	# Add here commands to install the package into debian/opencity.
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/opencity
-	mv debian/opencity/usr/bin debian/opencity/usr/games
-	rm -rf debian/opencity/usr/share/games/opencity/docs \
-	  debian/opencity/usr/share/games/opencity/autopackage \
-	  debian/opencity/usr/share/games/opencity/OpenCity.png \
-	  debian/opencity/usr/share/games/opencity/OpenCity.desktop
-	dh_install debian/opencity.desktop usr/share/applications
-	dh_install debian/opencity.xpm usr/share/pixmaps
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	mv debian/tmp/usr/bin debian/tmp/usr/games
+#	rm -rf debian/opencity/usr/share/games/opencity/docs \
+#	  debian/opencity/usr/share/games/opencity/autopackage \
+#	  debian/opencity/usr/share/games/opencity/OpenCity.png \
+#	  debian/opencity/usr/share/games/opencity/OpenCity.desktop
+#	dh_install debian/opencity.desktop usr/share/applications
+#	dh_install debian/opencity.xpm usr/share/pixmaps
 
 binary-indep: build install
+	dh_testdir -i
+	dh_testroot -i
+	dh_install -i
+	dh_installchangelogs -i ChangeLog
+	dh_installdocs -i
+	dh_strip -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_shlibdeps -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
 
 binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs docs/FAQ_it.txt docs/FAQ.txt docs/INSTALL_it.txt docs/README_es.txt docs/README_it.txt
-	dh_installexamples
-	dh_installman debian/opencity.6
-	dh_desktop
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_testdir -a
+	dh_testroot -a
+	dh_install -a
+	dh_installchangelogs -a ChangeLog
+	dh_installdocs -a docs/FAQ_it.txt docs/FAQ.txt docs/INSTALL_it.txt docs/README_es.txt docs/README_it.txt
+	dh_installmenu -a
+	dh_desktop -a
+	dh_installman -a debian/opencity.6
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install 

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