unify systemd and Upstart package

Unrud · May 8, 2016 · f599cda · f599cda
1 parent b5de882
commit f599cda
Show file tree

Hide file tree

Showing 30 changed files with 41 additions and 197 deletions.
diff --git a/buid.sh b/buid.sh
diff --git a/package-ubuntu-vivid/debian/changelog → debian/changelog b/package-ubuntu-vivid/debian/changelog → debian/changelog
@@ -1,3 +1,14 @@
+init-headphone (0.11.0) stable;
+
+  * show error message if library not found
+  * improve logging
+  * show active default effect in help
+  * hide --force argument
+  * try to load missing kernel modules
+  * unify systemd and Upstart package
+
+ -- Unrud <unrud@openaliasbox.org>  Sun, 08 May 2016 09:32:21 +0200
+
 init-headphone (0.10.0-vivid) stable;
 
   * recognize more i2c bus names

diff --git a/debian/compat b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/package-ubuntu-vivid/debian/control → debian/control b/package-ubuntu-vivid/debian/control → debian/control
@@ -1,8 +1,8 @@
 Source: init-headphone
 Maintainer: Unrud <unrud@openaliasbox.org>
+Build-Depends: debhelper (>= 9), dh-systemd
 
 Package: init-headphone
 Architecture: all
-Priority: optional
-Depends: python
+Depends: ${misc:Depends}, python:any
 Description: Manage the headphone amplifier found in some Clevo laptops
diff --git a/...age-ubuntu-trusty/grub/init-headphone.cfg → debian/etc/grub/init-headphone.cfg b/...age-ubuntu-trusty/grub/init-headphone.cfg → debian/etc/grub/init-headphone.cfg
diff --git a/...age-ubuntu-trusty/pm-sleep/init-headphone → debian/etc/pm-utils/99init-headphone b/...age-ubuntu-trusty/pm-sleep/init-headphone → debian/etc/pm-utils/99init-headphone
diff --git a/debian/init-headphone.install b/debian/init-headphone.install
@@ -0,0 +1,3 @@
+src/init-headphone /usr/sbin/
+debian/etc/grub/init-headphone.cfg /etc/default/grub.d/
+debian/etc/pm-utils/99init-headphone usr/lib/pm-utils/sleep.d/
diff --git a/...ntu-trusty/debian/init-headphone.postinst → debian/init-headphone.postinst b/...ntu-trusty/debian/init-headphone.postinst → debian/init-headphone.postinst
@@ -1,8 +1,10 @@
 #!/bin/sh
 
+set -e
+
 NOTIFIER="/usr/share/update-notifier/notify-reboot-required"
 
-case "${1:-}" in
+case "$1" in
   configure|reconfigure)
     if type update-grub; then
       update-grub || true
@@ -11,6 +13,8 @@ case "${1:-}" in
       "$NOTIFIER" || true
     fi
     ;;
-
-  *) :;;
 esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/...buntu-trusty/debian/init-headphone.postrm → debian/init-headphone.postrm b/...buntu-trusty/debian/init-headphone.postrm → debian/init-headphone.postrm
@@ -1,11 +1,15 @@
 #!/bin/sh
 
-case "${1:-}" in
+set -e
+
+case "$1" in
   remove)
     if type update-grub; then
       update-grub || true
     fi
     ;;
-
-  *) :;;
 esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/...untu-vivid/systemd/init-headphone.service → debian/init-headphone.service b/...untu-vivid/systemd/init-headphone.service → debian/init-headphone.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Enable headphone jack on Clevo W230SS after suspend
+Description=Initialize headphone amplifier found in some Clevo laptops
 After=suspend.target
 After=hibernate.target
 After=hybrid-sleep.target

diff --git a/debian/init-headphone.upstart b/debian/init-headphone.upstart
@@ -0,0 +1,5 @@
+description "Initialize headphone amplifier found in some Clevo laptops"
+
+start on runlevel [2345]
+
+exec /usr/sbin/init-headphone
diff --git a/debian/rules b/debian/rules
@@ -0,0 +1,4 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@ --with systemd
diff --git a/package-ubuntu-trusty/build.sh b/package-ubuntu-trusty/build.sh
diff --git a/package-ubuntu-trusty/debian/changelog b/package-ubuntu-trusty/debian/changelog
diff --git a/package-ubuntu-trusty/debian/control b/package-ubuntu-trusty/debian/control
diff --git a/package-ubuntu-trusty/debian/init-headphone.install b/package-ubuntu-trusty/debian/init-headphone.install
diff --git a/package-ubuntu-trusty/debian/rules b/package-ubuntu-trusty/debian/rules
diff --git a/package-ubuntu-trusty/init/init-headphone.conf b/package-ubuntu-trusty/init/init-headphone.conf
diff --git a/package-ubuntu-trusty/modules-load/init-headphone.conf b/package-ubuntu-trusty/modules-load/init-headphone.conf
diff --git a/package-ubuntu-vivid/build.sh b/package-ubuntu-vivid/build.sh
diff --git a/package-ubuntu-vivid/debian/init-headphone.install b/package-ubuntu-vivid/debian/init-headphone.install
diff --git a/package-ubuntu-vivid/debian/init-headphone.postinst b/package-ubuntu-vivid/debian/init-headphone.postinst
diff --git a/package-ubuntu-vivid/debian/init-headphone.postrm b/package-ubuntu-vivid/debian/init-headphone.postrm
diff --git a/package-ubuntu-vivid/debian/rules b/package-ubuntu-vivid/debian/rules
diff --git a/package-ubuntu-vivid/grub/init-headphone.cfg b/package-ubuntu-vivid/grub/init-headphone.cfg
diff --git a/package-ubuntu-vivid/modules-load/init-headphone.conf b/package-ubuntu-vivid/modules-load/init-headphone.conf
diff --git a/package-ubuntu-vivid/systemd-links/hibernate.target.wants/init-headphone.service b/package-ubuntu-vivid/systemd-links/hibernate.target.wants/init-headphone.service
diff --git a/package-ubuntu-vivid/systemd-links/hybrid-sleep.target.wants/init-headphone.service b/package-ubuntu-vivid/systemd-links/hybrid-sleep.target.wants/init-headphone.service
diff --git a/package-ubuntu-vivid/systemd-links/multi-user.target.wants/init-headphone.service b/package-ubuntu-vivid/systemd-links/multi-user.target.wants/init-headphone.service
diff --git a/package-ubuntu-vivid/systemd-links/suspend.target.wants/init-headphone.service b/package-ubuntu-vivid/systemd-links/suspend.target.wants/init-headphone.service