From bc89d962c87b50e5487628f8ca25e4443ac4823d Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Tue, 18 May 2010 00:24:03 -0600 Subject: merge the altusmetrum-themes package --- debian/altos.install | 8 ++++++++ debian/control | 4 +++- debian/dirs | 2 ++ debian/rules | 5 ----- 4 files changed, 13 insertions(+), 6 deletions(-) (limited to 'debian') 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 -- cgit v1.2.3 From 16c4cae7ebed7bd3ee0f12b8872bf950574f17e8 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Tue, 18 May 2010 00:26:00 -0600 Subject: update changelogs for Debian build --- ChangeLog | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ debian/changelog | 13 ++++++++++++ 2 files changed, 75 insertions(+) (limited to 'debian') diff --git a/ChangeLog b/ChangeLog index 63cba5ad..04a8a96d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,65 @@ +commit bc89d962c87b50e5487628f8ca25e4443ac4823d +Author: Bdale Garbee +Date: Tue May 18 00:24:03 2010 -0600 + + merge the altusmetrum-themes package + +commit 0c6cf621dfd8339b8bc3915750a3147235f1331b +Merge: 32e430b 563a9dc +Author: Bdale Garbee +Date: Mon May 17 23:59:43 2010 -0600 + + Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos + +commit 32e430b8a5f93b312f6359b4d553bad92ed37b19 +Author: Bdale Garbee +Date: Mon May 17 22:43:19 2010 -0600 + + merge in a derivative of Bob Finch's mere mortals guide as a getting started + chapter + +commit 563a9dcdfef42718370c49f16cc2271642b3e055 +Author: Keith Packard +Date: Mon May 17 21:30:57 2010 -0700 + + Finish basic flight monitoring UI with voice using FreeTTS + + This captures telemetry data to log files and presents flight status + information in audio form using FreeTTS. + + Signed-off-by: Keith Packard + +commit 69092ffd23ac1928d5c84413fd00c2423f313fc2 +Merge: 3c2211a cc002c0 +Author: Bdale Garbee +Date: Mon May 17 20:10:46 2010 -0600 + + Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos + +commit cc002c0a43a02845ba67d1a61828be382f307b2e +Author: Keith Packard +Date: Sun May 16 22:31:23 2010 -0700 + + Fix telemetrum.inf, tested by Adrian and Keithp + +commit 3c2211ad7877d622435bc9e8c9c0b01d62be6ff0 +Author: Bdale Garbee +Date: Thu May 13 15:37:37 2010 -0600 + + typo fix from Bob + +commit f0433c83d76e90d78fb86a1f4a2f145f3c57fb25 +Author: Bdale Garbee +Date: Thu May 13 01:27:39 2010 -0600 + + updates from Bob + +commit 0f05cf06e3f1ec510b11d993d9038211ac66c97b +Author: Bdale Garbee +Date: Wed May 12 19:54:04 2010 -0600 + + update changelogs for Debian build + commit 6bd85138c1bfbc1d8b78dce1501870a65a64db36 Author: Bdale Garbee Date: Wed May 12 19:53:40 2010 -0600 diff --git a/debian/changelog b/debian/changelog index 71dc6f59..aadf50ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +altos (0.6+213+gbc89d96) unstable; urgency=low + + [ Bdale Garbee ] + * updates including a typo fix from Bob Finch to the PKGBUILD-git.altos + * merge a derivative of Bob Finch's mere mortals guide as getting started + * merge the altusmetrum-themes package + + [ Keith Packard ] + * Fix telemetrum.inf, tested by Adrian and Keithp + * Finish basic flight monitoring UI with voice using FreeTTS + + -- Bdale Garbee Tue, 18 May 2010 00:24:40 -0600 + altos (0.6+204+g6bd8513) unstable; urgency=low * lose the quotes since they apparently aren't necessary -- cgit v1.2.3 From bb46c9a1da5788a082e4483e576a5a6d3963507b Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Tue, 18 May 2010 00:26:28 -0600 Subject: update changelogs for Debian build --- ChangeLog | 6 ++++++ debian/changelog | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/ChangeLog b/ChangeLog index 04a8a96d..02813e47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +commit 16c4cae7ebed7bd3ee0f12b8872bf950574f17e8 +Author: Bdale Garbee +Date: Tue May 18 00:26:00 2010 -0600 + + update changelogs for Debian build + commit bc89d962c87b50e5487628f8ca25e4443ac4823d Author: Bdale Garbee Date: Tue May 18 00:24:03 2010 -0600 diff --git a/debian/changelog b/debian/changelog index aadf50ca..23dca4a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -altos (0.6+213+gbc89d96) unstable; urgency=low +altos (0.6+214+g16c4cae) unstable; urgency=low [ Bdale Garbee ] * updates including a typo fix from Bob Finch to the PKGBUILD-git.altos -- cgit v1.2.3