[Pkg-wmaker-commits] [wmdrawer] 09/23: debian/patches/makefile.patch: Convert old patches to Makefile to quilt with some revisions.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Sat Dec 17 05:16:18 UTC 2016
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmdrawer.
commit 685d6813766392f012c8ae3588cf2b767c627d4c
Author: Doug Torrance <dtorrance at piedmont.edu>
Date: Fri Dec 16 00:19:57 2016 -0500
debian/patches/makefile.patch: Convert old patches to Makefile to quilt
with some revisions.
---
debian/patches/makefile.patch | 55 +++++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 56 insertions(+)
diff --git a/debian/patches/makefile.patch b/debian/patches/makefile.patch
new file mode 100644
index 0000000..57e8dc4
--- /dev/null
+++ b/debian/patches/makefile.patch
@@ -0,0 +1,55 @@
+Description: Makefile patches.
+ This patch combines several pre-quilt patches to the Makefile. In particular,
+ * Use /usr instead of /usr/local.
+ * Choose gdk-pixbuf-2.0 for the image library.
+ * Do not strip binary (fix for bug #438269).
+ * Do not install upstream manpage. (Instead, we use dh_installman to install
+ a manpage from the debian directory.)
+ * Do not install COPYING or INSTALL. (We depart from the original patches and
+ now use dh_installdocs, dh_installchangelogs, and dh_installexamples for the
+ remaining doc files.)
+Author: Francois Gurin <matrix at debian.org>
+Author: Barry deFreese <bdefreese at debian.org>
+Author: Doug Torrance <dtorrance at piedmont.edu>
+Bug-Debian: https://bugs.debian.org/438269
+Last-Update: 2016-12-16
+
+--- a/Makefile
++++ b/Makefile
+@@ -11,13 +11,13 @@
+
+ DESTDIR =
+
+-PREFIX = $(DESTDIR)/usr/local
++PREFIX = $(DESTDIR)/usr
+ MANDIR = $(PREFIX)/man/man1
+ DOCDIR = $(PREFIX)/share/doc
+
+ # Image library
+-USE_GDKPIXBUF = 1
+-#USE_GDKPIXBUF2 = 1
++#USE_GDKPIXBUF = 1
++USE_GDKPIXBUF2 = 1
+ #USE_IMLIB = 1
+
+ DEFS = $(OS)
+@@ -62,18 +62,14 @@
+
+ wmdrawer : $(OBJS)
+ $(CC) $(LDFLAGS) -o $@ $(OBJS)
+- strip $@
+
+ clean :
+ $(RM) *.o $(PRGS)
+
+ install : wmdrawer
+ $(INSTALL) -m 755 wmdrawer $(PREFIX)/bin
+- $(INSTALL) -m 644 doc/wmdrawer.1x.gz $(MANDIR)
+- $(INSTALL) -d $(DOCDIR)/wmdrawer
+- $(INSTALL) -m 644 wmdrawerrc.example AUTHORS ChangeLog COPYING INSTALL README TODO $(DOCDIR)/wmdrawer
++
+
+ uninstall: clean
+ $(RM) $(PREFIX)/bin/wmdrawer
+- $(RM) $(MANDIR)/wmdrawer.1x.gz
+ $(RM) -rf $(DOCDIR)/wmdrawer
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..82374e5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+makefile.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmdrawer.git
More information about the Pkg-wmaker-commits
mailing list