[Pkg-wmaker-commits] [wmcore] 03/03: First attempt at Debian package.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Sat Feb 13 03:02:21 UTC 2016
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmcore.
commit dc596bda88fd5fdae3fc859d1a56d2da9303a465
Author: Doug Torrance <dtorrance at piedmont.edu>
Date: Fri Feb 12 21:46:47 2016 -0500
First attempt at Debian package.
---
debian/changelog | 5 ++
debian/compat | 1 +
debian/control | 25 +++++++
debian/copyright | 71 ++++++++++++++++++
debian/dirs | 1 +
debian/docs | 1 +
debian/manpages | 1 +
debian/patches/no_inlines.patch | 138 +++++++++++++++++++++++++++++++++++
debian/patches/series | 3 +
debian/patches/use_build_flags.patch | 19 +++++
debian/patches/use_destdir.patch | 14 ++++
debian/rules | 11 +++
debian/source/format | 1 +
debian/watch | 2 +
debian/wmcore.1 | 18 +++++
15 files changed, 311 insertions(+)
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..2d5f5e0
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+wmcore (0.0.2-1) unstable; urgency=low
+
+ * Initial release (Closes: #668081).
+
+ -- Doug Torrance <dtorrance at piedmont.edu> Fri, 12 Feb 2016 19:11:56 -0500
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..c0d6be5
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,25 @@
+Source: wmcore
+Section: x11
+Priority: optional
+Maintainer: Debian Window Maker Team <pkg-wmaker-devel at lists.alioth.debian.org>
+Uploaders: Doug Torrance <dtorrance at piedmont.edu>
+Build-Depends: debhelper (>= 9),
+ libx11-dev,
+ libxext-dev,
+ libxpm-dev
+Standards-Version: 3.9.7
+Homepage: http://www.bitmania.de/index.php?page=35
+Vcs-Browser: https://anonscm.debian.org/git/pkg-wmaker/wmcore.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-wmaker/wmcore.git
+
+Package: wmcore
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Dockapp that shows the usage of each core in the system
+ The dockapp splits into two displays, the upper one showing the common usage
+ of the system and the lower display showing one graph per each core.
+ .
+ It detects the number of cores and computes the usage to be represented as a
+ bar graph.
+ wmcore works with a variable number of cores. The display has been tested
+ with 1 up to 16 (simulated) cores.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..16f0b0c
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,71 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Upstream-Name: wmcore
+Upstream-Contact: bitman <bitman at bitmania.de>
+Source: http://www.bitmania.de/index.php?page=35
+
+Files: *
+Copyright: bitman <bitman at bitmania.de>
+License: GPL-2+
+
+Files: list.*
+Copyright: 1993-1994 Free Software Foundation, Inc.
+License: GPL-2+ with linking exception
+
+Files: misc.*
+Copyright: 1997 Alfredo K. Kojima
+License: GPL-2+
+
+Files: wmgeneral.*
+Copyright: 1998 Martijn Pieterse <pieterse at xs4all.nl>
+License: GPL-2+
+Comment: Source file says "wmgeneral was taken from wmppp", and wmppp is
+ licensed GPL-2+.
+
+Files: debian/*
+Copyright: 2016 Doug Torrance <dtorrance at piedmont.edu>
+License: GPL-2+
+
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in "/usr/share/common-licenses/GPL-2".
+
+License: GPL-2+ with linking exception
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+ .
+ As a special exception, if you link this library with files compiled with
+ GCC to produce an executable, this does not cause the resulting executable
+ to be covered by the GNU General Public License. This exception does not
+ however invalidate any other reasons why the executable file might be
+ covered by the GNU General Public License.
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..e772481
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1 @@
+usr/bin
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..e845566
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1 @@
+README
diff --git a/debian/manpages b/debian/manpages
new file mode 100644
index 0000000..7dfb65c
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1 @@
+debian/wmcore.1
diff --git a/debian/patches/no_inlines.patch b/debian/patches/no_inlines.patch
new file mode 100644
index 0000000..da0d584
--- /dev/null
+++ b/debian/patches/no_inlines.patch
@@ -0,0 +1,138 @@
+Description: Remove inline keywords.
+ Previously, if we attempted to build using C99 or later, we got "inline
+ function declared but never defined" warnings and eventual "undefined
+ reference" errors. As a result, it fails to build from source using gcc5.
+ .
+ However, if we move the definitions to list.h and add "extern inline"
+ declarations to list.c, which does compile using C99 and later, then it no
+ longer compiles using gnu90, the default for gcc4.
+ .
+ To avoid this mess, we remove the inline keywords altogether.
+Origin: http://repo.or.cz/dockapps.git/commitdiff/7d77c17
+Last-Update: 2016-02-12
+
+--- a/list.c
++++ b/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/list.h
++++ b/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
new file mode 100644
index 0000000..45133ca
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+no_inlines.patch
+use_destdir.patch
+use_build_flags.patch
diff --git a/debian/patches/use_build_flags.patch b/debian/patches/use_build_flags.patch
new file mode 100644
index 0000000..876e5b0
--- /dev/null
+++ b/debian/patches/use_build_flags.patch
@@ -0,0 +1,19 @@
+Description: Get build flags from dkg-buildflags.
+Author: Doug Torrance <dtorrance at piedmont.edu>
+Last-Update: 2016-02-12
+
+--- a/Makefile
++++ b/Makefile
+@@ -8,10 +8,10 @@
+
+
+ .c.o:
+- cc $(CFLAGS) -Wall -c -O3 $< -o $*.o
++ cc $(CPPFLAGS) $(CFLAGS) -Wall -c -O3 $< -o $*.o
+
+ wmlmon: $(OBJS)
+- cc $(CFLAGS) -Wall -o wmcore $^ $(LIBDIR) $(LIBS)
++ cc $(LDFLAGS) -Wall -o wmcore $^ $(LIBDIR) $(LIBS)
+
+ clean::
+ for i in $(OBJS) ; do \
diff --git a/debian/patches/use_destdir.patch b/debian/patches/use_destdir.patch
new file mode 100644
index 0000000..8d75cb8
--- /dev/null
+++ b/debian/patches/use_destdir.patch
@@ -0,0 +1,14 @@
+Description: Set DESTDIR so binary installs correctly.
+Author: Doug Torrance <dtorrance at piedmont.edu>
+Last-Update: 2016-02-12
+
+--- a/Makefile
++++ b/Makefile
+@@ -19,6 +19,6 @@
+ done
+ rm -f wmcore
+ install::
+- $(INSTALL) -c wmcore /usr/bin/wmcore
++ $(INSTALL) -c wmcore $(DESTDIR)/usr/bin/wmcore
+ uninstall:
+ rm -f /usr/bin/wmcore
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..74c4882
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,11 @@
+#!/usr/bin/make -f
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+UVER = $(shell dpkg-parsechangelog -S Version | sed 's/-[^-]$$//g')
+
+%:
+ dh $@
+
+get-orig-source:
+ wget http://www.bitmania.de/pub/wmcore-$(UVER).tar.gz
+ mv wmcore-$(UVER).tar.gz ../wmcore_$(UVER).orig.tar.gz
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..95e017e
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+# Upstream doesn't have a link directly to tarball on homepage. Use
+# get-orig-source target in debian/rules.
diff --git a/debian/wmcore.1 b/debian/wmcore.1
new file mode 100644
index 0000000..8c22c8f
--- /dev/null
+++ b/debian/wmcore.1
@@ -0,0 +1,18 @@
+.TH WMCORE "1" "February 2016" "0.0.2"
+.SH NAME
+wmcore \- Dockapp that shows the usage of each core in the system
+.SH SYNOPSIS
+.B wmcore
+[\fI\,OPTIONS\/\fR]
+.SH OPTIONS
+.TP
+.BI \-h
+Print the help screen.
+.TP
+.BI \-d \ n
+Number of microseconds of delay between each screen update. (The default is
+1000000 = 1 sec.)
+.SH AUTHOR
+wmcore was written by bitman <bitman at bitmania.de>.
+This manual page was written by Doug Torrance <dtorrance at piedmont.edu> for the
+Debian GNU/Linux system (but may be used by others).
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmcore.git
More information about the Pkg-wmaker-commits
mailing list