proxmox-mirrors/mirror_smartmontools-debian
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_smartmontools-debian synced 2025-08-13 14:23:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Temporarily revert Tobi's commits

Browse Source 
Rewind to Giuseppe's last version temporarily. I'll then cherry-pick
my commits (that have been uploaded), tag then re-apply Tobi's.

This reverts commit 2e11b1863e.
    " Fixed postinst script: Version is only valid when configuring."
This reverts commit 0babd5f3ca.
    "Remove '/var/lib/smartmontools' on purge (Closes: #766145)"
This reverts commit 0b361a554f.
    "Import patch from Helmut, #794035"
This reverts commit cf6a11185d.
    "Import d/changelog from last uploaded version (6.3+svn4002-2)"
This commit is contained in:
Jonathan Dowland 2015-11-26 11:16:45 +00:00
parent 2e11b1863e
commit 1863f91881
4 changed files with 10 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
debian/changelog vendored
View File

@ -1,24 +1,3 @@
smartmontools (6.3+svn4002-2.1) UNRELEASED; urgency=medium
[ Helmut Grohne ]
* Non-maintainer upload.
* Fix FTCBFS. (Closes: #794035)
+ Pass --build and --host to configure
[ Tobias Frost ]
* Import patch from Helmut (see above)
* Remove '/var/lib/smartmontools' on purge (Closes: #766145)
* Fixed postinst script: Version is only valid when configuring.
(Closes: #766146)
-- Helmut Grohne <helmut@subdivi.de> Thu, 30 Jul 2015 01:18:49 +0200
smartmontools (6.3+svn4002-2) unstable; urgency=low
* [12d5f9d] Correct maintscript syntax (Closes: #766178)
-- Giuseppe Iuculano <iuculano@debian.org> Tue, 21 Oct 2014 13:30:40 +0200
smartmontools (6.3+svn4002-1) unstable; urgency=low smartmontools (6.3+svn4002-1) unstable; urgency=low
* [03a62f0] Set EnvironmentFile=-/etc/default/smartmontools in smartd.service * [03a62f0] Set EnvironmentFile=-/etc/default/smartmontools in smartd.service

6
debian/rules vendored
View File

@ -9,8 +9,8 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
DPKG_EXPORT_BUILDFLAGS = 1 DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk include /usr/share/dpkg/buildflags.mk
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
ifeq ($(DEB_HOST_ARCH_OS),linux) ifeq ($(DEB_HOST_ARCH_OS),linux)
CONFIGURE_ARGS += --with-selinux CONFIGURE_ARGS += --with-selinux
@ -52,8 +52,6 @@ configure-stamp:
dh_testdir dh_testdir
./autogen.sh ./autogen.sh
CFLAGS="${CFLAGS}" CXXFLAGS="${CFLAGS}" ./configure --prefix=/usr \ CFLAGS="${CFLAGS}" CXXFLAGS="${CFLAGS}" ./configure --prefix=/usr \
--build=$(DEB_BUILD_GNU_TYPE) \
--host=$(DEB_HOST_GNU_TYPE) \
--sysconfdir=/etc \ --sysconfdir=/etc \
--mandir=/usr/share/man \ --mandir=/usr/share/man \
--with-initscriptdir=no \ --with-initscriptdir=no \

18
debian/smartmontools.postinst vendored
View File

@ -2,18 +2,14 @@
set -e set -e
# Remove shutdown and reboot links; this init script does not need them. # Remove shutdown and reboot links; this init script does not need them.
case "$1" in if dpkg --compare-versions "$2" lt "5.38+svn2879-1"; then
configure) if [ -e /etc/rc0.d/K20smartmontools ]; then
if dpkg --compare-versions "$2" lt "5.38+svn2879-1"; then rm -f /etc/rc0.d/K20smartmontools
if [ -e /etc/rc0.d/K20smartmontools ]; then
rm -f /etc/rc0.d/K20smartmontools
fi
if [ -e /etc/rc6.d/K20smartmontools ]; then
rm -f /etc/rc6.d/K20smartmontools
fi
fi fi
;; if [ -e /etc/rc6.d/K20smartmontools ]; then
esac rm -f /etc/rc6.d/K20smartmontools
fi
fi
dpkg-maintscript-helper rm_conffile \ dpkg-maintscript-helper rm_conffile \
/etc/init.d/smartd 6.1+svn3812-1~ smartmontools -- "$@" /etc/init.d/smartd 6.1+svn3812-1~ smartmontools -- "$@"

14
debian/smartmontools.postrm vendored
View File

@ -1,14 +0,0 @@
#!/bin/sh
case "$1" in
purge)
if [ -d /var/lib/smartmontools ] ; then
rm -rf /var/lib/smartmontools
fi
;;
esac
#DEBHELPER#
exit 0