summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/003-typo-man.patch55
-rwxr-xr-xdebian/rules6
3 files changed, 57 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 70b08dd..be68ce5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ ipmiutil (2.9.6-1) UNRELEASED; urgency=medium
- Add year 2015.
* Refresh patches:
- debian/patches/005-init.patch.
+ - debian/patches/003-typo-man.patch.
-- Jörg Frings-Fürst <debian@jff-webhosting.net> Wed, 12 Nov 2014 17:12:39 +0100
diff --git a/debian/patches/003-typo-man.patch b/debian/patches/003-typo-man.patch
index 3dbcf90..9d4be3e 100644
--- a/debian/patches/003-typo-man.patch
+++ b/debian/patches/003-typo-man.patch
@@ -5,9 +5,9 @@ Last-Update: 2014-06-04
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: trunk/doc/iseltime.8
===================================================================
---- trunk.orig/doc/iseltime.8 2013-07-11 17:08:38.000000000 +0200
-+++ trunk/doc/iseltime.8 2014-08-09 15:06:01.000000000 +0200
-@@ -54,7 +54,7 @@
+--- trunk.orig/doc/iseltime.8
++++ trunk/doc/iseltime.8
+@@ -54,7 +54,7 @@ Use a specified IPMI LAN Authentication
Use a specified IPMI LAN privilege level. 1=Callback level, 2=User level, 3=Operator level, 4=Administrator level (default), 5=OEM level.
.IP "-Y"
Yes, do prompt the user for the IPMI LAN remote password.
@@ -16,3 +16,52 @@ Index: trunk/doc/iseltime.8
.SH "SEE ALSO"
+Index: trunk/doc/iekanalyzer.8
+===================================================================
+--- trunk.orig/doc/iekanalyzer.8
++++ trunk/doc/iekanalyzer.8
+@@ -114,7 +114,7 @@ Display point to point physical connecti
+ AMC slot B2 topology:
+ Port 0 =====> On Carrier Device ID 0, Port 3
+ Port 2 =====> AMC slot B1, Port 2
+- *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
++ *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
+ From Carrier file: carrierfru
+ On Carrier Device ID 0 topology:
+ Port 0 =====> AMC slot B1, Port 4
+@@ -170,7 +170,7 @@ and an AMC module or between 2 AMC modul
+ Link Type: AMC.2 Ethernet
+ Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link
+ Link Group ID: 0 || Link Asym. Match: exact match
+- *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
++ *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
+ AMC slot B1 port 1 ==> On-Carrier Device 0 port 12
+ Matching Result
+ From On-Carrier Device ID 0
+@@ -183,7 +183,7 @@ and an AMC module or between 2 AMC modul
+ Link Type: AMC.2 Ethernet
+ Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link
+ Link Group ID: 0 || Link Asym. Match: exact match
+- *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
++ *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
+ On-Carrier Device vs AMC slot A2
+ AMC slot A2 port 0 ==> On-Carrier Device 0 port 3
+ Matching Result
+@@ -197,7 +197,7 @@ and an AMC module or between 2 AMC modul
+ Link Type: AMC.2 Ethernet
+ Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link
+ Link Group ID: 0 || Link Asym. Match: exact match
+- *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
++ *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
+ AMC slot B1 vs AMC slot A2
+ AMC slot A2 port 2 ==> AMC slot B1 port 2
+ Matching Result
+@@ -211,7 +211,7 @@ and an AMC module or between 2 AMC modul
+ Link Type: AMC.3 Storage
+ Link Type extension: Serial Attached SCSI (SAS/SATA)
+ Link Group ID: 0 || Link Asym. Match: FC or SAS interface {exact match}
+- *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
++ *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
+ .TP
+ \fIunmatch\fP \fBxx=filename\fR \fBxx=filename\fR \fB...\fr
+ .br
diff --git a/debian/rules b/debian/rules
index 59df3b7..6ed560b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,17 +2,19 @@
# -*- makefile -*-
# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+# export DH_VERBOSE=1
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+CFLAGS += -fPIC
+CONFPARA = --enable-gpl --enable-useflags --enable-libsensors
%:
dh $@ --with autotools-dev --with systemd
override_dh_auto_configure:
$(CURDIR)/beforeconf.sh
- dh_auto_configure
+ dh_auto_configure -- $(CONFPARA)
override_dh_autoreconf:
dh_autoreconf --exclude=mkinstalldirs