summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDidier Raboud <odyx@debian.org>2013-11-14 11:01:17 +0100
committerDidier Raboud <odyx@debian.org>2013-11-14 13:34:21 +0100
commit16507cc30187d1d29a4ecabb6e2ad80faf7d6a67 (patch)
treeabad07d78b8300560d59e14d576f0bc5baf4d7ab
parent2b84cc96943ab4130d713a18300fc1fd9cf75c29 (diff)
downloadcolobot-16507cc30187d1d29a4ecabb6e2ad80faf7d6a67.tar.gz
colobot-16507cc30187d1d29a4ecabb6e2ad80faf7d6a67.tar.bz2
colobot-16507cc30187d1d29a4ecabb6e2ad80faf7d6a67.zip
Move fonts links and translations back to colobot main package
-rw-r--r--debian/colobot-common.install1
-rw-r--r--debian/colobot.install1
-rw-r--r--debian/colobot.links (renamed from debian/colobot-common.links)0
-rw-r--r--debian/control4
4 files changed, 4 insertions, 2 deletions
diff --git a/debian/colobot-common.install b/debian/colobot-common.install
index fdb2ab8..b6aed05 100644
--- a/debian/colobot-common.install
+++ b/debian/colobot-common.install
@@ -1,4 +1,3 @@
-usr/share/locale/*/LC_MESSAGES/colobot.mo
usr/share/games/colobot/ai
usr/share/games/colobot/help
usr/share/games/colobot/icons
diff --git a/debian/colobot.install b/debian/colobot.install
index d1bedf6..6d594f1 100644
--- a/debian/colobot.install
+++ b/debian/colobot.install
@@ -7,3 +7,4 @@ usr/share/icons/hicolor/32x32/apps/colobot.png
usr/share/icons/hicolor/16x16/apps/colobot.png
usr/share/man/man6/colobot.6
usr/share/man/*/man6/colobot.6
+usr/share/locale/*/LC_MESSAGES/colobot.mo
diff --git a/debian/colobot-common.links b/debian/colobot.links
index 7e90afe..7e90afe 100644
--- a/debian/colobot-common.links
+++ b/debian/colobot.links
diff --git a/debian/control b/debian/control
index 13993cd..180378e 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,10 @@ Package: colobot
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
+ fonts-dejavu-core, fonts-dejavu-extra,
colobot-common (>= ${source:Version})
+Replaces: colobot-common (<< 0.1.1-2)
+Breaks: colobot-common (<< 0.1.1-2)
Description: educational programming strategy game
Colobot (Colonize with Bots) is an educational game aiming to teach
programming through entertainment. You are playing as an astronaut on a
@@ -44,7 +47,6 @@ Description: educational programming strategy game
Package: colobot-common
Architecture: all
Depends: ${misc:Depends},
- fonts-dejavu-core, fonts-dejavu-extra
Recommends: colobot (>= ${source:Version})
Description: educational programming strategy game - data
Colobot (Colonize with Bots) is an educational game aiming to teach