summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2010-05-18 00:24:03 -0600
committerBdale Garbee <bdale@gag.com>2010-05-18 00:24:03 -0600
commitbc89d962c87b50e5487628f8ca25e4443ac4823d (patch)
tree29af61f78dacfea49715670e515200391b6e5a67 /debian
parent0c6cf621dfd8339b8bc3915750a3147235f1331b (diff)
merge the altusmetrum-themes package
Diffstat (limited to 'debian')
-rw-r--r--debian/altos.install8
-rw-r--r--debian/control4
-rw-r--r--debian/dirs2
-rwxr-xr-xdebian/rules5
4 files changed, 13 insertions, 6 deletions
diff --git a/debian/altos.install b/debian/altos.install
index 8d8a1987..8be48ca3 100644
--- a/debian/altos.install
+++ b/debian/altos.install
@@ -1,4 +1,12 @@
debian/altos.desktop usr/share/applications
debian/altos.list etc/apt/sources.list.d
+debian/altusmetrum.xpm usr/share/pixmaps
src/*.ihx usr/share/altos
src/*.map usr/share/altos
+themes/background.png usr/share/slim/themes/altusmetrum
+themes/slim/panel.png usr/share/slim/themes/altusmetrum
+themes/slim/slim.theme usr/share/slim/themes/altusmetrum
+themes/background.png usr/share/gdm/themes/altusmetrum
+themes/gdm/altusmetrum.xml /usr/share/gdm/themes/altusmetrum
+themes/gdm/GdmGreeterTheme.desktop /usr/share/gdm/themes/altusmetrum
+themes/gdm/screenshot.png /usr/share/gdm/themes/altusmetrum
diff --git a/debian/control b/debian/control
index ff6c12e7..fb620e3d 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,9 @@ Homepage: http://altusmetrum.org/AltOS
Package: altos
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, nickle, plplot9-driver-cairo
-Suggests: slim-altusmetrum
+Suggests: slim | gdm
+Replaces: altusmetrum-themes, slim-altusmetrum
+Conflicts: altusmetrum-themes, slim-altusmetrum
Description: Altus Metrum firmware and utilities
Firmware and utilities needed to support the TeleMetrum dual-deploy
recording altimeter for high power model rocketry.
diff --git a/debian/dirs b/debian/dirs
index 29840efb..db75fea7 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -2,4 +2,6 @@ etc/apt/sources.list.d
usr/bin
usr/share/altos
usr/share/applications
+usr/share/gdm/themes/altusmetrum
usr/share/pixmaps
+usr/share/slim/themes/altusmetrum
diff --git a/debian/rules b/debian/rules
index a7468b9f..53a8a340 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,14 +43,9 @@ install: build
dh_installdirs
$(MAKE) DESTDIR=$(CURDIR)/debian/altos install
- install -o root -g root -m 0644 debian/altusmetrum.xpm \
- $(CURDIR)/debian/altos/usr/share/pixmaps/altusmetrum.xpm
-# Build architecture-independent files here.
binary-indep: install
-# We have nothing to do by default.
-# Build architecture-dependent files here.
binary-arch: install
dh_testdir
dh_testroot