[patch] Source code patch used by patched ebuild

ion-2-20040207-rename-to-ion2_pwm2.patch (text/plain), 5.80 KB, created by Sascha Silbe on 2004-03-30 04:26:45 UTC

diff -Nur ion-2-20040207/configure ion-2-20040207-renamed/configure
--- ion-2-20040207/configure	2004-02-07 16:36:42.000000000 +0100
+++ ion-2-20040207-renamed/configure	2004-03-30 13:40:10.000000000 +0200
@@ -269,7 +269,7 @@
 
 # Identity of this package.
 PACKAGE_NAME='Ion Window Manager'
-PACKAGE_TARNAME='ion'
+PACKAGE_TARNAME='ion2'
 PACKAGE_VERSION='2-20040207'
 PACKAGE_STRING='Ion Window Manager 2-20040207'
 PACKAGE_BUGREPORT='[e-mail]'
diff -Nur ion-2-20040207/configure.ac ion-2-20040207-renamed/configure.ac
--- ion-2-20040207/configure.ac	2004-02-07 16:36:39.000000000 +0100
+++ ion-2-20040207-renamed/configure.ac	2004-03-30 13:40:04.000000000 +0200
@@ -5,7 +5,7 @@
 AC_INIT([Ion Window Manager],
 		[2-20040207],
 		[[e-mail]],
-		[ion])
+		[ion2])
 AC_PREREQ([2.58])
 AC_REVISION([$Revision: 1.16 $])
 
diff -Nur ion-2-20040207/ion/Makefile ion-2-20040207-renamed/ion/Makefile
--- ion-2-20040207/ion/Makefile	2004-02-07 16:36:39.000000000 +0100
+++ ion-2-20040207-renamed/ion/Makefile	2004-03-30 13:24:02.000000000 +0200
@@ -35,7 +35,7 @@
 
 SOURCES=ion.c
 
-TARGETS=ion
+TARGETS=ion2
 
 ######################################
 
@@ -43,9 +43,9 @@
 
 ######################################
 
-ion: $(OBJS) $(EXT_OBJS)
+ion2: $(OBJS) $(EXT_OBJS)
 	$(LIBTOOL) --mode=link $(CC) $(LINKOPTS) $(OBJS) $(EXT_OBJS) $(LDFLAGS) -o $@
 
 _install:
 	$(INSTALLDIR) $(BINDIR)
-	$(INSTALL) -s -m $(BIN_MODE) ion $(BINDIR)
+	$(INSTALL) -s -m $(BIN_MODE) ion2 $(BINDIR)
diff -Nur ion-2-20040207/ioncore/modules.c ion-2-20040207-renamed/ioncore/modules.c
--- ion-2-20040207/ioncore/modules.c	2004-01-25 19:19:01.000000000 +0100
+++ ion-2-20040207-renamed/ioncore/modules.c	2004-03-30 13:29:34.000000000 +0200
@@ -93,7 +93,7 @@
 /*EXTL_DOC
  * Attempt to load module \var{modname}. Ion will use libltdl to search
  * the library path (the default setting is \file{\~{}/.ion2/libs} and
- * \file{\$PREFIX/lib/ion}) and also try diffent extensions, so only
+ * \file{\$PREFIX/lib/ion2}) and also try diffent extensions, so only
  * the module name should usually be necessary to give here.
  */
 EXTL_EXPORT
diff -Nur ion-2-20040207/man/ion.1.in ion-2-20040207-renamed/man/ion.1.in
--- ion-2-20040207/man/ion.1.in	2004-02-01 12:54:33.000000000 +0100
+++ ion-2-20040207-renamed/man/ion.1.in	2004-03-30 13:44:23.000000000 +0200
@@ -2,7 +2,7 @@
 .SH NAME
 Ion - an X11 window manager
 .SH SYNOPSIS
-.B ion
+.B ion2
 .I "[options]"
 .SH "DESCRIPTION"
 
@@ -429,7 +429,7 @@
 .PP
 .I DOCDIR/
 .PP
-\fIX(7x)\fP, \fIpwm(1)\fP
+\fIX(7x)\fP, \fIpwm2(1)\fP
 
 .SH AUTHOR
 Ion was written by Tuomo Valkonen <tuomov at iki.fi>.
diff -Nur ion-2-20040207/man/ion.1.in.txt ion-2-20040207-renamed/man/ion.1.in.txt
--- ion-2-20040207/man/ion.1.in.txt	2004-02-01 12:54:33.000000000 +0100
+++ ion-2-20040207-renamed/man/ion.1.in.txt	2004-03-30 13:45:09.000000000 +0200
@@ -6,7 +6,7 @@
        Ion - an X11 window manager
 
 SYNOPSIS
-       ion [options]
+       ion2 [options]
 
 DESCRIPTION
        Ion  is  a tiling tabbed window manager designed with keyboard users in
@@ -408,7 +408,7 @@
 
        DOCDIR/
 
-       X(7x), pwm(1)
+       X(7x), pwm2(1)
 
 
 AUTHOR
diff -Nur ion-2-20040207/man/Makefile ion-2-20040207-renamed/man/Makefile
--- ion-2-20040207/man/Makefile	2004-02-07 16:36:39.000000000 +0100
+++ ion-2-20040207-renamed/man/Makefile	2004-03-30 13:47:15.000000000 +0200
@@ -21,8 +21,8 @@
 
 _install:
 	$(INSTALLDIR) $(MANDIR)/man1
-	$(INSTALL) -m $(DATA_MODE) ion.1 $(MANDIR)/man1
-	$(INSTALL) -m $(DATA_MODE) pwm.1 $(MANDIR)/man1
+	$(INSTALL) -m $(DATA_MODE) ion.1 $(MANDIR)/man1/ion2.1
+	$(INSTALL) -m $(DATA_MODE) pwm.1 $(MANDIR)/man1/pwm2.1
 
 #
 # Awful hack that may not work on the user's system. This is rule is
diff -Nur ion-2-20040207/man/pwm.1.in ion-2-20040207-renamed/man/pwm.1.in
--- ion-2-20040207/man/pwm.1.in	2004-01-25 19:04:43.000000000 +0100
+++ ion-2-20040207-renamed/man/pwm.1.in	2004-03-30 13:45:23.000000000 +0200
@@ -2,7 +2,7 @@
 .SH NAME
 PWM - An X11 window manager
 .SH SYNOPSIS
-.B pwm
+.B pwm2
 .I "[options]"
 .SH "DESCRIPTION"
 
@@ -75,5 +75,5 @@
 .SH SEE ALSO
 
 For more information, see
-\fIion(1)\fP.
+\fIion2(1)\fP.
 
diff -Nur ion-2-20040207/pwm/Makefile ion-2-20040207-renamed/pwm/Makefile
--- ion-2-20040207/pwm/Makefile	2004-02-07 16:36:39.000000000 +0100
+++ ion-2-20040207-renamed/pwm/Makefile	2004-03-30 13:24:27.000000000 +0200
@@ -41,7 +41,7 @@
 
 SOURCES = pwm.c
 ETC = pwm.lua pwm-menus.lua pwm-bindings.lua
-TARGETS = pwm
+TARGETS = pwm2
 
 ######################################
 
@@ -49,13 +49,13 @@
 
 ######################################
 
-pwm: $(OBJS) $(EXT_OBJS)
+pwm2: $(OBJS) $(EXT_OBJS)
 	$(LIBTOOL) --mode=link $(CC) $(LINKOPTS) $(OBJS) $(EXT_OBJS) $(LDFLAGS) -o $@
 
 _install:
 	$(INSTALLDIR) $(BINDIR)
-	$(INSTALL) -s -m $(BIN_MODE) pwm $(BINDIR)
-	# $(STRIP) $(BINDIR)/pwm
+	$(INSTALL) -s -m $(BIN_MODE) pwm2 $(BINDIR)
+	# $(STRIP) $(BINDIR)/pwm2
 	$(INSTALLDIR) $(PWM_ETCDIR)
 	for i in $(ETC); do \
 		$(INSTALL) -m $(DATA_MODE) $$i $(PWM_ETCDIR); \
diff -Nur ion-2-20040207/system.mk ion-2-20040207-renamed/system.mk
--- ion-2-20040207/system.mk	2004-02-07 16:36:39.000000000 +0100
+++ ion-2-20040207-renamed/system.mk	2004-03-30 13:31:41.000000000 +0200
@@ -15,21 +15,21 @@
 # Main binaries
 BINDIR=$(PREFIX)/bin
 # Configuration .lua files
-ETCDIR=$(PREFIX)/etc/ion
+ETCDIR=$(PREFIX)/etc/ion2
 # Some .lua files and ion-* shell scripts
-SHAREDIR=$(PREFIX)/share/ion
+SHAREDIR=$(PREFIX)/share/ion2
 # Manual pages
 MANDIR=$(PREFIX)/share/man
 # Some documents
-DOCDIR=$(PREFIX)/share/doc/ion
+DOCDIR=$(PREFIX)/share/doc/ion2
 # Nothing at the moment
-INCDIR=$(PREFIX)/include/ion
+INCDIR=$(PREFIX)/include/ion2
 # Nothing at the moment
 LIBDIR=$(PREFIX)/lib
 # Modules
-MODULEDIR=$(LIBDIR)/ion
+MODULEDIR=$(LIBDIR)/ion2
 # ion-completefile (does not belong in SHAREDIR being a binary file)
-EXTRABINDIR=$(LIBDIR)/ion
+EXTRABINDIR=$(LIBDIR)/ion2
 
 ##
 ## Modules