[Pkg-wmaker-commits] [wmtime] 25/101: Imported Debian patch 1.0b2-10
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Mon Aug 24 23:59:25 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmtime.
commit 78cfceb5d23979a478dd92f15fbd8d4e63dca243
Author: Paul Harris <harris.pc at gmail.com>
Date: Tue Jul 15 15:24:09 2008 +0800
Imported Debian patch 1.0b2-10
---
debian/changelog | 9 +++++++
debian/control | 6 ++---
debian/copyright | 5 ++--
debian/menu | 4 +--
debian/r | 75 ---------------------------------------------------
debian/rules | 3 ---
wmgeneral/wmgeneral.c | 18 ++++++++-----
wmtime/wmtime.c | 14 +++++-----
8 files changed, 37 insertions(+), 97 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 342b4d6..f9682a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+wmtime (1.0b2-10) unstable; urgency=low
+
+ * New maintainer. (Closes: #487135)
+ * Checked the debian files against the latest standard. (Closes: Bug#379574)
+ * Moved menu item to Applications/System/Monitoring.
+ * Minor code corrections to avoid build warnings.
+
+ -- Paul Harris <harris.pc at gmail.com> Tue, 15 Jul 2008 15:24:09 +0800
+
wmtime (1.0b2-9) unstable; urgency=medium
* Fixed build dependencies so we no longer depend on libxpm4-dev.
diff --git a/debian/control b/debian/control
index 08109d9..16498db 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
Source: wmtime
Section: x11
Priority: optional
-Maintainer: Simon Law <sfllaw at debian.org>
-Standards-Version: 3.6.1
-Build-Depends: debhelper (>> 4.0.0), libx11-dev, libxpm-dev, libxext-dev
+Maintainer: Paul Harris <harris.pc at gmail.com>
+Build-Depends: debhelper (>= 7), libx11-dev, libxpm-dev, libxext-dev
+Standards-Version: 3.8.0
Package: wmtime
Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 03dc4b2..7e44a6e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -21,8 +21,9 @@ Upstream Copyright:
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, write to the Free Software
- Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ along with this program; if not, write to the
+ Free Software Foundation, Inc.,
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
On Debian GNU/Linux systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
diff --git a/debian/menu b/debian/menu
index 99b8cef..c39150a 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,6 +1,6 @@
?package(wmtime):\
needs="X11"\
- section="Apps/Tools"\
- title="WMTime"\
+ section="Applications/System/Monitoring"\
+ title="WMtime"\
command="/usr/bin/wmtime"\
hints="Clocks,Dockapp"
diff --git a/debian/r b/debian/r
deleted file mode 100644
index fa2ee13..0000000
--- a/debian/r
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# This file is public domain software, originally written by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-build: build-stamp
-build-stamp:
- dh_testdir
-
- # Add here commands to compile the package.
- cd wmtime; $(MAKE)
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
- -cd wmtime; $(MAKE) clean
- #-$(MAKE) distclean
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/<packagename>
- install -m 755 wmtime/wmtime `pwd`/debian/wmtime/usr/bin
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
-# dh_install
- dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installcatalogs
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
-# dh_undocumented
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_perl
-# dh_python
-# dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
diff --git a/debian/rules b/debian/rules
index 7903d30..5e50ce6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,6 @@ build: build-stamp
build-stamp:
dh_testdir
- # Add here commands to compile the package.
cd wmtime; $(MAKE)
touch build-stamp
@@ -45,7 +44,6 @@ clean:
dh_testroot
rm -f build-stamp
- # Add here commands to clean up after the build process.
-cd wmtime; $(MAKE) clean
dh_clean
@@ -56,7 +54,6 @@ install: build
dh_clean -k
dh_installdirs
- # Add here commands to install the package into debian/wmtime.
install -m 755 wmtime/wmtime $(CURDIR)/debian/wmtime/usr/bin
# Build architecture-independent files here.
diff --git a/wmgeneral/wmgeneral.c b/wmgeneral/wmgeneral.c
index bd8f8a0..d5fdcb6 100644
--- a/wmgeneral/wmgeneral.c
+++ b/wmgeneral/wmgeneral.c
@@ -46,6 +46,11 @@ int screen;
int x_fd;
int d_depth;
XSizeHints mysizehints;
+/* Deal with strange X11 function prototyping...
+ * If I don't do this, I will get warnings about the sign
+ * of the width/height variables - which are thrown away anyway. */
+int dummy_int_width, dummy_int_height;
+unsigned int uint_width, uint_height;
XWMHints mywmhints;
Pixel back_pix, fore_pix;
char *Geometry = "";
@@ -315,19 +320,20 @@ void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bit
XWMGeometry(display, screen, Geometry, NULL, borderwidth, &mysizehints,
&mysizehints.x, &mysizehints.y,
- &mysizehints.width, &mysizehints.height, &dummy);
+ &dummy_int_width, &dummy_int_height, &dummy);
if (geometry)
XParseGeometry(geometry, &mysizehints.x, &mysizehints.y,
- &mysizehints.width, &mysizehints.height);
+ &uint_width, &uint_height);
- mysizehints.width = 64;
- mysizehints.height = 64;
+ /* Override width/height anyway */
+ uint_width = 64;
+ uint_height = 64;
win = XCreateSimpleWindow(display, Root, mysizehints.x, mysizehints.y,
- mysizehints.width, mysizehints.height, borderwidth, fore_pix, back_pix);
+ uint_width, uint_height, borderwidth, fore_pix, back_pix);
iconwin = XCreateSimpleWindow(display, win, mysizehints.x, mysizehints.y,
- mysizehints.width, mysizehints.height, borderwidth, fore_pix, back_pix);
+ uint_width, uint_height, borderwidth, fore_pix, back_pix);
/* Activate hints */
XSetWMNormalHints(display, win, &mysizehints);
diff --git a/wmtime/wmtime.c b/wmtime/wmtime.c
index 803b8f5..2dfed0c 100644
--- a/wmtime/wmtime.c
+++ b/wmtime/wmtime.c
@@ -26,6 +26,8 @@
----
Changes:
----
+ 15/07/2008 (Paul Harris, harris.pc at gmail.com)
+ * Minor changes to correct build warnings
09/10/2003 (Simon Law, sfllaw at debian.org)
* Add -geometry support
* Add -noseconds support
@@ -82,9 +84,9 @@
/* Defines */
/***********/
-#define LEFT_ACTION (NULL)
-#define MIDDLE_ACTION (NULL)
-#define RIGHT_ACTION (NULL)
+const char* default_left_action = NULL;
+const char* default_middle_action = NULL;
+const char* default_right_action = NULL;
#define WMMON_VERSION "1.0b2"
@@ -211,9 +213,9 @@ void wmtime_routine(int argc, char **argv) {
char *conffile = NULL;
/* Scan through ~/.wmtimerc for the mouse button actions. */
- if (LEFT_ACTION) left_action = strdup(LEFT_ACTION);
- if (MIDDLE_ACTION) middle_action = strdup(MIDDLE_ACTION);
- if (RIGHT_ACTION) right_action = strdup(RIGHT_ACTION);
+ if (default_left_action) left_action = strdup(default_left_action);
+ if (default_middle_action) middle_action = strdup(default_middle_action);
+ if (default_right_action) right_action = strdup(default_right_action);
/* Scan through the .rc files */
if (asprintf(&conffile, "/etc/wmtimerc") >= 0) {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmtime.git
More information about the Pkg-wmaker-commits
mailing list