Source: aewm++
Version: 1.1.2-5.3
The debdiff for the LowNMU is attached.
diff -Nru aewm++-1.1.2/aewm.hh aewm++-1.1.2/aewm.hh
--- aewm++-1.1.2/aewm.hh 2022-11-23 19:08:06.000000000 +0100
+++ aewm++-1.1.2/aewm.hh 2005-02-20 03:05:27.000000000 +0100
@@ -47,7 +47,7 @@
#define FOCUSED_WINDOW_TITLE_COLOR "#FFFFFF"
-#define DEF_NEW1 "x-terminal-emulator -ls -sb -bg black -fg white"
+#define DEF_NEW1 "xterm -ls -sb -bg black -fg white"
#define DEF_BW 1
#define SPACE 3
#define MINSIZE 15
diff -Nru aewm++-1.1.2/client.cc aewm++-1.1.2/client.cc
--- aewm++-1.1.2/client.cc 2022-11-23 19:08:06.000000000 +0100
+++ aewm++-1.1.2/client.cc 2005-02-20 03:07:22.000000000 +0100
@@ -6,8 +6,6 @@
*/
#include "aewm.hh"
-#include <string.h>
-
Client::Client(Display *d, Window new_client)
{
initialize(d);
diff -Nru aewm++-1.1.2/debian/changelog aewm++-1.1.2/debian/changelog
--- aewm++-1.1.2/debian/changelog 2022-11-23 19:08:06.000000000 +0100
+++ aewm++-1.1.2/debian/changelog 2022-11-23 18:27:25.000000000 +0100
@@ -1,3 +1,10 @@
+aewm++ (1.1.2-5.3) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Convert to source format 3.0.
+
+ -- Bastian Germann <b...@debian.org> Wed, 23 Nov 2022 18:27:25 +0100
+
aewm++ (1.1.2-5.2) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru aewm++-1.1.2/debian/patches/debian.patches
aewm++-1.1.2/debian/patches/debian.patches
--- aewm++-1.1.2/debian/patches/debian.patches 1970-01-01 01:00:00.000000000
+0100
+++ aewm++-1.1.2/debian/patches/debian.patches 2022-11-23 18:27:25.000000000
+0100
@@ -0,0 +1,25 @@
+Description: Debian patches
+---
+--- aewm++-1.1.2.orig/Makefile
++++ aewm++-1.1.2/Makefile
+@@ -35,8 +35,7 @@ $(OBJS): %.o: %.cc $(HEADERS)
+
+ install: all
+ mkdir -p $(DESTDIR)$(prefix)/bin
+- mkdir -p $(DESTDIR)$(prefix)/man/man1
+- install -s aewm++ $(DESTDIR)$(prefix)/bin
++ install aewm++ $(DESTDIR)$(prefix)/bin
+
+ clean:
+ rm -f aewm++ $(OBJS) core
+--- aewm++-1.1.2.orig/windowmanager.cc
++++ aewm++-1.1.2/windowmanager.cc
+@@ -540,7 +542,7 @@ void WindowManager::handleKeyPressEvent(
+ {
+ if( (unsigned)current_desktop != ks - XK_1 )
+ {
+- (unsigned)current_desktop = ks - XK_1;
++ current_desktop = ks - XK_1;
+ goToDesktop(current_desktop);
+ }
+ }
diff -Nru aewm++-1.1.2/debian/patches/missing-string.patch
aewm++-1.1.2/debian/patches/missing-string.patch
--- aewm++-1.1.2/debian/patches/missing-string.patch 1970-01-01
01:00:00.000000000 +0100
+++ aewm++-1.1.2/debian/patches/missing-string.patch 2022-11-23
18:27:25.000000000 +0100
@@ -0,0 +1,35 @@
+Description: Add missing string.h
+---
+--- aewm++-1.1.2.orig/client.cc
++++ aewm++-1.1.2/client.cc
+@@ -6,6 +6,8 @@
+ */
+ #include "aewm.hh"
+
++#include <string.h>
++
+ Client::Client(Display *d, Window new_client)
+ {
+ initialize(d);
+--- aewm++-1.1.2.orig/main.cc
++++ aewm++-1.1.2/main.cc
+@@ -6,6 +6,8 @@
+ */
+ #include "aewm.hh"
+
++#include <string.h>
++
+ // Dunno where I ripped this from. Kudos to the author whoever he is!
+ void forkExec(char *cmd)
+ {
+--- aewm++-1.1.2.orig/windowmanager.cc
++++ aewm++-1.1.2/windowmanager.cc
+@@ -6,6 +6,8 @@
+ */
+ #include "aewm.hh"
+
++#include <string.h>
++
+ WindowManager* wm;
+
+ #define AEWM_KEY_ALT_COUNT 4
diff -Nru aewm++-1.1.2/debian/patches/series aewm++-1.1.2/debian/patches/series
--- aewm++-1.1.2/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ aewm++-1.1.2/debian/patches/series 2022-11-23 18:27:25.000000000 +0100
@@ -0,0 +1,4 @@
+debian.patches
+missing-string.patch
+x11-paths.patch
+x-terminal-emulator.patch
diff -Nru aewm++-1.1.2/debian/patches/x11-paths.patch
aewm++-1.1.2/debian/patches/x11-paths.patch
--- aewm++-1.1.2/debian/patches/x11-paths.patch 1970-01-01 01:00:00.000000000
+0100
+++ aewm++-1.1.2/debian/patches/x11-paths.patch 2022-11-23 18:27:25.000000000
+0100
@@ -0,0 +1,15 @@
+Description: Don't use obsolete X11R6 paths to build
+---
+--- aewm++-1.1.2.orig/Makefile
++++ aewm++-1.1.2/Makefile
+@@ -2,8 +2,8 @@ CC = g++
+ ADDITIONAL_CFLAGS = -g -O2 -march=i686 -Wall
+
+ prefix = /usr
+-INCLUDES = -I$/usr/X11R6
+-LDPATH = -L/usr/X11R6/lib
++INCLUDES = -I/usr/include/X11
++LDPATH = -L/usr/lib/X11
+ LIBS = -lXext -lX11
+
+ # SHAPE = Shape Extension
diff -Nru aewm++-1.1.2/debian/patches/x-terminal-emulator.patch
aewm++-1.1.2/debian/patches/x-terminal-emulator.patch
--- aewm++-1.1.2/debian/patches/x-terminal-emulator.patch 1970-01-01
01:00:00.000000000 +0100
+++ aewm++-1.1.2/debian/patches/x-terminal-emulator.patch 2022-11-23
18:27:25.000000000 +0100
@@ -0,0 +1,14 @@
+Description: Changed references to xterm to x-terminal-emulator
+ to use the user's preferred version according to /etc/alternatives
+---
+--- aewm++-1.1.2.orig/aewm.hh
++++ aewm++-1.1.2/aewm.hh
+@@ -47,7 +47,7 @@ using std::endl;
+ #define FOCUSED_WINDOW_TITLE_COLOR "#FFFFFF"
+
+
+-#define DEF_NEW1 "xterm -ls -sb -bg black -fg white"
++#define DEF_NEW1 "x-terminal-emulator -ls -sb -bg black -fg white"
+ #define DEF_BW 1
+ #define SPACE 3
+ #define MINSIZE 15
diff -Nru aewm++-1.1.2/debian/source/format aewm++-1.1.2/debian/source/format
--- aewm++-1.1.2/debian/source/format 1970-01-01 01:00:00.000000000 +0100
+++ aewm++-1.1.2/debian/source/format 2022-11-23 18:27:25.000000000 +0100
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru aewm++-1.1.2/main.cc aewm++-1.1.2/main.cc
--- aewm++-1.1.2/main.cc 2022-11-23 19:08:06.000000000 +0100
+++ aewm++-1.1.2/main.cc 2005-02-12 04:38:32.000000000 +0100
@@ -6,8 +6,6 @@
*/
#include "aewm.hh"
-#include <string.h>
-
// Dunno where I ripped this from. Kudos to the author whoever he is!
void forkExec(char *cmd)
{
diff -Nru aewm++-1.1.2/Makefile aewm++-1.1.2/Makefile
--- aewm++-1.1.2/Makefile 2022-11-23 19:08:06.000000000 +0100
+++ aewm++-1.1.2/Makefile 2005-02-16 03:38:41.000000000 +0100
@@ -2,8 +2,8 @@
ADDITIONAL_CFLAGS = -g -O2 -march=i686 -Wall
prefix = /usr
-INCLUDES = -I/usr/include/X11
-LDPATH = -L/usr/lib/X11
+INCLUDES = -I$/usr/X11R6
+LDPATH = -L/usr/X11R6/lib
LIBS = -lXext -lX11
# SHAPE = Shape Extension
@@ -35,7 +35,8 @@
install: all
mkdir -p $(DESTDIR)$(prefix)/bin
- install aewm++ $(DESTDIR)$(prefix)/bin
+ mkdir -p $(DESTDIR)$(prefix)/man/man1
+ install -s aewm++ $(DESTDIR)$(prefix)/bin
clean:
rm -f aewm++ $(OBJS) core
diff -Nru aewm++-1.1.2/windowmanager.cc aewm++-1.1.2/windowmanager.cc
--- aewm++-1.1.2/windowmanager.cc 2022-11-23 19:08:06.000000000 +0100
+++ aewm++-1.1.2/windowmanager.cc 2005-02-20 03:03:33.000000000 +0100
@@ -6,8 +6,6 @@
*/
#include "aewm.hh"
-#include <string.h>
-
WindowManager* wm;
#define AEWM_KEY_ALT_COUNT 4
@@ -542,7 +540,7 @@
{
if( (unsigned)current_desktop != ks - XK_1 )
{
- current_desktop = ks - XK_1;
+ (unsigned)current_desktop = ks - XK_1;
goToDesktop(current_desktop);
}
}
