[SCM] linuxptp/master: Removed patches no longer necessary

Tue Nov 10 19:36:04 UTC 2015

The following commit has been merged in the master branch:
commit e25ac993edefc0b87e36a84635852bdd23838d60
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Tue Nov 10 20:24:20 2015 +0100

    Removed patches no longer necessary

diff --git a/debian/patches/0001-Adjust-installation-directory-for-Debian.patch b/debian/patches/0001-Adjust-installation-directory-for-Debian.patch
deleted file mode 100644
index 69fff30..0000000
--- a/debian/patches/0001-Adjust-installation-directory-for-Debian.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Tino Mettler <tino+debian at tikei.de>
-Date: Wed, 17 Dec 2014 21:29:29 +0100
-Subject: Adjust installation directory for Debian
-
----
- makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/makefile b/makefile
-index 5469301..14ba206 100644
---- a/makefile
-+++ b/makefile
-@@ -37,9 +37,9 @@ incdefs := $(shell $(srcdir)/incdefs.sh)
- version := $(shell $(srcdir)/version.sh $(srcdir))
- VPATH	= $(srcdir)
- 
--prefix	= /usr/local
-+prefix	= $(DESTDIR)/usr
- sbindir	= $(prefix)/sbin
--mandir	= $(prefix)/man
-+mandir	= $(prefix)/share/man
- man8dir	= $(mandir)/man8
- 
- all: $(PRG)
diff --git a/debian/patches/0002-fix-spelling.patch b/debian/patches/0002-fix-spelling.patch
deleted file mode 100644
index 98a516f..0000000
--- a/debian/patches/0002-fix-spelling.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-Description: fix spelling in binaries and manpages
- fixed some minor hyphen-used-as-minus-sign mistakes in groff.
- fixed MANAGMENT -> MANAGEMENT
-Author: IOhannes m zmölnig
-Forwarded: <556DBB95.8020705 at iem.at>
-Last-Update: 2015-06-02
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- linuxptp.orig/pmc.c
-+++ linuxptp/pmc.c
-@@ -211,9 +211,9 @@
- 	}
- 	tlv = (struct TLV *) msg->management.suffix;
- 	if (tlv->type == TLV_MANAGEMENT) {
--		fprintf(fp, "MANAGMENT ");
-+		fprintf(fp, "MANAGEMENT ");
- 	} else if (tlv->type == TLV_MANAGEMENT_ERROR_STATUS) {
--		fprintf(fp, "MANAGMENT_ERROR_STATUS ");
-+		fprintf(fp, "MANAGEMENT_ERROR_STATUS ");
- 		goto out;
- 	} else {
- 		fprintf(fp, "unknown-tlv ");
---- linuxptp.orig/ptp4l.8
-+++ linuxptp/ptp4l.8
-@@ -1,6 +1,6 @@
- .TH PTP4l 8 "December 2014" "linuxptp"
- .SH NAME
--ptp4l \- PTP Boundary/Ordinary Clock
-+ptp4l - PTP Boundary/Ordinary Clock
- 
- .SH SYNOPSIS
- .B ptp4l
-@@ -170,7 +170,7 @@
- .B fault_reset_interval
- The time in seconds between the detection of a port's fault and the fault
- being reset. This value is expressed as a power of two. Setting this
--value to -128 or to the special key word "ASAP" will let the fault be
-+value to \-128 or to the special key word "ASAP" will let the fault be
- reset immediately.
- The default is 4 (16 seconds).
- .TP
-@@ -342,7 +342,7 @@
- .B pi_proportional_exponent
- The kp_exponent constant in the formula used to set the proportional constant of
- the PI controller from the sync interval.
--The default is -0.3.
-+The default is \-0.3.
- .TP
- .B pi_proportional_norm_max
- The kp_norm_max constant in the formula used to set the proportional constant of
---- linuxptp.orig/timemaster.8
-+++ linuxptp/timemaster.8
-@@ -1,7 +1,7 @@
- .TH TIMEMASTER 8 "October 2014" "linuxptp"
- .SH NAME
- 
--timemaster \- run NTP with PTP as reference clocks
-+timemaster - run NTP with PTP as reference clocks
- 
- .SH SYNOPSIS
- 
-@@ -138,7 +138,7 @@
- Specify the maximum assumed roundtrip delay to the primary source of the time
- in this PTP domain. This value is included in the distance used by
- \fBchronyd\fR in the source selection algorithm to detect falsetickers and
--assign weights for source combining. The default value is 1e-4 (100
-+assign weights for source combining. The default value is 1e\-4 (100
- microseconds). With \fBntpd\fR, the \fBtos mindist\fR command can be used to
- set a limit with similar purpose globally for all time sources.
- 
-@@ -209,7 +209,7 @@
- .TP
- .B options
- Specify extra options that should be added to all \fBphc2sys\fR command lines.
--By default, \fB-l 5\fR is added to the command lines.
-+By default, \fB\-l 5\fR is added to the command lines.
- 
- .SS [ptp4l]
- 
-@@ -221,7 +221,7 @@
- .TP
- .B options
- Specify extra options that should be added to all \fBptp4l\fR command lines. By
--default, \fB-l 5\fR is added to the command lines.
-+default, \fB\-l 5\fR is added to the command lines.
- 
- .SS [ptp4l.conf]
- Settings specified in this section are copied directly to the configuration
-@@ -286,8 +286,8 @@
- [ptp_domain 0]
- interfaces eth0 eth1
- ntp_poll 0
--phc2sys_poll -2
--delay 10e-6
-+phc2sys_poll \-2
-+delay 10e\-6
- ptp4l_option clock_servo linreg
- ptp4l_option delay_mechanism P2P
- 
-@@ -307,7 +307,7 @@
- 
- [ntpd]
- path /usr/sbin/ntpd
--options -u ntp:ntp
-+options \-u ntp:ntp
- 
- [ntp.conf]
- restrict default nomodify notrap nopeer noquery
-@@ -317,7 +317,7 @@
- 
- [phc2sys]
- path /usr/sbin/phc2sys
--options -l 5
-+options \-l 5
- 
- [ptp4l]
- path /usr/sbin/ptp4l
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 735dc0d..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Adjust-installation-directory-for-Debian.patch
-0002-fix-spelling.patch

-- 
linuxptp packaging

