first stab at restructuring binary packaging

diff --git a/debian/altos-common.docs b/debian/altos-common.docs
new file mode 100644 (file)
index 0000000..7606129
--- /dev/null
+++ b/debian/altos-common.docs
@@ -0,0 +1,13 @@
+NEWS
+README
+doc/altos.html
+doc/altos.pdf
+doc/altusmetrum.html
+doc/altusmetrum.pdf
+doc/easymini-outline.pdf
+doc/telemega-outline.pdf
+doc/telemetrum-outline.pdf
+doc/telemetry.html
+doc/telemetry.pdf
+doc/telemini-v1-outline.pdf
+doc/telemini-v3-outline.pdf

diff --git a/debian/altos-common.install b/debian/altos-common.install
new file mode 100644 (file)
index 0000000..97a9d88
--- /dev/null
+++ b/debian/altos-common.install
@@ -0,0 +1,3 @@
+debian/altusmetrum.xpm usr/share/pixmaps
+src/*/*.ihx            usr/share/altos
+themes/background.png          usr/share/altos/themes

diff --git a/debian/altos-jars.lintian-overrides b/debian/altos-jars.lintian-overrides
new file mode 100644 (file)
index 0000000..df95576
--- /dev/null
+++ b/debian/altos-jars.lintian-overrides
@@ -0,0 +1,2 @@
+altos: bad-jar-name usr/share/java/altoslib_14.jar
+altos: bad-jar-name usr/share/java/altosuilib_14.jar

diff --git a/debian/altos.dirs b/debian/altos.dirs
new file mode 100644 (file)
index 0000000..c7f7918
--- /dev/null
+++ b/debian/altos.dirs
@@ -0,0 +1,8 @@
+usr/bin
+usr/lib/altos
+usr/share/altos/themes
+usr/share/applications
+usr/share/gdm/themes/altusmetrum
+usr/share/java
+usr/share/pixmaps
+usr/share/slim/themes/altusmetrum

diff --git a/debian/altos.install b/debian/altos.install
deleted file mode 100644 (file)
index 97a9d88..0000000
--- a/debian/altos.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/altusmetrum.xpm usr/share/pixmaps
-src/*/*.ihx            usr/share/altos
-themes/background.png          usr/share/altos/themes

diff --git a/debian/altos.lintian-overrides b/debian/altos.lintian-overrides
deleted file mode 100644 (file)
index df95576..0000000
--- a/debian/altos.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-altos: bad-jar-name usr/share/java/altoslib_14.jar
-altos: bad-jar-name usr/share/java/altosuilib_14.jar

diff --git a/debian/control b/debian/control
index 109075587d8673143b6fd9cabae518987cb620ef..e62ec69ce9e558327eb436323422fb8083de3d7a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -35,24 +35,70 @@ Build-Depends: asciidoctor,
                pkg-config,
                shared-mime-info,
                swig
-Standards-Version: 4.6.0
+Standards-Version: 4.6.1
 Homepage: http://altusmetrum.org/AltOS
 Vcs-Git: git://git.gag.com/fw/altos -b debian
 Vcs-Browser: http://git.gag.com/?p=fw/altos
 
 Package: altos
 Architecture: any
-Depends: default-jre | java2-runtime,
+Depends: altos-common,
+        default-jre | java2-runtime,
          freetts,
          libjfreechart-java,
          nickle,
          ${misc:Depends},
          ${shlibs:Depends}
-Suggests: slim | gdm
+Description: Altus Metrum support software
+ Firmware and utilities needed to support high power model rocketry products
+ from Altus Metrum.
+ .
+ See http://altusmetrum.org/ for more information.
+ .
+ This package contains architecture-specific files.
+
+Package: altos-common
+Architecture: all
+Depends: altos-jars
 Replaces: altusmetrum-themes, slim-altusmetrum
 Conflicts: altusmetrum-themes, slim-altusmetrum
-Description: Altus Metrum firmware and utilities
+Description: Altus Metrum support software
+ Firmware and utilities needed to support high power model rocketry products
+ from Altus Metrum.
+ .
+ See http://altusmetrum.org/ for more information.
+ .
+ This package contains architecture-independent files.
+
+Package: altos-jars
+Architecture: all
+Description: Altus Metrum support software
+ Firmware and utilities needed to support high power model rocketry products
+ from Altus Metrum.
+ .
+ See http://altusmetrum.org/ for more information.
+ .
+ This package contains Java class library jar files.
+
+Package: altos-mapservice
+Architecture: any
+Depends: altos-jars
+Description: Altus Metrum support software
+ Firmware and utilities needed to support high power model rocketry products
+ from Altus Metrum.
+ .
+ See http://altusmetrum.org/ for more information.
+ .
+ This package contains the map tile server used on maps.altusmetrum.org.
+
+Package: altos-mfg
+Architecture: any
+Depends: altos
+Description: Altus Metrum support software
  Firmware and utilities needed to support high power model rocketry products
- from Altus Metrum, including TeleMetrum, TeleMini, and TeleDongle.
+ from Altus Metrum.
  .
  See http://altusmetrum.org/ for more information.
+ .
+ This package contains production test programs and scripts.
+

diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644 (file)
index c7f7918..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,8 +0,0 @@
-usr/bin
-usr/lib/altos
-usr/share/altos/themes
-usr/share/applications
-usr/share/gdm/themes/altusmetrum
-usr/share/java
-usr/share/pixmaps
-usr/share/slim/themes/altusmetrum

diff --git a/debian/docs b/debian/docs
deleted file mode 100644 (file)
index 7606129..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,13 +0,0 @@
-NEWS
-README
-doc/altos.html
-doc/altos.pdf
-doc/altusmetrum.html
-doc/altusmetrum.pdf
-doc/easymini-outline.pdf
-doc/telemega-outline.pdf
-doc/telemetrum-outline.pdf
-doc/telemetry.html
-doc/telemetry.pdf
-doc/telemini-v1-outline.pdf
-doc/telemini-v3-outline.pdf

diff --git a/debian/rules b/debian/rules
index 960da9ee69f34e148f3a8dc4a861d51e865407f2..4479caa2692fd3eaf674fd4610c34df3a39f153a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -47,8 +47,6 @@ install: build
        sed -i "/dependency_libs/ s/'.*'/''/" `find debian/altos/ -name '*.la'`
 
 binary-indep: install
-
-binary-arch: install
        dh_testdir
        dh_testroot
        dh_installchangelogs ChangeLog
@@ -74,5 +72,27 @@ binary-arch: install
        dh_md5sums
        dh_builddeb
 
+binary-arch: install
+       dh_testdir
+       dh_testroot
+       dh_installchangelogs ChangeLog
+       dh_installdocs
+       dh_installexamples
+       dh_install
+       dh_installmenu
+       cp icon/org-altusmetrum-mimetypes.xml debian/altos.sharedmimeinfo
+       dh_installmime
+       dh_installman
+       dh_lintian
+       dh_link
+       dh_strip
+       dh_compress
+       dh_fixperms
+       dh_installdeb
+       dh_shlibdeps
+       dh_gencontrol
+       dh_md5sums
+       dh_builddeb
+
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure