[Pkg-wmaker-commits] [libdockapp] 02/03: debian/patches: Remove directory; patches applied upstream.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository libdockapp.

commit 422c98b8613cce273dbd4480aae9f54027a23769
Author: Doug Torrance <dtorrance at piedmont.edu>
Date:   Thu Oct 22 05:11:46 2015 -0400

    debian/patches: Remove directory; patches applied upstream.
---
 debian/patches/clean_dockapp.pc.patch   | 15 -------------
 debian/patches/remove_AC_PATH_XTRA.diff | 37 ---------------------------------
 debian/patches/series                   |  2 --
 3 files changed, 54 deletions(-)

diff --git a/debian/patches/clean_dockapp.pc.patch b/debian/patches/clean_dockapp.pc.patch
deleted file mode 100644
index d3e1f16..0000000
--- a/debian/patches/clean_dockapp.pc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Clean generated file dockapp.pc.
-Author: Doug Torrance <dtorrance at piedmont.edu>
-Last-Update: 2015-08-15
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -23,6 +23,8 @@
- 	@echo 'Libs: -L${libdir} -ldockapp' >> $@
- 	@echo 'Cflags: -I${includedir}' >> $@
- 
-+CLEANFILES = dockapp.pc
-+
- EXTRA_DIST = BUGS
- 
- update-changelog:
diff --git a/debian/patches/remove_AC_PATH_XTRA.diff b/debian/patches/remove_AC_PATH_XTRA.diff
deleted file mode 100644
index bd95e04..0000000
--- a/debian/patches/remove_AC_PATH_XTRA.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Remove AC_PATH_XTRA macro from configure.ac
- We already check for libraries with the PKG_CHECK_MODULES macros.  This also
- allows us to drop the Build-Depend on libice-dev.
-Author: Doug Torrance <dtorrance at piedmont.edu>
-Last-Update: 2015-08-15
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,8 +25,6 @@
- AC_PROG_INSTALL
- 
- dnl Checks for libraries.
--AC_PATH_XTRA
--
- PKG_CHECK_MODULES([X11],[x11])
- PKG_CHECK_MODULES([Xext],[xext])
- PKG_CHECK_MODULES([xpm],[xpm])
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -3,7 +3,7 @@
- 
- lib_LTLIBRARIES = libdockapp.la
- 
--libdockapp_la_LDFLAGS = -version-info 3:0:0 @X_LIBS@
-+libdockapp_la_LDFLAGS = -version-info 3:0:0
- 
- otherincludedir = $(includedir)/libdockapp
- otherinclude_HEADERS = dockapp.h \
-@@ -30,7 +30,7 @@
- noinst_HEADERS = daargs.h dautil.h
- 
- AM_CFLAGS = $(X11_CFLAGS) $(Xext_CFLAGS) $(xpm_CFLAGS)
--AM_CPPFLAGS = @X_CFLAGS@ @CPPFLAGS@ @DFLAGS@
-+AM_CPPFLAGS = @CPPFLAGS@ @DFLAGS@
- LIBS += $(X11_LIBS) $(Xext_LIBS) $(xpm_LIBS)
- 
- LIBLIST = libdockapp.la @XLIBS@
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index eb8d8fc..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-remove_AC_PATH_XTRA.diff
-clean_dockapp.pc.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/libdockapp.git