diff -Nru wmii-3.10~20120413+hg2813/debian/changelog wmii-3.10~20120413+hg2813/debian/changelog --- wmii-3.10~20120413+hg2813/debian/changelog 2013-07-12 14:00:08.000000000 +0000 +++ wmii-3.10~20120413+hg2813/debian/changelog 2013-12-11 09:53:00.000000000 +0000 @@ -1,3 +1,32 @@ +wmii (3.10~20120413+hg2813-6ubuntu1) trusty; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/patches/21-fix-ftbfs-with-binutils-gold.patch: + + Add -ldl to fix FTBFS with binutils-gold + + -- Angel Abad Wed, 11 Dec 2013 10:51:15 +0100 + +wmii (3.10~20120413+hg2813-6) unstable; urgency=low + + * Set WMII_TERM to x-terminal-emulator, not xterm. + * Fix building on m68k (and probably somewhere else). + + -- Andrew Shadura Wed, 04 Dec 2013 22:34:00 +0100 + +wmii (3.10~20120413+hg2813-5) unstable; urgency=low + + * Update wmiirc to use new bar file structure (fixes Notice command). + * Patch witray to reposition tray when primary display changes. + + -- Andrew Shadura Mon, 02 Dec 2013 23:02:20 +0100 + +wmii (3.10~20120413+hg2813-4) unstable; urgency=low + + * Install libwmii_hack.so under a multiarchified private directory. + * Link properly against libixp. + + -- Andrew Shadura Sat, 30 Nov 2013 20:55:07 +0100 + wmii (3.10~20120413+hg2813-3ubuntu1) saucy; urgency=low * debian/patches/fix-ftbfs-with-binutils-gold: diff -Nru wmii-3.10~20120413+hg2813/debian/patches/03-font.patch wmii-3.10~20120413+hg2813/debian/patches/03-font.patch --- wmii-3.10~20120413+hg2813/debian/patches/03-font.patch 2012-05-20 23:44:30.000000000 +0000 +++ wmii-3.10~20120413+hg2813/debian/patches/03-font.patch 2013-12-04 12:07:34.000000000 +0000 @@ -58,3 +58,4 @@ set -- $(echo $WMII_NORMCOLORS $WMII_FOCUSCOLORS) export WMII_TERM="@TERMINAL@" + diff -Nru wmii-3.10~20120413+hg2813/debian/patches/04-xterm.patch wmii-3.10~20120413+hg2813/debian/patches/04-xterm.patch --- wmii-3.10~20120413+hg2813/debian/patches/04-xterm.patch 1970-01-01 00:00:00.000000000 +0000 +++ wmii-3.10~20120413+hg2813/debian/patches/04-xterm.patch 2013-12-04 12:08:03.000000000 +0000 @@ -0,0 +1,13 @@ +Use x-terminal-emulator, not xterm + +--- a/config.mk ++++ b/config.mk +@@ -14,7 +14,7 @@ + INCLUDES = -I. -I$(ROOT)/include -I$(INCLUDE) -I/usr/include + LIBS = -L$(ROOT)/lib -L/usr/lib + +-TERMINAL = xterm ++TERMINAL = x-terminal-emulator + + # Flags + include $(ROOT)/mk/gcc.mk diff -Nru wmii-3.10~20120413+hg2813/debian/patches/16-rc-fixes.patch wmii-3.10~20120413+hg2813/debian/patches/16-rc-fixes.patch --- wmii-3.10~20120413+hg2813/debian/patches/16-rc-fixes.patch 1970-01-01 00:00:00.000000000 +0000 +++ wmii-3.10~20120413+hg2813/debian/patches/16-rc-fixes.patch 2013-12-02 22:00:03.000000000 +0000 @@ -0,0 +1,17 @@ +Subject: Fix Notice command. + +--- a/rc/wmiirc.sh ++++ b/rc/wmiirc.sh +@@ -108,10 +108,10 @@ + fi + }& + Event Notice +- wmiir xwrite $noticebar $wi_arg ++ wmiir xwrite $noticebar "label $wi_arg" + + kill $xpid 2>/dev/null # Let's hope this isn't reused... +- { sleep $noticetimeout; wmiir xwrite $noticebar ' '; }& ++ { sleep $noticetimeout; wmiir xwrite $noticebar 'label '; }& + xpid = $! + + # Menus diff -Nru wmii-3.10~20120413+hg2813/debian/patches/17-witray-fix.patch wmii-3.10~20120413+hg2813/debian/patches/17-witray-fix.patch --- wmii-3.10~20120413+hg2813/debian/patches/17-witray-fix.patch 1970-01-01 00:00:00.000000000 +0000 +++ wmii-3.10~20120413+hg2813/debian/patches/17-witray-fix.patch 2013-12-02 21:58:57.000000000 +0000 @@ -0,0 +1,47 @@ +From: Andrew Shadura +Subject: Fix witray on multi-monitor setups + +As witray is displayed on primary screen only, +every time primary screen changes, update the +tray position. + +--- a/cmd/tray/tray.c ++++ b/cmd/tray/tray.c +@@ -77,7 +77,7 @@ + + sethandler(tray.win, &handlers); + pushhandler(&scr.root, &root_handlers, nil); +- selectinput(&scr.root, scr.root.eventmask | PropertyChangeMask); ++ selectinput(&scr.root, scr.root.eventmask | PropertyChangeMask | StructureNotifyMask); + + + changeprop_string(tray.win, "_WMII_TAGS", tray.tags); +@@ -409,6 +409,20 @@ + }; + + static bool ++root_config_event(Window *w, void *aux, XConfigureEvent *ev) { ++ ++ USED(aux); ++ int n; ++ Rectangle *rects; ++ ++ rects = xinerama_screens(&n); ++ ++ scr.rect = rects[0]; ++ tray_update(); ++ return false; ++} ++ ++static bool + property_event(Window *w, void *aux, XPropertyEvent *ev) { + if(ev->atom == NET("CURRENT_DESKTOP")) + tray_resize(tray.r); +@@ -418,6 +432,7 @@ + } + + static Handlers root_handlers = { ++ .config = root_config_event, + .property = property_event, + }; + diff -Nru wmii-3.10~20120413+hg2813/debian/patches/20-libixp-link.patch wmii-3.10~20120413+hg2813/debian/patches/20-libixp-link.patch --- wmii-3.10~20120413+hg2813/debian/patches/20-libixp-link.patch 1970-01-01 00:00:00.000000000 +0000 +++ wmii-3.10~20120413+hg2813/debian/patches/20-libixp-link.patch 2013-12-04 21:01:35.000000000 +0000 @@ -0,0 +1,65 @@ +Subject: Link against system libixp wherever it is. + +--- a/config.mk ++++ b/config.mk +@@ -30,7 +30,7 @@ + + X11PACKAGES = x11 xinerama xrender xrandr + INCX11 = $$(pkg-config --cflags $(X11PACKAGES)) +-LIBIXP = $(LIBDIR)/libixp.a ++LIBIXP = -lixp + + # Enable RTLD. Only necessary for Xft support. + CFLAGS += -DHAVE_RTLD +--- a/cmd/tray/Makefile ++++ b/cmd/tray/Makefile +@@ -9,8 +9,8 @@ + + PACKAGES += $(X11PACKAGES) + +-LIB = $(LIBS9) $(LIBIXP) +-LIBS += -lm ++LIB = $(LIBS9) ++LIBS += -lm $(LIBIXP) + OBJ = \ + client \ + ewmh \ +--- a/cmd/wmii/Makefile ++++ b/cmd/wmii/Makefile +@@ -10,8 +10,8 @@ + + PACKAGES += $(X11PACKAGES) xext xrandr xrender xinerama + +-LIB = $(LIBIXP) $(LIBS9) +-LIBS += -lm ++LIB = $(LIBS9) ++LIBS += -lm $(LIBIXP) + + OBJ = area \ + bar \ +--- a/cmd/x11/Makefile ++++ b/cmd/x11/Makefile +@@ -7,8 +7,8 @@ + + PACKAGES += $(X11PACKAGES) + +-LIB = $(LIBS9) $(LIBIXP) +-LIBS += $(LIB) ++LIB = $(LIBS9) ++LIBS += $(LIB) $(LIBIXP) + CFLAGS += $(INCX11) + + wiclick.out: wiclick.o +--- a/cmd/menu/Makefile ++++ b/cmd/menu/Makefile +@@ -15,8 +15,8 @@ + + PACKAGES += $(X11PACKAGES) + +-LIB = $(LIBS9) $(LIBIXP) +-LIBS += -lm ++LIB = $(LIBS9) ++LIBS += -lm $(LIBIXP) + OBJ = main \ + caret \ + history \ diff -Nru wmii-3.10~20120413+hg2813/debian/patches/21-fix-ftbfs-with-binutils-gold.patch wmii-3.10~20120413+hg2813/debian/patches/21-fix-ftbfs-with-binutils-gold.patch --- wmii-3.10~20120413+hg2813/debian/patches/21-fix-ftbfs-with-binutils-gold.patch 1970-01-01 00:00:00.000000000 +0000 +++ wmii-3.10~20120413+hg2813/debian/patches/21-fix-ftbfs-with-binutils-gold.patch 2013-12-11 09:48:40.000000000 +0000 @@ -0,0 +1,11 @@ +--- a/cmd/x11/Makefile ++++ b/cmd/x11/Makefile +@@ -8,7 +8,7 @@ + PACKAGES += $(X11PACKAGES) + + LIB = $(LIBS9) +-LIBS += $(LIB) $(LIBIXP) ++LIBS += $(LIB) $(LIBIXP) -ldl + CFLAGS += $(INCX11) + + wiclick.out: wiclick.o diff -Nru wmii-3.10~20120413+hg2813/debian/patches/fix-ftbfs-with-binutils-gold wmii-3.10~20120413+hg2813/debian/patches/fix-ftbfs-with-binutils-gold --- wmii-3.10~20120413+hg2813/debian/patches/fix-ftbfs-with-binutils-gold 2013-07-12 13:54:12.000000000 +0000 +++ wmii-3.10~20120413+hg2813/debian/patches/fix-ftbfs-with-binutils-gold 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -Description: Add -ldl to fix FTBFS -Author: Angel Abad - ---- wmii-3.10~20120413+hg2813.orig/cmd/x11/Makefile -+++ wmii-3.10~20120413+hg2813/cmd/x11/Makefile -@@ -8,7 +8,7 @@ TARG = wikeyname \ - PACKAGES += $(X11PACKAGES) - - LIB = $(LIBS9) $(LIBIXP) --LIBS += $(LIB) -+LIBS += $(LIB) -ldl - CFLAGS += $(INCX11) - - wiclick.out: wiclick.o diff -Nru wmii-3.10~20120413+hg2813/debian/patches/series wmii-3.10~20120413+hg2813/debian/patches/series --- wmii-3.10~20120413+hg2813/debian/patches/series 2013-07-12 13:53:35.000000000 +0000 +++ wmii-3.10~20120413+hg2813/debian/patches/series 2013-12-11 09:47:55.000000000 +0000 @@ -2,8 +2,12 @@ 02-cflags.patch 02-no-silent.patch 03-font.patch +04-xterm.patch 09-wihack-ld-preload.patch 10-hostname.patch 13-fix-spelling-manpages.patch 16-fix-confdir.patch -fix-ftbfs-with-binutils-gold +16-rc-fixes.patch +17-witray-fix.patch +20-libixp-link.patch +21-fix-ftbfs-with-binutils-gold.patch diff -Nru wmii-3.10~20120413+hg2813/debian/rules wmii-3.10~20120413+hg2813/debian/rules --- wmii-3.10~20120413+hg2813/debian/rules 2013-04-12 19:31:46.000000000 +0000 +++ wmii-3.10~20120413+hg2813/debian/rules 2013-11-30 19:17:05.000000000 +0000 @@ -11,10 +11,10 @@ dh $@ --with python2 override_dh_auto_build: - CFLAGS="$(CFLAGS)" $(MAKE) CC="$(CC) -c" PREFIX=/usr ETC=/etc/X11 STATIC="" + CFLAGS="$(CFLAGS)" $(MAKE) CC="$(CC) -c" PREFIX=/usr ETC=/etc/X11 STATIC="" LIBDIR="/usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/wmii" override_dh_auto_install: - $(MAKE) DESTDIR=$(CURDIR)/debian/wmii PREFIX=/usr ETC=/etc/X11 install + $(MAKE) DESTDIR=$(CURDIR)/debian/wmii PREFIX=/usr ETC=/etc/X11 LIBDIR="/usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/wmii" install # Removing useless files rm -f debian/wmii/usr/share/doc/wmii/LICENSE rm -f debian/wmii/usr/share/doc/wmii/alternative_wmiircs/ruby/LICENSE