diff -Nru dwm-6.0/debian/changelog dwm-6.0/debian/changelog --- dwm-6.0/debian/changelog 2013-05-11 06:56:55.000000000 +0000 +++ dwm-6.0/debian/changelog 2013-09-15 15:04:32.000000000 +0000 @@ -1,3 +1,21 @@ +dwm (6.0-6) unstable; urgency=low + + * Introduce a missing new line in patch which makes it unusable. + Closes: bug#722994. Thanks to Mats Erik Andersson. + * Renamed patches to follow patch tagging micro guidelines + debian/patches/README. + * Add debian/patches/README documenting patch numbering micro policy. + * Strip trailing space in 2001_replace_term_cmd.patch + * Add patch 2004 removing reference to custom library paths and include + paths, fixing FTBFS on mips*. + Closes: bug#722765. Thanks to YunQiang Su. + * Update 2001 patch to change rule to use Iceweasel instead of Firefox. + Closes: bug#710180. Thanks to Daniel Gazda. + * Changed maintainer specific configuration, to use xfce4-terminal in + rule specific to terminals instead of x-terminal-emulator. + + -- Vasudev Kamath Sun, 15 Sep 2013 20:34:14 +0530 + dwm (6.0-5) unstable; urgency=low * debian/control diff -Nru dwm-6.0/debian/local/config.maintainer.h dwm-6.0/debian/local/config.maintainer.h --- dwm-6.0/debian/local/config.maintainer.h 2013-05-11 06:56:55.000000000 +0000 +++ dwm-6.0/debian/local/config.maintainer.h 2013-09-15 15:04:32.000000000 +0000 @@ -18,7 +18,7 @@ static const Rule rules[] = { /* class instance title tags mask isfloating monitor */ - { "x-terminal-emulator", NULL, NULL, 0, False, -1 }, + { "xfce4-terminal", NULL, NULL, 0, False, -1 }, { "Iceweasel", NULL, NULL, 1 << 1, False, -1 }, { "Firefox-bin", NULL, NULL, 1 << 1, False, -1 }, { "Pidgin", NULL, NULL, 1 << 2, True, 1 }, diff -Nru dwm-6.0/debian/patches/01-term-cmd-replace.patch dwm-6.0/debian/patches/01-term-cmd-replace.patch --- dwm-6.0/debian/patches/01-term-cmd-replace.patch 2013-05-11 06:56:55.000000000 +0000 +++ dwm-6.0/debian/patches/01-term-cmd-replace.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -Description: Modified terminal emulator used by dwm - By default dwm uses uxterm as terminal emulator - this is modified now to use x-terminal-emulator - command instead -Author: Vasudev Kamath -Forwarded: not-needed -Last-Update: 2011-11-04 ---- a/config.def.h -+++ b/config.def.h -@@ -46,7 +46,7 @@ - - /* commands */ - static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL }; --static const char *termcmd[] = { "uxterm", NULL }; -+static const char *termcmd[] = { "x-terminal-emulator", NULL }; - - static Key keys[] = { - /* modifier key function argument */ diff -Nru dwm-6.0/debian/patches/02-dpkg-buildflags.patch dwm-6.0/debian/patches/02-dpkg-buildflags.patch --- dwm-6.0/debian/patches/02-dpkg-buildflags.patch 2013-05-11 06:56:55.000000000 +0000 +++ dwm-6.0/debian/patches/02-dpkg-buildflags.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -Description: Modification to allow dpkg-buildflags - This modification allows the dpkg-buildflags to inject compilation - flags in addition to vendor specific patches. Also this patch removes - -Os from upstream allowing use DEB_BUILD_OPTIONS=noopt -Author: Vasudev Kamath -Forwarded: not-needed -Last-Update: 2012-02-19 ---- a/config.mk -+++ b/config.mk -@@ -19,11 +19,11 @@ - LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS} - - # flags --CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} -+CPPFLAGS += -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} - #CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS} --CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} -+CFLAGS += -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS} - #LDFLAGS = -g ${LIBS} --LDFLAGS = -s ${LIBS} -+LDFLAGS += -s ${LIBS} - - # Solaris - #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" diff -Nru dwm-6.0/debian/patches/03-transparent-makefile.patch dwm-6.0/debian/patches/03-transparent-makefile.patch --- dwm-6.0/debian/patches/03-transparent-makefile.patch 2013-05-11 06:56:55.000000000 +0000 +++ dwm-6.0/debian/patches/03-transparent-makefile.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,69 +0,0 @@ -Description: Commands in Maekefile should be visible while execution - This patch removes @ from the Makefile so that command execution is - visible to every one when DH_VERBOSE=1 -Author: Vasudev Kamath -Last-Update: 2012-02-19 -Forwarded: not-needed--- a/Makefile -+++ b/Makefile -@@ -16,45 +16,45 @@ - - .c.o: - @echo CC $< -- @${CC} -c ${CFLAGS} $< -+ ${CC} -c ${CFLAGS} $< - - ${OBJ}: config.h config.mk - - config.h: - @echo creating $@ from config.def.h -- @cp config.def.h $@ -+ cp config.def.h $@ - - dwm: ${OBJ} - @echo CC -o $@ -- @${CC} -o $@ ${OBJ} ${LDFLAGS} -+ ${CC} -o $@ ${OBJ} ${LDFLAGS} - - clean: - @echo cleaning -- @rm -f dwm ${OBJ} dwm-${VERSION}.tar.gz -+ rm -f dwm ${OBJ} dwm-${VERSION}.tar.gz - - dist: clean - @echo creating dist tarball -- @mkdir -p dwm-${VERSION} -- @cp -R LICENSE Makefile README config.def.h config.mk \ -+ mkdir -p dwm-${VERSION} -+ cp -R LICENSE Makefile README config.def.h config.mk \ - dwm.1 ${SRC} dwm-${VERSION} -- @tar -cf dwm-${VERSION}.tar dwm-${VERSION} -- @gzip dwm-${VERSION}.tar -- @rm -rf dwm-${VERSION} -+ tar -cf dwm-${VERSION}.tar dwm-${VERSION} -+ gzip dwm-${VERSION}.tar -+ rm -rf dwm-${VERSION} - - install: all - @echo installing executable file to ${DESTDIR}${PREFIX}/bin -- @mkdir -p ${DESTDIR}${PREFIX}/bin -- @cp -f dwm ${DESTDIR}${PREFIX}/bin -- @chmod 755 ${DESTDIR}${PREFIX}/bin/dwm -+ mkdir -p ${DESTDIR}${PREFIX}/bin -+ cp -f dwm ${DESTDIR}${PREFIX}/bin -+ chmod 755 ${DESTDIR}${PREFIX}/bin/dwm - @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1 - @mkdir -p ${DESTDIR}${MANPREFIX}/man1 -- @sed "s/VERSION/${VERSION}/g" < dwm.1 > ${DESTDIR}${MANPREFIX}/man1/dwm.1 -- @chmod 644 ${DESTDIR}${MANPREFIX}/man1/dwm.1 -+ sed "s/VERSION/${VERSION}/g" < dwm.1 > ${DESTDIR}${MANPREFIX}/man1/dwm.1 -+ chmod 644 ${DESTDIR}${MANPREFIX}/man1/dwm.1 - - uninstall: - @echo removing executable file from ${DESTDIR}${PREFIX}/bin -- @rm -f ${DESTDIR}${PREFIX}/bin/dwm -+ rm -f ${DESTDIR}${PREFIX}/bin/dwm - @echo removing manual page from ${DESTDIR}${MANPREFIX}/man1 -- @rm -f ${DESTDIR}${MANPREFIX}/man1/dwm.1 -+ rm -f ${DESTDIR}${MANPREFIX}/man1/dwm.1 - - .PHONY: all options clean dist install uninstall diff -Nru dwm-6.0/debian/patches/2001_replace_term_cmd.patch dwm-6.0/debian/patches/2001_replace_term_cmd.patch --- dwm-6.0/debian/patches/2001_replace_term_cmd.patch 1970-01-01 00:00:00.000000000 +0000 +++ dwm-6.0/debian/patches/2001_replace_term_cmd.patch 2013-09-15 15:04:32.000000000 +0000 @@ -0,0 +1,37 @@ +Description: Modified command and rules to use Debian specific tools + By default dwm uses uxterm as terminal emulator + this is modified now to use x-terminal-emulator + command instead. + . + Also patch modifies class rules to use Iceweasel instead of Firefox + as that is the replacement for Firefox on Debian system. +Author: Vasudev Kamath +Forwarded: not-needed +Last-Update: 2013-09-15 +--- a/config.def.h ++++ b/config.def.h +@@ -18,8 +18,8 @@ + + static const Rule rules[] = { + /* class instance title tags mask isfloating monitor */ +- { "Gimp", NULL, NULL, 0, True, -1 }, +- { "Firefox", NULL, NULL, 1 << 8, False, -1 }, ++ { "Gimp", NULL, NULL, 0, True, -1 }, ++ { "Iceweasel", NULL, NULL, 1 << 8, False, -1 }, + }; + + /* layout(s) */ +@@ -47,7 +47,7 @@ + + /* commands */ + static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL }; +-static const char *termcmd[] = { "uxterm", NULL }; ++static const char *termcmd[] = { "x-terminal-emulator", NULL }; + + static Key keys[] = { + /* modifier key function argument */ +@@ -102,4 +102,3 @@ + { ClkTagBar, MODKEY, Button1, tag, {0} }, + { ClkTagBar, MODKEY, Button3, toggletag, {0} }, + }; +- diff -Nru dwm-6.0/debian/patches/2002_inject_hardening_flags.patch dwm-6.0/debian/patches/2002_inject_hardening_flags.patch --- dwm-6.0/debian/patches/2002_inject_hardening_flags.patch 1970-01-01 00:00:00.000000000 +0000 +++ dwm-6.0/debian/patches/2002_inject_hardening_flags.patch 2013-09-15 15:04:32.000000000 +0000 @@ -0,0 +1,24 @@ +Description: Modification to allow dpkg-buildflags + This modification allows the dpkg-buildflags to inject compilation + flags in addition to vendor specific patches. Also this patch removes + -Os from upstream allowing use DEB_BUILD_OPTIONS=noopt +Author: Vasudev Kamath +Forwarded: not-needed +Last-Update: 2012-02-19 +--- a/config.mk ++++ b/config.mk +@@ -19,11 +19,11 @@ + LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS} + + # flags +-CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} ++CPPFLAGS += -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} + #CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS} +-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} ++CFLAGS += -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS} + #LDFLAGS = -g ${LIBS} +-LDFLAGS = -s ${LIBS} ++LDFLAGS += -s ${LIBS} + + # Solaris + #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" diff -Nru dwm-6.0/debian/patches/2003_transparent_makefile.patch dwm-6.0/debian/patches/2003_transparent_makefile.patch --- dwm-6.0/debian/patches/2003_transparent_makefile.patch 1970-01-01 00:00:00.000000000 +0000 +++ dwm-6.0/debian/patches/2003_transparent_makefile.patch 2013-09-15 15:04:32.000000000 +0000 @@ -0,0 +1,70 @@ +Description: Commands in Maekefile should be visible while execution + This patch removes @ from the Makefile so that command execution is + visible to every one when DH_VERBOSE=1 +Author: Vasudev Kamath +Last-Update: 2012-02-19 +Forwarded: not-needed +--- a/Makefile ++++ b/Makefile +@@ -16,45 +16,45 @@ + + .c.o: + @echo CC $< +- @${CC} -c ${CFLAGS} $< ++ ${CC} -c ${CFLAGS} $< + + ${OBJ}: config.h config.mk + + config.h: + @echo creating $@ from config.def.h +- @cp config.def.h $@ ++ cp config.def.h $@ + + dwm: ${OBJ} + @echo CC -o $@ +- @${CC} -o $@ ${OBJ} ${LDFLAGS} ++ ${CC} -o $@ ${OBJ} ${LDFLAGS} + + clean: + @echo cleaning +- @rm -f dwm ${OBJ} dwm-${VERSION}.tar.gz ++ rm -f dwm ${OBJ} dwm-${VERSION}.tar.gz + + dist: clean + @echo creating dist tarball +- @mkdir -p dwm-${VERSION} +- @cp -R LICENSE Makefile README config.def.h config.mk \ ++ mkdir -p dwm-${VERSION} ++ cp -R LICENSE Makefile README config.def.h config.mk \ + dwm.1 ${SRC} dwm-${VERSION} +- @tar -cf dwm-${VERSION}.tar dwm-${VERSION} +- @gzip dwm-${VERSION}.tar +- @rm -rf dwm-${VERSION} ++ tar -cf dwm-${VERSION}.tar dwm-${VERSION} ++ gzip dwm-${VERSION}.tar ++ rm -rf dwm-${VERSION} + + install: all + @echo installing executable file to ${DESTDIR}${PREFIX}/bin +- @mkdir -p ${DESTDIR}${PREFIX}/bin +- @cp -f dwm ${DESTDIR}${PREFIX}/bin +- @chmod 755 ${DESTDIR}${PREFIX}/bin/dwm ++ mkdir -p ${DESTDIR}${PREFIX}/bin ++ cp -f dwm ${DESTDIR}${PREFIX}/bin ++ chmod 755 ${DESTDIR}${PREFIX}/bin/dwm + @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1 + @mkdir -p ${DESTDIR}${MANPREFIX}/man1 +- @sed "s/VERSION/${VERSION}/g" < dwm.1 > ${DESTDIR}${MANPREFIX}/man1/dwm.1 +- @chmod 644 ${DESTDIR}${MANPREFIX}/man1/dwm.1 ++ sed "s/VERSION/${VERSION}/g" < dwm.1 > ${DESTDIR}${MANPREFIX}/man1/dwm.1 ++ chmod 644 ${DESTDIR}${MANPREFIX}/man1/dwm.1 + + uninstall: + @echo removing executable file from ${DESTDIR}${PREFIX}/bin +- @rm -f ${DESTDIR}${PREFIX}/bin/dwm ++ rm -f ${DESTDIR}${PREFIX}/bin/dwm + @echo removing manual page from ${DESTDIR}${MANPREFIX}/man1 +- @rm -f ${DESTDIR}${MANPREFIX}/man1/dwm.1 ++ rm -f ${DESTDIR}${MANPREFIX}/man1/dwm.1 + + .PHONY: all options clean dist install uninstall diff -Nru dwm-6.0/debian/patches/2004_use_system_searchpaths.patch dwm-6.0/debian/patches/2004_use_system_searchpaths.patch --- dwm-6.0/debian/patches/2004_use_system_searchpaths.patch 1970-01-01 00:00:00.000000000 +0000 +++ dwm-6.0/debian/patches/2004_use_system_searchpaths.patch 2013-09-15 15:04:32.000000000 +0000 @@ -0,0 +1,37 @@ +Description: Fix FTBFS on mipsel* due to custom library search paths. + This patch removes library search -L/usr/lib and include paths + defined by upstream. Since all the libraries and headers needed are + available in default path these flags are redundant also since + /usr/lib may have different purpose on various architecture like + mips* it causes FTBFS. Thanks to YunQiang Su for bringing this up. +Author: Vasudev Kamath +Last-Updated: 2013-09-15 +Bug-Debian: http://bugs.debian.org/722765 + +--- a/config.mk ++++ b/config.mk +@@ -7,21 +7,17 @@ + PREFIX = /usr/local + MANPREFIX = ${PREFIX}/share/man + +-X11INC = /usr/X11R6/include +-X11LIB = /usr/X11R6/lib +- + # Xinerama +-XINERAMALIBS = -L${X11LIB} -lXinerama ++XINERAMALIBS = -lXinerama + XINERAMAFLAGS = -DXINERAMA + + # includes and libs +-INCS = -I. -I/usr/include -I${X11INC} +-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS} ++LIBS = -lc -lX11 ${XINERAMALIBS} + + # flags + CPPFLAGS += -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} + #CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS} +-CFLAGS += -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS} ++CFLAGS += -std=c99 -pedantic -Wall ${CPPFLAGS} + #LDFLAGS = -g ${LIBS} + LDFLAGS += -s ${LIBS} + diff -Nru dwm-6.0/debian/patches/README dwm-6.0/debian/patches/README --- dwm-6.0/debian/patches/README 1970-01-01 00:00:00.000000000 +0000 +++ dwm-6.0/debian/patches/README 2013-09-15 15:04:32.000000000 +0000 @@ -0,0 +1,3 @@ +0xxx: Grabbed from upstream development. +1xxx: Possibly relevant for upstream adoption. +2xxx: Only relevant for official Debian release. diff -Nru dwm-6.0/debian/patches/series dwm-6.0/debian/patches/series --- dwm-6.0/debian/patches/series 2013-05-11 06:56:55.000000000 +0000 +++ dwm-6.0/debian/patches/series 2013-09-15 15:04:32.000000000 +0000 @@ -1,3 +1,4 @@ -03-transparent-makefile.patch -01-term-cmd-replace.patch -02-dpkg-buildflags.patch +2001_replace_term_cmd.patch +2002_inject_hardening_flags.patch +2003_transparent_makefile.patch +2004_use_system_searchpaths.patch