]> git.decadent.org.uk Git - ion3.git/commitdiff
Renamed directories and changed messages to refer to ParticleMan.
authorBen Hutchings <ben@decadent.org.uk>
Sat, 10 Nov 2007 04:24:21 +0000 (04:24 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Sun, 2 Nov 2008 13:05:31 +0000 (13:05 +0000)
/etc/X11/ion3 remains unchanged so user configuration will be reused.
/usr/include/ion3 is created as a link for use when building external modules.
/usr/lib/ion3 is retained since external modules may be installed here.

debian/particleman-dev.links
debian/particleman.links
debian/patches/299_rename.diff [new file with mode: 0644]
debian/patches/series
debian/rules

index 4529fa3d41599ea447b71c6fe4f8c965c7074e6f..1337e42384f3d4575ad097c6b557874106d748a8 100644 (file)
@@ -1,7 +1,6 @@
 usr/share/particleman usr/share/ion3
 usr/share/particleman/build/system-inc.mk usr/include/particleman/build/system-inc.mk
 usr/share/particleman/build/rules.mk usr/include/particleman/build/rules.mk
-usr/lib/particleman usr/lib/ion3 
 usr/lib/particleman/config.h usr/include/particleman/config.h
 usr/lib/particleman/system.mk usr/include/particleman/system.mk
 usr/lib/particleman/build/libs.mk usr/include/particleman/build/libs.mk
index a46f9520246d3394ff1191cc141e8be7bf5fc7ef..e6dcdb1fa21416c7524b902fdc234cbc7d2416f3 100644 (file)
@@ -3,3 +3,5 @@ var/lib/particleman/debian-menu-i18n.lua usr/share/particleman/debian-menu-i18n.
 etc/default/particleman etc/X11/particleman/cfg_debian.lua
 usr/bin/particleman usr/bin/ion3
 usr/share/man/man1/particleman.1 usr/share/man/man1/ion3.1
+usr/share/man/cs/man1/particleman.1 usr/share/man/cs/man1/ion3.1
+usr/share/man/fi/man1/particleman.1 usr/share/man/fi/man1/ion3.1
diff --git a/debian/patches/299_rename.diff b/debian/patches/299_rename.diff
new file mode 100644 (file)
index 0000000..c0f02dc
--- /dev/null
@@ -0,0 +1,215 @@
+--- particleman.orig/ion/Makefile
++++ particleman/ion/Makefile
+@@ -58,4 +58,4 @@
+ _install:
+       $(INSTALLDIR) $(BINDIR)
+-      $(INSTALL) -m $(BIN_MODE) ion3 $(BINDIR)
++      $(INSTALL) -m $(BIN_MODE) ion3 $(BINDIR)/particleman
+--- particleman.orig/system.mk
++++ particleman/system.mk
+@@ -21,9 +21,9 @@
+ # Manual pages
+ MANDIR=$(PREFIX)/share/man
+ # Some documents
+-DOCDIR=$(PREFIX)/share/doc/ion3
++DOCDIR=$(PREFIX)/share/doc/particleman
+ # Nothing at the moment
+-INCDIR=$(PREFIX)/include/ion3
++INCDIR=$(PREFIX)/include/particleman
+ # Nothing at the moment
+ LIBDIR=$(PREFIX)/lib
+ # Modules
+@@ -33,7 +33,7 @@
+ # ion-completefile (does not belong in SHAREDIR being a binary file)
+ EXTRABINDIR=$(LIBDIR)/ion3
+ # For ion-completeman system-wide cache
+-VARDIR=/var/cache/ion3
++VARDIR=/var/cache/particleman
+ # Message catalogs
+ LOCALEDIR=$(PREFIX)/share/locale
+--- particleman.orig/man/Makefile
++++ particleman/man/Makefile
+@@ -58,11 +58,11 @@
+ _install:
+       $(INSTALLDIR) $(MANDIR)/man1
+-      $(INSTALL) -m $(DATA_MODE) ion3.1 $(MANDIR)/man1
++      $(INSTALL) -m $(DATA_MODE) ion3.1 $(MANDIR)/man1/particleman.1
+       $(INSTALL) -m $(DATA_MODE) pwm3.1 $(MANDIR)/man1
+       for tr in $(TRANSLATIONS); do \
+               $(INSTALLDIR) $(MANDIR)/$$tr/man1 ; \
+-              $(INSTALL) -m $(DATA_MODE) ion3.$$tr.1 $(MANDIR)/$$tr/man1/ion3.1 ; \
++              $(INSTALL) -m $(DATA_MODE) ion3.$$tr.1 $(MANDIR)/$$tr/man1/particleman.1 ; \
+               $(INSTALL) -m $(DATA_MODE) pwm3.$$tr.1 $(MANDIR)/$$tr/man1/pwm3.1 ; \
+       done
+       $(INSTALLDIR) $(SHAREDIR)
+--- particleman.orig/man/ion3.cs.in
++++ particleman/man/ion3.cs.in
+@@ -1,12 +1,12 @@
+-.TH ION 1
++.TH PARTICLEMAN 1
+ .SH NÁZEV
+-Ion - správce oken systému X11
++ParticleMan - správce oken systému X11
+ .SH PØEHLED
+-.B ion3
++.B particleman
+ .I "[volby]"
+ .SH "POPIS"
+-Ion je dla¾dicový správce oken se zálo¾kami navr¾ený pro klávesnicové u¾ivatele.
++ParticleMan je dla¾dicový správce oken se zálo¾kami navr¾ený pro klávesnicové u¾ivatele.
+ .SH "VOLBY"
+ .TP
+--- particleman.orig/man/ion3.fi.in
++++ particleman/man/ion3.fi.in
+@@ -1,12 +1,12 @@
+-.TH ION 1
++.TH PARTICLEMAN 1
+ .SH NIMI
+-Ion - X11 ikkunanhallintaohjelma
++ParticleMan - X11 ikkunanhallintaohjelma
+ .SH SELOSTE
+-.B ion3
++.B particleman
+ .I "[valinnat]"
+ .SH "KUVAUS"
+-Ion on näppäimistökäyttäjiä silmälläpitäen suunniteltu laatoitusta ja 
++ParticleMan on näppäimistökäyttäjiä silmälläpitäen suunniteltu laatoitusta ja 
+ välilehtiä hyödyntävä ikkunanhallintaohjelma X11:lle.
+  
+ .SH "VALINNAT"
+--- particleman.orig/man/ion3.in
++++ particleman/man/ion3.in
+@@ -1,12 +1,13 @@
+-.TH ION 1
++.TH PARTICLEMAN 1
+ .SH NAME
+-Ion - an X11 window manager
++ParticleMan - an X11 window manager
+ .SH SYNOPSIS
+-.B ion3
++.B particleman
+ .I "[options]"
+ .SH "DESCRIPTION"
+-Ion is a tiling tabbed window manager designed with keyboard users in mind.
++ParticleMan is a free version of Ion3, a tiling tabbed window manager
++designed with keyboard users in mind.
+  
+ .SH "OPTIONS"
+ .TP
+--- particleman.orig/README
++++ particleman/README
+@@ -1,3 +1,12 @@
++ParticleMan
++===========
++
++ParticleMan is a derivative of Ion3 that has been renamed to comply
++with the Debian Free Software Guidelines.  It is not supported by the
++original author.  Please report bugs to the Debian bug tracking system
++and send any other queries to the Debian maintainer listed at
++<http://packages.qa.debian.org/p/particleman.html>.
++
+ Ion
+ ===
+--- particleman.orig/man/welcome.head
++++ particleman/man/welcome.head
+@@ -1,17 +1,16 @@
+-Welcome to Ion!
++Welcome to ParticleMan!
+-If you have never used Ion before, it is highly recommended that you study 
+-the Ion manual page before proceeding further. It is reproduced below, but 
+-you can also access it later on, for example, by pressing <F1> and then 
+-<Enter> or, by running 'man ion3' in a terminal. All this supposing that 
+-you have installed Ion in a standard location so that the system commands
+-can find the manual page.
+-
+-If you are too eager to try out Ion and against all recommendation want to
+-skip reading the manual page, you should at least know that pressing <F2> 
+-should start a terminal emulator (xterm) and that the main menu can be 
+-accessed with <F12>.
++If you have never used ParticleMan or Ion before, it is highly
++recommended that you study the manual page before proceeding
++further. It is reproduced below, but you can also access it later on,
++for example, by pressing <F1> and then <Enter> or, by running
++'man particleman' in a terminal.
++
++If you are eager to try out ParticleMan and against all recommendation
++want to skip reading the manual page, you should at least know that
++pressing <F2> should start a terminal emulator and that the main menu
++can be accessed with <F12>.
+ When you feel ready to write customized configuration files (you're going
+ to do that in any case), please see the configuration manual available in
+--- particleman.orig/etc/cfg_ioncore.lua
++++ particleman/etc/cfg_ioncore.lua
+@@ -149,8 +149,8 @@
+     bdoc("Query for manual page to be displayed."),
+     kpress(ALTMETA.."F1", "mod_query.query_man(_, ':man')"),
+-    bdoc("Show the Ion manual page."),
+-    kpress(META.."F1", "ioncore.exec_on(_, ':man ion3')"),
++    bdoc("Show the ParticleMan manual page."),
++    kpress(META.."F1", "ioncore.exec_on(_, ':man particleman')"),
+     bdoc("Run a terminal emulator."),
+     kpress(ALTMETA.."F2", "ioncore.exec_on(_, XTERM or 'x-terminal-emulator')"),
+@@ -334,7 +334,7 @@
+     menuentry("Lock screen",
+               "ioncore.exec_on(_, ioncore.lookup_script('ion-lock'))"),
+     menuentry("Help",           "mod_query.query_man(_)"),
+-    menuentry("About Ion",      "mod_query.show_about_ion(_)"),
++    menuentry("About ParticleMan", "mod_query.show_about_ion(_)"),
+     submenu("Styles",           "stylemenu"),
+     submenu("Debian",           "Debian"),
+     submenu("Session",          "sessionmenu"),
+--- particleman.orig/ion/ion.c
++++ particleman/ion/ion.c
+@@ -216,7 +216,7 @@
+                 efnam=NULL;
+             }else{
+                 cloexec_braindamage_fix(fileno(ef));
+-                fprintf(ef, TR("Ion startup error log:\n"));
++                fprintf(ef, TR("ParticleMan startup error log:\n"));
+                 errorlog_begin_file(&el, ef);
+             }
+         }
+--- particleman.orig/libextl/luaextl.c
++++ particleman/libextl/luaextl.c
+@@ -2529,7 +2529,7 @@
+         return FALSE;
+     }
+     
+-    fprintf(d.f, TR("-- This file has been generated by Ion. Do not edit.\n"));
++    fprintf(d.f, TR("-- This file has been generated by ParticleMan. Do not edit.\n"));
+     fprintf(d.f, "return ");
+     
+     ret=extl_cpcall(l_st, (ExtlCPCallFn*)extl_do_serialise, &d);
+--- particleman.orig/mod_query/mod_query.lua
++++ particleman/mod_query/mod_query.lua
+@@ -555,7 +555,7 @@
+ -- or close the session (running under a session manager that supports such
+ -- requests). If the answer is 'y', 'Y' or 'yes', so will happen.
+ function mod_query.query_shutdown(mplex)
+-    mod_query.query_yesno(mplex, TR("Exit Ion/Shutdown session (y/n)?"),
++    mod_query.query_yesno(mplex, TR("Exit ParticleMan/Shutdown session (y/n)?"),
+                          ioncore.shutdown)
+ end
+@@ -564,7 +564,7 @@
+ -- This query asks whether the user wants restart Ioncore.
+ -- If the answer is 'y', 'Y' or 'yes', so will happen.
+ function mod_query.query_restart(mplex)
+-    mod_query.query_yesno(mplex, TR("Restart Ion (y/n)?"), ioncore.restart)
++    mod_query.query_yesno(mplex, TR("Restart ParticleMan (y/n)?"), ioncore.restart)
+ end
index 40d9a1d82fd74063944ccddea830d5c18a91665b..821db6f3dfba98a257a60867ef226c50c0f9b5d2 100644 (file)
@@ -5,3 +5,4 @@
 210_use-cfg_debian_ext.diff
 211_add-debian-menu.diff
 212_suggest-ion3-doc.diff
+299_rename.diff
index d579505416009c9522d273ee517b24a15a3b86fc..9a26947b6d093c51224487c15f101b81c1db75ae 100755 (executable)
@@ -61,13 +61,13 @@ install-arch: build-arch
 
        $(MAKE) install \
                PREFIX=$(CURDIR)/$(INSTDIR)/usr \
-               ETCDIR=$(CURDIR)/$(INSTDIR)/etc/X11/$(PACKAGE)
+               ETCDIR=$(CURDIR)/$(INSTDIR)/etc/X11/ion3
 
 # install other things (mainly -dev)
        dh_install -a
 
 # fix the installation
-       rm -f $(INSTDIR)/etc/X11/$(PACKAGE)/draw.lua
+       rm -f $(INSTDIR)/etc/X11/ion3/draw.lua
 
 binary-indep: build-indep install-indep
        dh_testdir