[Pkg-wmaker-commits] [wmpinboard] 10/30: Imported Debian patch 1.0-11
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Wed Jan 27 23:31:38 UTC 2016
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmpinboard.
commit 6401050a302b9380ff27f04abae0074b8f848a95
Author: Marc 'HE' Brockschmidt <he at debian.org>
Date: Sat Oct 2 13:25:25 2004 +0200
Imported Debian patch 1.0-11
---
debian/changelog | 38 ++++++++++++++++++++++++++++++++++++++
debian/control | 6 +++---
debian/copyright | 8 +++-----
debian/menu | 2 +-
debian/rules | 26 ++++++++++++--------------
src/wmpinboard.c | 20 ++++++++++++++------
6 files changed, 71 insertions(+), 29 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6395fb5..130f692 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,41 @@
+wmpinboard (1.0-11) unstable; urgency=low
+
+ * Fixed weird scrollwheel behaviour when trying to {in,de}crease numbers
+ (using the scrollwheel always decreased the number). Thanks for noticing
+ and fixing to Marcel Moreaux <marcelm at luon.net>. (Closes: #273743)
+
+ -- Marc 'HE' Brockschmidt <he at debian.org> Sat, 2 Oct 2004 13:25:25 +0200
+
+wmpinboard (1.0-10) unstable; urgency=low
+
+ * Fixed segfault when creating a new note. Patch 'stolen' from Gentoo's
+ wmpinboard-1.0.ebuild. Patch written by Michele Noberasco
+ <s4t4n at gentoo.org>, thanks. Also thanks to Adeodato Sim <asp16 at alu.ua.es>
+ for reporting the fix. (Closes: #260260)
+
+ -- Marc 'HE' Brockschmidt <he at debian.org> Thu, 22 Jul 2004 18:44:48 +0200
+
+wmpinboard (1.0-9) unstable; urgency=low
+
+ * debian/control:
+ + I'm a DD.
+ + Updated B-D to match the new XFree packaging.
+ * debian/menu: Quote everything.
+
+ -- Marc 'HE' Brockschmidt <he at debian.org> Thu, 15 Jul 2004 19:34:37 +0200
+
+wmpinboard (1.0-8) unstable; urgency=low
+
+ * New maintainer. (Closes: #218444)
+ * Fix: Now doesn't enter edit mode anytime one clicks on a note only
+ containing a drawing - Patch from Martin Stigge <martin at stigge.org>.
+ (Closes: #215886)
+ * Bumped Standards-Version to 3.6.1 (no changes)
+ * debian/rules: Cleanup
+ * debian/copyright: Stripped boilerplate (s) to make lintian happy
+
+ -- Marc Brockschmidt <marc at dch-faq.de> Sun, 2 Nov 2003 13:14:10 +0100
+
wmpinboard (1.0-7) unstable; urgency=low
* Fix spelling mistake in description. Thanks to Matt Zimmerman for
diff --git a/debian/control b/debian/control
index 3e9705f..6ad9cba 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
Source: wmpinboard
Section: x11
Priority: optional
-Maintainer: Henrique de Moraes Holschuh <hmh at debian.org>
-Standards-Version: 3.5.0.0
-Build-Depends: xlibs-dev, debhelper
+Maintainer: Marc 'HE' Brockschmidt <he at debian.org>
+Standards-Version: 3.6.1
+Build-Depends: libx11-dev | xlibs-dev (>> 4.1.0), libxext-dev | xlibs-dev (>> 4.1.0), libxpm-dev | xlibs-dev (>> 4.1.0), libxt-dev | xlibs-dev (>> 4.1.0), debhelper (>= 4)
Package: wmpinboard
Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 3f850a0..25676d6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,15 +1,13 @@
-Copyright information for wmpinboard
-$Id: copyright,v 1.2 2001/03/24 17:15:02 hmh Exp $
-
This package was debianized by Henrique M. Holschuh <hmh at debian.org> on
-Sat, 29 Jul 2000 19:42:11 -0300.
+Sat, 29 Jul 2000 19:42:11 -0300. It is now maintained by Marc Brockschmidt
+<marc at dch-faq.de>.
It was downloaded from http://www.tu-ilmenau.de/~gomar/stuff/wmpinboard/
Packaging done based on the work of the previous maintainer,
Darren Benham <gecko at debian.org>
-Upstream Author(s): Marco Goetze <gomar at mindless.com>
+Upstream Author: Marco Goetze <gomar at mindless.com>
Copyright: GNU General Public License, revision 2 or any later
revision thereof. A copy of this license is available in
diff --git a/debian/menu b/debian/menu
index ccd1505..6f8aaa0 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,2 +1,2 @@
-?package(wmpinboard):needs=X11 section=Apps/Tools hints="Dockapp,Desktop"\
+?package(wmpinboard):needs="X11" section="Apps/Tools" hints="Dockapp,Desktop"\
title="wmPinboard" command="/usr/bin/wmpinboard"
diff --git a/debian/rules b/debian/rules
index d94ed6d..dbac414 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,23 +1,25 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-#
-# Modified for wmpinboard
-# $Id: rules,v 1.8 2001/07/03 03:37:03 hmh Exp $
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
# This is the debhelper compatability version to use.
export DH_COMPAT=1
+TMP=$(CURDIR)/debian/tmp
+
+CFLAGS = -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+
configure-stamp:
dh_testdir
touch configure.in Makefile.am */Makefile.am && sleep 2s && \
touch aclocal.m4 Makefile.in */Makefile.in && sleep 2s && \
touch stamp-h.in && sleep 2s && \
touch config.h.in configure
- ./configure --prefix=/usr --mandir=\$${prefix}/share/man
+ CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --mandir=\$${prefix}/share/man
touch configure-stamp
configure:
@@ -48,7 +50,7 @@ install: build
dh_installdirs
# Add here commands to install the package into debian/tmp.
- $(MAKE) install prefix=`pwd`/debian/tmp/usr
+ $(MAKE) install DESTDIR=$(TMP)
# Build architecture-independent files here.
@@ -57,20 +59,16 @@ binary-indep: build install
# Build architecture-dependent files here.
binary-arch: build install
-# dh_testversion
dh_testdir
dh_testroot
-# dh_installdebconf
dh_installdocs
dh_installexamples
dh_installmenu
-# dh_installmanpages
dh_installchangelogs ChangeLog
dh_link
dh_strip
dh_compress
dh_fixperms
- # You may want to make some executables suid here.
dh_installdeb
dh_shlibdeps
dh_gencontrol
diff --git a/src/wmpinboard.c b/src/wmpinboard.c
index 40751c7..6d53dea 100644
--- a/src/wmpinboard.c
+++ b/src/wmpinboard.c
@@ -165,7 +165,7 @@ notes_io(int save)
char t[STRING_BUF_SIZE];
FILE *file;
int pid = (int) getpid();
- static int sizes[6];
+ static int sizes[7];
sizes[0] = size_0;
sizes[1] = size_1;
sizes[2] = size_2;
@@ -1538,7 +1538,7 @@ handle_ButtonRelease(XEvent *event)
}
} else { /* moved */
if (state.cur_note >= 0) {
- if (string_empty(ndata[state.cur_note].text, 0)) { /* new note */
+ if (note_empty(state.cur_note)) { /* new note */
animate_note(4);
set_kbfocus(1);
set_mode(M_EDIT);
@@ -1717,7 +1717,14 @@ handle_ButtonRelease(XEvent *event)
{
if (state.abar_pressed < 4) { /* clicked on number */
char c = state.a_edit[state.abar_pressed];
- char delta = state.button == 1 ? 1 : -1;
+ char delta;
+ switch (state.button) {
+ case 1: delta = 1; break; /* Left mouse button */
+ case 3: delta = -1; break; /* Right mouse button */
+ case 4: delta = 1; break; /* Scrollwheel up */
+ case 5: delta = -1; break; /* Scrollwheel down */
+ default: delta = 0; break; /* Unknown button; ignore */
+ }
switch (state.abar_pressed) {
case 0: c = (24+c+delta)%24; break;
@@ -1855,7 +1862,7 @@ void
handle_KeyPress(XEvent *event)
{
KeySym ksym;
- unsigned char ch[4];
+ char ch[4];
char *s;
int i, j = 0;
@@ -1916,8 +1923,9 @@ handle_KeyPress(XEvent *event)
}
} else {
if (InputContext) {
- j = XmbLookupString(InputContext, &event->xkey, (char*) ch, sizeof(ch),
- &ksym, 0);
+ Status status_return;
+ j = XmbLookupString(InputContext, &event->xkey, ch, sizeof(ch),
+ &ksym, &status_return);
} else {
j = XLookupString(&event->xkey, (char*) ch, sizeof(ch), &ksym,
&state.compose);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmpinboard.git
More information about the Pkg-wmaker-commits
mailing list