[SCM] asciiportal - a puzzle jump'n'run adventure game branch, master, updated. upstream/1.2c-6-ga301912

[Peter Pentchev]

The following commit has been merged in the master branch:
commit 0b14b0e1cf8e1e0301e9fc21c09aeb5ba378a3d1
Author: Peter Pentchev <roam at ringlet.net>
Date:   Sun Sep 12 02:46:40 2010 +0300

    Break out the /usr/share/asciiportal/ tree into a -common package.

diff --git a/debian/asciiportal.dirs b/debian/asciiportal-common.dirs
similarity index 100%
rename from debian/asciiportal.dirs
rename to debian/asciiportal-common.dirs
diff --git a/debian/asciiportal.install b/debian/asciiportal-common.install
similarity index 92%
copy from debian/asciiportal.install
copy to debian/asciiportal-common.install
index 7ba27c5..b1761c8 100644
--- a/debian/asciiportal.install
+++ b/debian/asciiportal-common.install
@@ -1,4 +1,3 @@
-asciiportal usr/games
 challengeme/* usr/share/asciiportal/challengeme
 evil/* usr/share/asciiportal/evil
 maps/* usr/share/asciiportal/maps
diff --git a/debian/asciiportal.install b/debian/asciiportal.install
index 7ba27c5..352f851 100644
--- a/debian/asciiportal.install
+++ b/debian/asciiportal.install
@@ -1,7 +1 @@
 asciiportal usr/games
-challengeme/* usr/share/asciiportal/challengeme
-evil/* usr/share/asciiportal/evil
-maps/* usr/share/asciiportal/maps
-masterlevels/* usr/share/asciiportal/masterlevels
-media/* usr/share/asciiportal/media
-raisonbran648/* usr/share/asciiportal/raisonbran648
diff --git a/debian/changelog b/debian/changelog
index c533720..476a82d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,6 @@ asciiportal (1.2c-1) UNRELEASED; urgency=low
 
   TODO: teach the binary about /usr/share/asciiportal
   TODO: write a manpage
-  TODO: break out the common stuff into asciiportal-common
   TODO: remove the unneeded dh_make template files
   TODO: policy 3.9.1
   TODO: dpkg-buildflags
diff --git a/debian/control b/debian/control
index 7bf98af..7dc85da 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,8 @@ Homepage: http://cymonsgames.com/asciiportal/
 
 Package: asciiportal
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends},
+	asciiportal-common (= ${source:Version})
 Description: puzzle jump'n'run adventure game
  Grab your hand-held portal device and enter the test chambers for a
  non-euclidean good time.
@@ -21,3 +22,12 @@ Description: puzzle jump'n'run adventure game
  Since both way-points are the same point on the map the player's view
  through the portal reflects this and space warps around you as you pass
  through the portal.
+
+Package: asciiportal-common
+Architecture: all
+Depends: ${misc:Depends}
+Description: puzzle jump'n'run adventure game - maps and sounds
+ Grab your hand-held portal device and enter the test chambers for a
+ non-euclidean good time.
+ .
+ Maps and sounds for the ASCIIpOrtal game.

-- 
asciiportal - a puzzle jump'n'run adventure game