Merge branch 'master' of github.com:wmvanvliet/Chimara

diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644 (file)
index 0000000..6ed22bd
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1,10 @@
+chimara-player
+files
+libchimara-dev
+libchimara-doc
+libchimara0
+tmp
+stamp*
+*.debhelper.log
+*.substvars
+*.debhelper

diff --git a/debian/chimara-player.install b/debian/chimara-player.install
new file mode 100644 (file)
index 0000000..6e8625e
--- /dev/null
+++ b/debian/chimara-player.install
@@ -0,0 +1,4 @@
+debian/tmp/usr/bin/chimara
+debian/tmp/usr/share/chimara/chimara.ui
+debian/tmp/usr/share/chimara/chimara.menus
+debian/tmp/usr/share/chimara/style.css

diff --git a/debian/libchimara-player.install b/debian/libchimara-player.install
deleted file mode 100644 (file)
index 1a09ec8..0000000
--- a/debian/libchimara-player.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/usr/bin/chimara
-debian/tmp/usr/share/chimara/chimara.ui
-debian/tmp/usr/share/chimara/chimara.menus
\ No newline at end of file