Temporarily revert Tobi's commits

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 2e11b1863ef81829eecca4b29e5b1a9565c7d0b3.
    " Fixed postinst script: Version is only valid when configuring."
This reverts commit 0babd5f3ca0ce0f4aad44e1f8ef803eafca215b2.
    "Remove '/var/lib/smartmontools' on purge (Closes: #766145)"
This reverts commit 0b361a554f367f2058b9c8b70d5c8a62fa448ad3.
    "Import patch from Helmut, #794035"
This reverts commit cf6a11185d0a8213297d692b3ee49e95ebd81291.
    "Import d/changelog from last uploaded version (6.3+svn4002-2)"

diff --git a/debian/changelog b/debian/changelog
index 17de6b6fb1f10e08c326a7f0cf95e3b4f75c7844..378d2b82ec51ba38f68978055e0ed96b6f55cbfe 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
 
   * [03a62f0] Set EnvironmentFile=-/etc/default/smartmontools in smartd.service

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

diff --git a/debian/smartmontools.postinst b/debian/smartmontools.postinst
index 1297c69c64713e0f88f1b30b1f575d2dc0ca544e..b2fcad00d81ddec32b508fb47d27d3ce8961fe11 100644 (file)
--- a/debian/smartmontools.postinst
+++ b/debian/smartmontools.postinst
@@ -2,20 +2,16 @@
 set -e
 
 # Remove shutdown and reboot links; this init script does not need them.
-case "$1" in
-  configure)
-       if dpkg --compare-versions "$2" lt "5.38+svn2879-1"; then
-               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
+if dpkg --compare-versions "$2" lt "5.38+svn2879-1"; then
+       if [ -e /etc/rc0.d/K20smartmontools ]; then
+               rm -f /etc/rc0.d/K20smartmontools
        fi
- ;;
-esac
+       if [ -e /etc/rc6.d/K20smartmontools ]; then
+               rm -f /etc/rc6.d/K20smartmontools
+       fi
+fi
 
 dpkg-maintscript-helper rm_conffile \
-       /etc/init.d/smartd 6.1+svn3812-1~ smartmontools -- "$@"
+       /etc/init.d/smartd 6.1+svn3812-1~ smartmontools -- "$@" 
 
 #DEBHELPER#

diff --git a/debian/smartmontools.postrm b/debian/smartmontools.postrm
deleted file mode 100644 (file)
index 6483078..0000000
--- a/debian/smartmontools.postrm
+++ /dev/null
@@ -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