[Pkg-wmaker-commits] [wmmixer] 14/19: debian/patches: Remove patches; no longer necessary now that upstream uses autotools for build.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Wed Aug 30 04:09:21 UTC 2017
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmmixer.
commit 101e85530af62ce76b718b4ff000da37eb7bf706
Author: Doug Torrance <dtorrance at piedmont.edu>
Date: Mon Aug 28 19:47:40 2017 -0400
debian/patches: Remove patches; no longer necessary
now that upstream uses autotools for build.
---
debian/patches/01_debian_paths.patch | 19 --------------
debian/patches/02_Makefile_optimization.patch | 21 ---------------
debian/patches/03_Makefile_hardening.patch | 38 ---------------------------
debian/patches/series | 3 ---
4 files changed, 81 deletions(-)
diff --git a/debian/patches/01_debian_paths.patch b/debian/patches/01_debian_paths.patch
deleted file mode 100644
index f89d000..0000000
--- a/debian/patches/01_debian_paths.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: This patch changes the installation path to /usr
-Author: Sandro Tosi <matrixhasu at gmail.com>
-Last-Update: 2007-10-08
---- a/Makefile
-+++ b/Makefile
-@@ -1,12 +1,10 @@
- # $Id: Makefile,v 1.5 2002/06/25 22:13:09 gordon Exp $
-
--prefix = /usr/local
-+prefix = /usr
- exec_prefix = ${prefix}
- bindir = ${exec_prefix}/bin
- mandir = ${prefix}/share/man
-
--DESTDIR =
--
- CXX = g++
- CXXFLAGS = -O -Wall
- EXTRA_LIBS = -L/usr/X11R6/lib -lX11 -lXpm -lXext
diff --git a/debian/patches/02_Makefile_optimization.patch b/debian/patches/02_Makefile_optimization.patch
deleted file mode 100644
index 260b175..0000000
--- a/debian/patches/02_Makefile_optimization.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: This patch includes the optimization parameters for g++
-Author: Sandro Tosi <matrixhasu at gmail.com>
-Last-Update: 2007-10-08
---- a/Makefile
-+++ b/Makefile
-@@ -6,7 +6,14 @@
- mandir = ${prefix}/share/man
-
- CXX = g++
--CXXFLAGS = -O -Wall
-+CXXFLAGS = -Wall -g
-+
-+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-+ CXXFLAGS += -O0
-+else
-+ CXXFLAGS += -O2
-+endif
-+
- EXTRA_LIBS = -L/usr/X11R6/lib -lX11 -lXpm -lXext
-
-
diff --git a/debian/patches/03_Makefile_hardening.patch b/debian/patches/03_Makefile_hardening.patch
deleted file mode 100644
index ae9624d..0000000
--- a/debian/patches/03_Makefile_hardening.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: This patch renames the CXXFLAGS variable to CPPFLAGS and include extra "+" in CPPFLAGS and LDFLAGS to allow include the Debian Hardening compiler flags.
-Author: Rodolfo García Peñas (kix) <kix at debian.org>
-Last-Update: 2013-07-21
---- a/Makefile
-+++ b/Makefile
-@@ -6,19 +6,19 @@
- mandir = ${prefix}/share/man
-
- CXX = g++
--CXXFLAGS = -Wall -g
-+CPPFLAGS += -Wall -g
-
- ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-- CXXFLAGS += -O0
-+ CPPFLAGS += -O0
- else
-- CXXFLAGS += -O2
-+ CPPFLAGS += -O2
- endif
-
- EXTRA_LIBS = -L/usr/X11R6/lib -lX11 -lXpm -lXext
-
-
- LD = g++
--LDFLAGS = -o $(EXECUTABLE) $(CXXFLAGS)
-+LDFLAGS += -o $(EXECUTABLE) $(CPPFLAGS)
-
- EXECUTABLE = wmmixer
- OBJS = xhandler.o mixctl.o wmmixer.o exception.o
-@@ -28,7 +28,7 @@
- INSTALL_PROGRAM = $(INSTALL) -D -p -o root -g root -m 755
-
- .cc.o:
-- $(CXX) $(CXXFLAGS) -c -o $@ $<
-+ $(CXX) $(CPPFLAGS) -c -o $@ $<
-
- $(EXECUTABLE): $(OBJS)
- $(LD) $(LDFLAGS) $(OBJS) $(EXTRA_LIBDIRS) $(EXTRA_LIBS)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index f3c4337..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-01_debian_paths.patch
-02_Makefile_optimization.patch
-03_Makefile_hardening.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmmixer.git
More information about the Pkg-wmaker-commits
mailing list