[SCM] Arcade style game branch, master, updated. debian/3.3.0.0+dfsg1-1

[Dmitry E. Oboukhov]

The following commit has been merged in the master branch:
commit 43a37bd1bf53f2c11e930407e8fc76aa260a0390
Author: Dmitry E. Oboukhov <unera at debian.org>
Date:   Fri Jun 4 13:31:38 2010 +0400

    git commit -a (prev forgotten)

diff --git a/debian/changelog b/debian/changelog
index d5dfb2a..f2891ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ rocksndiamonds (3.3.0.0+dfsg1-1) unstable; urgency=low
   * New upstream version.
   * Switched debian source format (3.0 quilt).
   * Bumped Standards-Version to 3.8.4.
+  * Fixed dh_shlibdeps warning.
 
  -- Dmitry E. Oboukhov <unera at debian.org>  Fri, 04 Jun 2010 11:09:56 +0400
 
diff --git a/debian/control b/debian/control
index 1715c35..d54585d 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Package: rocksndiamonds
 Pre-Depends: debconf (>= 0.5) | debconf-2.0
 Conflicts: rocksndiamonds-data, rocksndiamonds-zelda, rocks-n-diamonds
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends},
  perl-modules, p7zip, wget, unzip
 Description: arcade-style game
  This package provides the game engine for Rocks'n'Diamonds, an arcade
diff --git a/debian/patches/series b/debian/patches/series
index 693e98f..98f8a6f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix-manpage-errors
+fix-shlibdeps-warning
diff --git a/debian/rules b/debian/rules
index 13f0653..94562c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,14 +14,16 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 
 build/rocksndiamonds:: rocksndiamonds.6
 	make RO_GAME_DIR=$(LEVEL_DIR) sdl
-	mv rocksndiamonds rocksndiamonds-bin
-	install -m 0755 debian/start_binary.sh rocksndiamonds
+
+install/rocksndiamonds::
 	set -e; \
   	for file in postinst preinst prerm; do \
   		cp debian/$$file.in debian/$$file; \
   		perl -pi -e 's/#VERSION#/$(UPSTREAM_VERSION)/g' \
   			debian/$$file; \
   	done
+	mv rocksndiamonds rocksndiamonds-bin
+	install -m 0755 debian/start_binary.sh rocksndiamonds
 
 rocksndiamonds.6: rocksndiamonds.1
 	sed 's/^\.TH ROCKSNDIAMONDS 1L/.TH ROCKSNDIAMONDS 6/' $< > $@
@@ -32,94 +34,3 @@ clean::
 		src/conftime.h rocksndiamonds-bin \
 		debian/postinst debian/preinst debian/prerm
 	debconf-updatepo
-#   PACKAGE=rocksndiamonds
-#   BINARYNAME=rocksndiamonds
-#   LEVEL_DIR=/usr/share/games/$(PACKAGE)
-#   LINTIANROOT=/usr/share/lintian
-#   
-#   ORIGMAN=rocksndiamonds.1
-#   DEBMAN=rocksndiamonds.6
-#   
-#   VERSION			:=	$(shell dpkg-parsechangelog \
-#   					|grep ^Version \
-#   					|awk '{print $$2}' \
-#   					|sed 's/-[0-9]\+$$//')
-#   
-#   UPSTREAM_VERSION	:=	$(shell echo $(VERSION)|sed 's/+.*//')
-#   
-#   CFLAGS = -Wall -g
-#   
-#   ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-#   	CFLAGS += -O0
-#   else
-#   	CFLAGS += -O2
-#   endif
-#   
-#   
-#   scripts-stamp:
-#   	set -e; \
-#   	for file in postinst preinst prerm; do \
-#   		cp debian/$$file.in debian/$$file; \
-#   		perl -pi -e 's/#VERSION#/$(UPSTREAM_VERSION)/g' \
-#   			debian/$$file; \
-#   	done
-#   	touch $@
-#   
-#   build: build-stamp
-#   
-#   build-stamp:
-#   	dh_testdir
-#   	export RO_GAME_DIR=$(LEVEL_DIR); \
-#   	$(MAKE) sdl
-#   	cat $(ORIGMAN)|sed 's/^\.TH ROCKSNDIAMONDS 1L/.TH ROCKSNDIAMONDS 6/' \
-#   	    | sed "s/^'/ '/" \
-#   		> $(DEBMAN)
-#   	touch $@
-#   
-#   clean:
-#   	dh_testdir
-#   	dh_testroot
-#   	rm -f build-stamp configure-stamp \
-#   		$(DEBMAN) src/conftime.h scripts-stamp \
-#   		debian/postinst debian/preinst debian/prerm
-#   	$(MAKE) clean
-#   	dh_clean
-#   	debconf-updatepo
-#   
-#   install: build
-#   	dh_testdir
-#   	dh_testroot
-#   	dh_clean -k
-#   	dh_installdirs
-#   	install -m 0755 rocksndiamonds \
-#   		debian/$(PACKAGE)/usr/games/$(BINARYNAME)-bin
-#   	install -m 0755 debian/start_binary.sh \
-#   		debian/$(PACKAGE)/usr/games/$(BINARYNAME)
-#   	umask 022 && \
-#   	    echo "usage: 'dpkg-reconfigure $(PACKAGE)' for downloading files" \
-#   	        > debian/$(PACKAGE)$(LEVEL_DIR)/README.dir
-#   
-#   # Build architecture-independent files here.
-#   binary-indep:
-#   
-#   # Build architecture-dependent files here.
-#   binary-arch: build install scripts-stamp
-#   	dh_testdir
-#   	dh_testroot
-#   	dh_installchangelogs ChangeLog
-#   	dh_installdocs
-#   	dh_installman
-#   	dh_installmenu
-#   	dh_link
-#   	dh_strip
-#   	dh_installdebconf
-#   	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 configure

-- 
Arcade style game