[Pkg-wmaker-commits] [wmcube] 03/07: 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 wmcube.

commit 6983b5919d8f8ba88d719722b2d127eb726f1c3c
Author: Doug Torrance <dtorrance at piedmont.edu>
Date:   Sun Feb 28 20:19:39 2016 -0500

    debian/patches: Remove directory; patches applied upstream.
---
 debian/patches/manpage_escape_hyphens.patch |  18 ----
 debian/patches/remove_inline_keywords.patch | 130 ----------------------------
 debian/patches/series                       |   2 -
 3 files changed, 150 deletions(-)

diff --git a/debian/patches/manpage_escape_hyphens.patch b/debian/patches/manpage_escape_hyphens.patch
deleted file mode 100644
index f94d2e6..0000000
--- a/debian/patches/manpage_escape_hyphens.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Escape hyphens.
- Avoids hyphen-used-as-minus-sign Lintian warning.
-Author: Doug Torrance <dtorrance at piedmont.edu>
-Last-Update: 2015-02-19
-
---- a/wmcube/wmcube.1
-+++ b/wmcube/wmcube.1
-@@ -55,8 +55,8 @@
- display this help.
- 
- .SH TIPS & TRICKS
--By combining together -RG, -RB, or -GB switches you get yellow, magenta, or cyan
--images.  Combining -RGB switches produces the gray image \-\- the same as without
-+By combining together \-RG, \-RB, or \-GB switches you get yellow, magenta, or cyan
-+images.  Combining \-RGB switches produces the gray image \-\- the same as without
- any swiches.
- 
- .SH PROGRAM AUTHORS
diff --git a/debian/patches/remove_inline_keywords.patch b/debian/patches/remove_inline_keywords.patch
deleted file mode 100644
index d77ee28..0000000
--- a/debian/patches/remove_inline_keywords.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-Description: Remove inline keywords; allows builds using gcc5.
-Origin: http://repo.or.cz/w/dockapps.git/commitdiff/7d77c17
-Bug-Debian: http://bugs.debian.org/790293
-Last-Update: 2015-07-15
-
---- a/wmgeneral/list.c
-+++ b/wmgeneral/list.c
-@@ -38,7 +38,7 @@
- 
- /* Return a cons cell produced from (head . tail) */
- 
--INLINE LinkedList* 
-+LinkedList* 
- list_cons(void* head, LinkedList* tail)
- {
-   LinkedList* cell;
-@@ -51,7 +51,7 @@
- 
- /* Return the length of a list, list_length(NULL) returns zero */
- 
--INLINE int
-+int
- list_length(LinkedList* list)
- {
-   int i = 0;
-@@ -66,7 +66,7 @@
- /* Return the Nth element of LIST, where N count from zero.  If N 
-    larger than the list length, NULL is returned  */
- 
--INLINE void*
-+void*
- list_nth(int index, LinkedList* list)
- {
-   while(index-- != 0)
-@@ -81,7 +81,7 @@
- 
- /* Remove the element at the head by replacing it by its successor */
- 
--INLINE void
-+void
- list_remove_head(LinkedList** list)
- {
-   if (!*list) return;  
-@@ -101,7 +101,7 @@
- 
- /* Remove the element with `car' set to ELEMENT */
- /*
--INLINE void
-+void
- list_remove_elem(LinkedList** list, void* elem)
- {
-   while (*list)
-@@ -112,7 +112,7 @@
-     }
- }*/
- 
--INLINE LinkedList *
-+LinkedList *
- list_remove_elem(LinkedList* list, void* elem)
- {
-     LinkedList *tmp;
-@@ -132,7 +132,7 @@
- 
- /* Return element that has ELEM as car */
- 
--INLINE LinkedList*
-+LinkedList*
- list_find(LinkedList* list, void* elem)
- {
-   while(list)
-@@ -146,7 +146,7 @@
- 
- /* Free list (backwards recursive) */
- 
--INLINE void
-+void
- list_free(LinkedList* list)
- {
-   if(list)
-@@ -158,7 +158,7 @@
- 
- /* Map FUNCTION over all elements in LIST */
- 
--INLINE void
-+void
- list_mapcar(LinkedList* list, void(*function)(void*))
- {
-   while(list)
---- a/wmgeneral/list.h
-+++ b/wmgeneral/list.h
-@@ -29,31 +29,25 @@
- #ifndef __LIST_H_
- #define __LIST_H_
- 
--#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
--# define INLINE inline
--#else
--# define INLINE
--#endif
--
- typedef struct LinkedList {
-   void *head;
-   struct LinkedList *tail;
- } LinkedList;
- 
--INLINE LinkedList* list_cons(void* head, LinkedList* tail);
-+LinkedList* list_cons(void* head, LinkedList* tail);
- 
--INLINE int list_length(LinkedList* list);
-+int list_length(LinkedList* list);
- 
--INLINE void* list_nth(int index, LinkedList* list);
-+void* list_nth(int index, LinkedList* list);
- 
--INLINE void list_remove_head(LinkedList** list);
-+void list_remove_head(LinkedList** list);
- 
--INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem);
-+LinkedList *list_remove_elem(LinkedList* list, void* elem);
- 
--INLINE void list_mapcar(LinkedList* list, void(*function)(void*));
-+void list_mapcar(LinkedList* list, void(*function)(void*));
- 
--INLINE LinkedList*list_find(LinkedList* list, void* elem);
-+LinkedList*list_find(LinkedList* list, void* elem);
- 
--INLINE void list_free(LinkedList* list);
-+void list_free(LinkedList* list);
- 
- #endif
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 7a7fd52..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-manpage_escape_hyphens.patch
-remove_inline_keywords.patch

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