+smartmontools (6.4+svn4109-1) unstable; urgency=medium
+
+ * New upstream version. Closes: #789721.
+ * Add myself to uploaders.
+ * refresh 54_remove-Id-from-smartd.conf.diff and 61_cciss-doc.patch
+
+ -- Jonathan Dowland <jmtd@debian.org> Wed, 18 Nov 2015 19:52:41 +0000
+
smartmontools (6.3+svn4002-1) unstable; urgency=low
* [03a62f0] Set EnvironmentFile=-/etc/default/smartmontools in smartd.service
Section: utils
Priority: optional
Maintainer: Giuseppe Iuculano <iuculano@debian.org>
-Uploaders: Florian Maier <contact@marsmenschen.com>
+Uploaders: Florian Maier <contact@marsmenschen.com>, Jonathan Dowland <jmtd@debian.org>
Build-Depends: debhelper (>= 7), libcam-dev [kfreebsd-any], freebsd-glue [kfreebsd-any], automake1.11, autoconf, libcap-ng-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !sparc !avr32], libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libusb2-dev [kfreebsd-i386 kfreebsd-amd64], dh-systemd (>= 1.13)
Standards-Version: 3.9.5
Vcs-Git: git://anonscm.debian.org/collab-maint/smartmontools.git
patch gets things to parity with the 3ware documentation with a couple
minor exceptions
+diff --git a/smartd.conf b/smartd.conf
+index 715258e..d5d71ff 100644
--- a/smartd.conf
+++ b/smartd.conf
-@@ -92,6 +92,12 @@
+@@ -92,6 +92,12 @@ DEVICESCAN -n standby -m root -M exec /usr/share/smartmontools/smartd-runner
# NOTE: On Windows, DEVICESCAN works also for 3ware controllers.
#/dev/hdc,0 -a -s L/../../2/01
#/dev/hdc,1 -a -s L/../../2/03
# Monitor 3 ATA disks directly connected to a HighPoint RocketRAID. Start long
# self-tests Sundays between 1-2, 2-3, and 3-4 am.
+diff --git a/smartd.conf.5.in b/smartd.conf.5.in
+index 21b031f..66a254b 100644
--- a/smartd.conf.5.in
+++ b/smartd.conf.5.in
-@@ -92,10 +92,11 @@
- .B # This is an example smartd startup config file
- .B # /usr/local/etc/smartd.conf for monitoring three
- .B # ATA disks, three SCSI disks, six ATA disks
--.B # behind two 3ware controllers, three SATA disks
--.B # directly connected to the HighPoint Rocket-
--.B # RAID controller, two SATA disks connected to
--.B # the HighPoint RocketRAID controller via a pmport
-+.B # behind two 3ware controllers, two disks on a cciss
-+.B # controller, three SATA disks directly connected
-+.B # to the HighPoint Rocket-RAID controller,
-+.B # two SATA disks connected to the HighPoint
-+.B # RocketRAID controller via a pmport
- .B # device, four SATA disks connected to an Areca
- .B # RAID controller, and one SATA disk.
- .B #
-@@ -170,6 +171,12 @@
+@@ -157,6 +157,12 @@ Section below!
.B \ \ /dev/tws0 -d 3ware,1 -a -s L/../../7/02
.\" %ENDIF OS FreeBSD
.B #
.B # Three SATA disks on a HighPoint RocketRAID controller.
.B # Start short self-tests daily between 1-2, 2-3, and
.B # 3-4 am.
-@@ -1463,6 +1470,9 @@
+@@ -1450,6 +1456,9 @@ configuration file Directives might be:
If you want more frequent information, use:
.B -a.
Fixed example path in man pages
---- a/smartd.conf.5.in
-+++ b/smartd.conf.5.in
-@@ -1568,7 +1568,7 @@
+Index: smartmontools/smartd.conf.5.in
+===================================================================
+--- smartmontools.orig/smartd.conf.5.in
++++ smartmontools/smartd.conf.5.in
+@@ -1553,7 +1553,7 @@ sleep 30
.fi
Some example scripts are distributed with the smartmontools package,
SRC_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p'| cut -d':' -f2)
SVN_REVISION := $(shell echo $(SRC_VERSION) | awk -F"+" '{ print $$2 }' | sed 's/svn//' )
TARBALL = $(PACKAGE)_$(SRC_VERSION).orig.tar.gz
+SVN_ROOT := 'https://svn.code.sf.net/p/smartmontools/code/trunk/smartmontools'
get-orig-source:
rm -rf get-orig-source $(TARBALL)
mkdir get-orig-source
- svn export -r $(SVN_REVISION) https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk/smartmontools/ \
+ svn export -r $(SVN_REVISION) $(SVN_ROOT) \
get-orig-source/$(PACKAGE)-$(SRC_VERSION).orig
rm -rf get-orig-source/$(PACKAGE)-$(SRC_VERSION).orig/os_solaris_ata.s
GZIP=--best tar czf $(TARBALL) -C get-orig-source $(PACKAGE)-$(SRC_VERSION).orig