[SCM] Packaging for Liero branch, master, updated. upstream/1.35_b2+20100124.1-25-gb2f4a7b

[Martin Erik Werner]

The following commit has been merged in the master branch:
commit 6bb82cd9ef16af491eb1e65ce96884f5e3c15f5c
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Mon Apr 23 14:49:43 2012 +0200

    fixup building for two packages and install paths

diff --git a/debian/control b/debian/control
index 4edd6ad..0ab63cc 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,10 @@ Section: games
 Priority: extra
 Maintainer: Martin Erik Werner <martinerikwerner at gmail.com>
 Build-Depends: debhelper (>= 8),
-               libtool,
                imagemagick,
-               sox,
                libsdl-mixer1.2-dev,
+               libtool,
+               sox,
                zlib1g-dev
 Standards-Version: 3.9.3
 Homepage: https://launchpad.net/lierolibre
@@ -41,4 +41,3 @@ Depends: ${misc:Depends}
 Description: data files for lierolibre
  This package contains the data files (sounds, graphics, game variables) for
  the old-school earthworm action game lierolibre.
-
diff --git a/debian/copyright b/debian/copyright
index 5fb8cfd..192b326 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -199,5 +199,3 @@ License: LGPL-2.1+
  On Debian systems, the full text of the GNU Lesser General Public
  License version 2.1 can be found in the file
  `/usr/share/common-licenses/LGPL-2.1'.
-
-
diff --git a/debian/lierolibre-data.install b/debian/lierolibre-data.install
index 21f4484..080bdca 100644
--- a/debian/lierolibre-data.install
+++ b/debian/lierolibre-data.install
@@ -1,6 +1,7 @@
-usr/share/games/lierolibre/liero.cfg
+
 usr/share/games/lierolibre/LIERO.CHR
 usr/share/games/lierolibre/LIERO.DAT
 usr/share/games/lierolibre/LIERO.OPT
 usr/share/games/lierolibre/LIERO.SND
 usr/share/games/lierolibre/NAMES.DAT
+usr/share/games/lierolibre/liero.cfg
diff --git a/debian/lierolibre.docs b/debian/lierolibre.docs
deleted file mode 100644
index 3ba6f91..0000000
--- a/debian/lierolibre.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/lierolibre/LIERO.TXT
-usr/share/lierolibre/LIEROENG.TXT
diff --git a/debian/lierolibre.install b/debian/lierolibre.install
index ed1276c..f03517a 100644
--- a/debian/lierolibre.install
+++ b/debian/lierolibre.install
@@ -1,4 +1,5 @@
-usr/games/lierolibre
+
+usr/games/lierolibre usr/games
 usr/lib/games/lierolibre/lierolibre
 usr/share/applications/lierolibre.desktop
 usr/share/icons/hicolor/scalable/apps/lierolibre.svg
diff --git a/debian/rules b/debian/rules
index 26a76bb..6a00a52 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,14 +4,14 @@
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure --\
+	dh_auto_configure -- \
 		bindir=/usr/games \
 		libexecdir=/usr/lib/games \
-		pkgdatadir=/usr/share/games/lierolibre \
+		datadir=/usr/share/games \
 
 override_dh_auto_install:
 	dh_auto_install
-	rm tmp/usr/share/doc/lierolibre/COPYING
+	rm debian/tmp/usr/share/doc/lierolibre/COPYING
 
 override_dh_installchangelogs:
 	dh_installchangelogs --exclude=ChangeLog

-- 
Packaging for Liero