From e5a21e8fb6d00cba20611b087aa69217b824ab54 Mon Sep 17 00:00:00 2001
From: Bdale Garbee <bdale@gag.com>
Date: Tue, 7 Jun 2022 16:20:11 -0400
Subject: [PATCH] first stab at restructuring binary packaging

---
 debian/{docs => altos-common.docs}            |  0
 .../{altos.install => altos-common.install}   |  0
 ...overrides => altos-jars.lintian-overrides} |  0
 debian/{dirs => altos.dirs}                   |  0
 debian/control                                | 56 +++++++++++++++++--
 debian/rules                                  | 24 +++++++-
 6 files changed, 73 insertions(+), 7 deletions(-)
 rename debian/{docs => altos-common.docs} (100%)
 rename debian/{altos.install => altos-common.install} (100%)
 rename debian/{altos.lintian-overrides => altos-jars.lintian-overrides} (100%)
 rename debian/{dirs => altos.dirs} (100%)

diff --git a/debian/docs b/debian/altos-common.docs
similarity index 100%
rename from debian/docs
rename to debian/altos-common.docs
diff --git a/debian/altos.install b/debian/altos-common.install
similarity index 100%
rename from debian/altos.install
rename to debian/altos-common.install
diff --git a/debian/altos.lintian-overrides b/debian/altos-jars.lintian-overrides
similarity index 100%
rename from debian/altos.lintian-overrides
rename to debian/altos-jars.lintian-overrides
diff --git a/debian/dirs b/debian/altos.dirs
similarity index 100%
rename from debian/dirs
rename to debian/altos.dirs
diff --git a/debian/control b/debian/control
index 10907558..e62ec69c 100644
--- 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/rules b/debian/rules
index 960da9ee..4479caa2 100755
--- 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
-- 
2.30.2