diff options
| -rw-r--r-- | debian/changelog | 143 | ||||
| -rw-r--r-- | debian/control | 9 | ||||
| -rwxr-xr-x | dh | 7 | ||||
| -rwxr-xr-x | dh_fixperms | 7 | ||||
| -rwxr-xr-x | dh_installifupdown | 3 | ||||
| -rwxr-xr-x | dh_installinit | 5 | ||||
| -rwxr-xr-x | dh_installmodules | 5 | ||||
| -rwxr-xr-x | dh_installudev | 5 | ||||
| -rwxr-xr-x | dh_systemd_enable | 7 | ||||
| -rwxr-xr-x | dh_systemd_start | 7 |
10 files changed, 175 insertions, 23 deletions
diff --git a/debian/changelog b/debian/changelog index fe0c72f9..cd5ad4df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -577,7 +577,7 @@ debhelper (11) unstable; urgency=medium -- Niels Thykier <niels@thykier.net> Sat, 16 Dec 2017 15:41:17 +0000 -debhelper (10.10.9) unstable; urgency=medium +debhelper (10.10.9~dyson1) unstable; urgency=medium [ Dmitry Shachnev ] * qmake.pm: Add missing import of generated_file. @@ -596,7 +596,10 @@ debhelper (10.10.9) unstable; urgency=medium (Closes: #882083) * dh_missing: Improve the wording about "debian/not-installed". - -- Niels Thykier <niels@thykier.net> Sun, 19 Nov 2017 11:04:45 +0000 + [ Igor Pashev ] + * Package for Dyson + + -- Igor Pashev <pashev.igor@gmail.com> Sun, 19 Nov 2017 14:15:25 +0300 debhelper (10.10.8) unstable; urgency=medium @@ -1520,8 +1523,21 @@ debhelper (10.2) unstable; urgency=medium -- Niels Thykier <niels@thykier.net> Sun, 02 Oct 2016 06:20:56 +0000 -debhelper (10.1) unstable; urgency=medium +debhelper (10+unreleased+dyson3) unstable; urgency=medium + + * Added usr/share/debhelper, usr/share/perl5 + + -- Igor Pashev <pashev.igor@gmail.com> Wed, 21 Sep 2016 23:16:11 +0300 + +debhelper (10+unreleased+dyson2) unstable; urgency=medium + + * Added debian/install with 'usr/bin' (WTF?) + -- Igor Pashev <pashev.igor@gmail.com> Wed, 21 Sep 2016 23:12:35 +0300 + +debhelper (10+unreleased+dyson1) unstable; urgency=medium + + [ Niels Thykier ] * Apply patch from Michael Biebl to take over dh-systemd package to ease backporting to jessie-backports. (Closes: #837585) @@ -1548,6 +1564,10 @@ debhelper (10.1) unstable; urgency=medium * d/copyright: Correct copyright and license of dh_systemd* tools. + [ Igor Pashev ] + * Package for Dyson + * dh_systemd_* are stubs on non-linux + -- Niels Thykier <niels@thykier.net> Sat, 01 Oct 2016 20:45:27 +0000 debhelper (10) unstable; urgency=medium @@ -2113,6 +2133,23 @@ debhelper (9.20150811) unstable; urgency=medium -- Niels Thykier <niels@thykier.net> Tue, 11 Aug 2015 22:47:08 +0200 +debhelper (9.20150629+dyson1) unstable; urgency=medium + + [ Niels Thykier ] + * d/changelog: Add missing entry for dh_md5sums/#786695 in + the 9.20150628 release. + * Makefile: Set LC_ALL=C when sorting. + * dh: Avoid passing --parallel to other debhelper commands + if it is the only option and "parallel" is not set (or + set to 1) in DEB_BUILD_OPTIONS. + * dh_strip: Apply patch from Guillem Jover to fix a typo. + (Closes: #792207) + + [ Igor Pashev ] + * Package for Dyson + + -- Igor Pashev <pashev.igor@gmail.com> Thu, 16 Jul 2015 20:49:16 +0300 + debhelper (9.20150628) unstable; urgency=medium * Upload to unstable with ddebs support disabled by default. @@ -2372,6 +2409,12 @@ debhelper (9.20141107) unstable; urgency=medium -- Joey Hess <joeyh@debian.org> Fri, 07 Nov 2014 17:15:10 -0400 +debhelper (9.20141022+dyson1) unstable; urgency=medium + + * Package for Dyson + + -- Igor Pashev <pashev.igor@gmail.com> Thu, 23 Oct 2014 21:32:33 +0400 + debhelper (9.20141022) unstable; urgency=low * dh_installdeb: Sort conffile list so there is a stable order for @@ -2428,6 +2471,12 @@ debhelper (9.20140613) unstable; urgency=medium -- Joey Hess <joeyh@debian.org> Fri, 13 Jun 2014 11:50:09 -0400 +debhelper (9.20140229~dyson1) unstable; urgency=medium + + * Package for Dyson + + -- Igor Pashev <pashev.igor@gmail.com> Wed, 21 May 2014 13:18:12 +0400 + debhelper (9.20140228) unstable; urgency=medium * Fix breakage in no-act mode introduced in last release. @@ -2436,12 +2485,6 @@ debhelper (9.20140228) unstable; urgency=medium debhelper (9.20140227) unstable; urgency=medium - * dh_compress: Avoid compressing .map files, which may be html - usemaps. Closes: #704443 - * dh_installdocs: When doc dirs are symlinked make the dependency - versioned per policy. Closes: #676777 - * dh_makeshlibs: Defer propagating dpkg-gensymbols error until - all packages have been processed. Closes: #736640 * dh: Reject unknown parameters that are not dashed command-line parameters intended to be passed on to debhelper commands. Closes: #737635 @@ -2457,6 +2500,21 @@ debhelper (9.20140227) unstable; urgency=medium -- Joey Hess <joeyh@debian.org> Thu, 27 Feb 2014 11:49:56 -0400 +debhelper (9.20131228~dyson1) unstable; urgency=medium + + [ Joey Hess ] + * dh_compress: Avoid compressing .map files, which may be html + usemaps. Closes: #704443 + * dh_installdocs: When doc dirs are symlinked make the dependency + versioned per policy. Closes: #676777 + * dh_makeshlibs: Defer propagating dpkg-gensymbols error until + all packages have been processed. Closes: #736640 + + [ Igor Pashev ] + * Package for Dyson + + -- Igor Pashev <pashev.igor@gmail.com> Sun, 02 Feb 2014 00:10:21 +0400 + debhelper (9.20131227) unstable; urgency=medium [ Guillem Jover ] @@ -2618,6 +2676,19 @@ debhelper (9.20130516) unstable; urgency=low -- Joey Hess <joeyh@debian.org> Thu, 16 May 2013 18:29:46 -0400 +debhelper (9.20130509+dyson2) unstable; urgency=low + + * dh_installinit does nothing on illumos + + -- Igor Pashev <pashev.igor@gmail.com> Fri, 19 Jul 2013 04:14:03 +0400 + +debhelper (9.20130509+dyson1) unstable; urgency=low + + * Use dh_smf in dh sequence if DEB_HOST_ARCH_OS is illumos + and /usr/bin/dh_smf is available + + -- Igor Pashev <pashev.igor@gmail.com> Thu, 18 Jul 2013 21:42:27 +0400 + debhelper (9.20130509) unstable; urgency=low * dh_installinit: Remove obsolete systemd-tempfiles hack in postinst @@ -2656,8 +2727,16 @@ debhelper (9.20130507) unstable; urgency=low -- Joey Hess <joeyh@debian.org> Tue, 07 May 2013 13:20:48 -0400 -debhelper (9.20130504) unstable; urgency=low +debhelper (9.20121015+1) unstable; urgency=low + + * Return dh_installinit into dh sequense, because + dh_python2 use it to insert itself + + -- Igor Pashev <pashev.igor@gmail.com> Wed, 01 May 2013 04:34:44 +0400 + +debhelper (9.20121015) unstable; urgency=low + [ Joey Hess ] * dh_shlibdeps: Warn if -V flag is passed, to avoid it accidentially being used here rather than in dh_makeshlibs. Closes: #680339 * dh_lintian: Source overrides doc improvement. Closes: #683941 @@ -2690,7 +2769,12 @@ debhelper (9.20130504) unstable; urgency=low * dh_auto_test: Avoid doing anything when cross-compiling. Closes: #703262 * dh_testdir: Fix error message. Closes: #703515 - -- Joey Hess <joeyh@debian.org> Sat, 04 May 2013 23:32:27 -0400 + [ Igor Pashev ] + * Built for Dyson + - Enable ldconfig again + + + -- Igor Pashev <pashev.igor@gmail.com> Tue, 16 Oct 2012 00:11:57 +0400 debhelper (9.20120909) unstable; urgency=low @@ -2809,6 +2893,27 @@ debhelper (9.20120322) unstable; urgency=low -- Joey Hess <joeyh@debian.org> Thu, 22 Mar 2012 17:37:56 -0400 +debhelper (9.20120312+dyson3) unstable; urgency=low + + * dh_installifupdown is a stub. + * don't mention dh_installsmf - it is not needed + and does not exist at all. + * Removed dh_installifupdown and dh_installinit from dh sequence + + -- Igor Pashev <pashev.igor@gmail.com> Thu, 31 May 2012 00:07:43 +0000 + +debhelper (9.20120312+dyson2) unstable; urgency=low + + * SMF manifests and method are not conffiles + + -- Igor Pashev <pashev.igor@gmail.com> Sat, 26 May 2012 00:50:42 +0000 + +debhelper (9.20120312+dyson1) unstable; urgency=low + + * Merged with upstream + + -- Igor Pashev <pashev.igor@gmail.com> Thu, 15 Mar 2012 16:35:27 +0400 + debhelper (9.20120312) unstable; urgency=low * Also include CFLAGS in ld line for perl. Closes: #662666 @@ -2843,6 +2948,22 @@ debhelper (9.20120115) unstable; urgency=low -- Joey Hess <joeyh@debian.org> Sun, 15 Jan 2012 13:59:49 -0400 +debhelper (8.9.15-2) unstable; urgency=low + + * Bump version + + -- Igor Pashev <pashev.igor@gmail.com> Sat, 04 Feb 2012 13:49:49 +0400 + +debhelper (8.9.15-1) unstable; urgency=low + + * Ported to Dyson + * dh_installudev and dh_installmodules are stubs + * dh_fixperm: chmod +x /lib/svc/method/* + * dh_installdeb: SMF methods and manifests are conffiles + * dh_makeshlibs: don't use ldconfig + + -- Igor Pashev <pashev.igor@gmail.com> Sat, 07 Jan 2012 18:44:49 +0400 + debhelper (8.9.14) unstable; urgency=low * Typo. Closes: #653006 diff --git a/debian/control b/debian/control index e7abda31..e1fa38b4 100644 --- a/debian/control +++ b/debian/control @@ -59,12 +59,3 @@ Description: helper programs for debian/rules files, fix file permissions, integrate your package with the Debian menu system, debconf, doc-base, etc. Most Debian packages use debhelper as part of their build process. - -Package: dh-systemd -Section: oldlibs -Architecture: all -Multi-Arch: foreign -Depends: debhelper (>= 9.20160709), - ${misc:Depends}, -Description: debhelper add-on to handle systemd unit files - transitional package - This package is for transitional purposes and can be removed safely. @@ -397,7 +397,6 @@ my @i = (qw{ dh_installcron dh_installdebconf dh_installemacsen - dh_installifupdown dh_installinfo dh_installinit }, @@ -406,7 +405,6 @@ my @i = (qw{ qw{ dh_installmenu dh_installmime - dh_installmodules dh_installlogcheck dh_installlogrotate dh_installpam @@ -573,6 +571,11 @@ sub _compute_addons { push(@addon_requests, map { "+${_}" } Debian::Debhelper::Dh_Lib::bd_dh_sequences()); push(@addon_requests, @addon_requests_from_args); + if (dpkg_architecture_value('DEB_HOST_ARCH_OS') eq 'illumos' + && -x '/usr/bin/dh_smf') { + push(@addon_requests, '+smf'); + } + # Removing disabled add-ons are expensive (O(N) per time), so we # attempt to make removals in bulk. Note that we have to be order # preserving (due to #885580), so there is a limit to how "smart" diff --git a/dh_fixperms b/dh_fixperms index 393381fd..c2b736e2 100755 --- a/dh_fixperms +++ b/dh_fixperms @@ -156,8 +156,13 @@ on_pkgs_in_parallel { # Files in $tmp/etc/sudoers.d/ must be mode 0440. find_and_reset_perm("${tmp}/etc/sudoers.d", '0440', "-type f ! -perm 440"); + + # SMF methods should be executable. + if (-d "$tmp/lib/svc/method") { + find_and_reset_perm("${tmp}/lib/svc/method", '+x', '-type f'); + } } -}; +} =head1 SEE ALSO diff --git a/dh_installifupdown b/dh_installifupdown index bd0aaf44..ce1dc442 100755 --- a/dh_installifupdown +++ b/dh_installifupdown @@ -9,6 +9,7 @@ dh_installifupdown - install if-up and if-down hooks use strict; use warnings; use Debian::Debhelper::Dh_Lib; +exit 0; our $VERSION = DH_BUILTIN_VERSION; @@ -17,6 +18,8 @@ our $VERSION = DH_BUILTIN_VERSION; B<dh_installifupdown> [S<I<debhelper options>>] [B<--name=>I<name>] =head1 DESCRIPTION +B<dh_installifupdown> on this system does nothing and is kept only for +compatibility and references. B<dh_installifupdown> is a debhelper program that is responsible for installing F<if-up>, F<if-down>, F<if-pre-up>, and F<if-post-down> hook scripts into package build diff --git a/dh_installinit b/dh_installinit index 7ba8504a..1a049279 100755 --- a/dh_installinit +++ b/dh_installinit @@ -11,6 +11,8 @@ use warnings; use Debian::Debhelper::Dh_Lib; use File::Find; +exit 0 if dpkg_architecture_value('DEB_HOST_ARCH_OS') eq 'illumos'; + our $VERSION = DH_BUILTIN_VERSION; =head1 SYNOPSIS @@ -19,6 +21,9 @@ B<dh_installinit> [S<I<debhelper options>>] [B<--name=>I<name>] [B<-n>] [B<-R>] =head1 DESCRIPTION +B<dh_installinit> on illumos-based systems does nothing and is kept only for +compatibility and consistency. + B<dh_installinit> is a debhelper program that is responsible for installing init scripts with associated defaults files. In compatibility levels up to and including 10, B<dh_installinit> will diff --git a/dh_installmodules b/dh_installmodules index 46ef0241..fea1d09d 100755 --- a/dh_installmodules +++ b/dh_installmodules @@ -11,6 +11,8 @@ use warnings; use Debian::Debhelper::Dh_Lib; use File::Find; +exit 0; + our $VERSION = DH_BUILTIN_VERSION; =head1 SYNOPSIS @@ -19,6 +21,9 @@ B<dh_installmodules> [S<I<debhelper options>>] [B<-n>] [B<--name=>I<name>] =head1 DESCRIPTION +B<dh_installmodules> is for Linux based distros. On this system it does nothing +and is kept only for compatibility and references. + B<dh_installmodules> is a debhelper program that is responsible for registering kernel modules. diff --git a/dh_installudev b/dh_installudev index cab558ba..0c630860 100755 --- a/dh_installudev +++ b/dh_installudev @@ -12,12 +12,17 @@ use Debian::Debhelper::Dh_Lib; our $VERSION = DH_BUILTIN_VERSION; +exit 0; + =head1 SYNOPSIS B<dh_installudev> [S<I<debhelper options>>] [B<-n>] [B<--name=>I<name>] [B<--priority=>I<priority>] =head1 DESCRIPTION +B<dh_installudev> is for Linux based distros. On this system it does nothing +and is kept only for compatibility and references. + B<dh_installudev> is a debhelper program that is responsible for installing B<udev> rules files. diff --git a/dh_systemd_enable b/dh_systemd_enable index 017bdd24..0f6a9184 100755 --- a/dh_systemd_enable +++ b/dh_systemd_enable @@ -11,6 +11,13 @@ use warnings; use Debian::Debhelper::Dh_Lib; use File::Find; +my $deb_host_arch_os = dpkg_architecture_value('DEB_HOST_ARCH_OS'); +if ($deb_host_arch_os ne 'linux') +{ + warning("systemd is unsupported on $deb_host_arch_os, doing nothing"); + exit(0); +} + our $VERSION = DH_BUILTIN_VERSION; =head1 SYNOPSIS diff --git a/dh_systemd_start b/dh_systemd_start index 7f824be9..04752beb 100755 --- a/dh_systemd_start +++ b/dh_systemd_start @@ -12,6 +12,13 @@ use Debian::Debhelper::Dh_Lib; use File::Find; use Cwd qw(getcwd abs_path); +my $deb_host_arch_os = dpkg_architecture_value('DEB_HOST_ARCH_OS'); +if ($deb_host_arch_os ne 'linux') +{ + warning("systemd is unsupported on $deb_host_arch_os, doing nothing"); + exit(0); +} + our $VERSION = DH_BUILTIN_VERSION; =head1 SYNOPSIS |