[WindowMaker] 0.95.4-3
Andreas Bierfert
awjb at fedoraproject.org
Tue Jan 8 22:09:10 UTC 2013
commit 94692d5bfe2809f6a83adaf2fbb332e4f955ea89
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date: Tue Jan 8 23:08:57 2013 +0100
0.95.4-3
- more fsf fixes from wmaker-crm git
0001-Fix-incorrect-FSF-address.patch | 992 ++++++++++++++++++++++
0002-Include-LGPL-with-correct-FSF-address.patch | 144 ++++
WindowMaker.spec | 17 +-
3 files changed, 1152 insertions(+), 1 deletions(-)
---
diff --git a/0001-Fix-incorrect-FSF-address.patch b/0001-Fix-incorrect-FSF-address.patch
new file mode 100644
index 0000000..8535cca
--- /dev/null
+++ b/0001-Fix-incorrect-FSF-address.patch
@@ -0,0 +1,992 @@
+From b711e3f14164e9505857e6b4f4d43b2bda7995c9 Mon Sep 17 00:00:00 2001
+From: Andreas Bierfert <andreas.bierfert at lowlatency.de>
+Date: Mon, 7 Jan 2013 21:27:53 +0100
+Subject: [PATCH 1/2] Fix incorrect FSF address
+
+---
+ WINGs/data.c | 3 ++-
+ WINGs/error.c | 3 ++-
+ WINGs/findfile.c | 3 ++-
+ WINGs/memory.c | 3 ++-
+ WINGs/wruler.c | 3 ++-
+ WPrefs.app/po/et.po | 8 ++++----
+ po/be.po | 6 +++---
+ po/bg.po | 8 ++++----
+ po/ca.po | 6 +++---
+ po/cs.po | 8 ++++----
+ po/da.po | 4 ++--
+ po/de.po | 4 ++--
+ po/es.po | 8 ++++----
+ po/et.po | 8 ++++----
+ po/fi.po | 8 ++++----
+ po/fr.po | 8 ++++----
+ po/hy.po | 8 ++++----
+ po/it.po | 6 +++---
+ po/ms.po | 4 ++--
+ po/ru.po | 4 ++--
+ po/sk.po | 6 +++---
+ po/zh_TW.po | 4 ++--
+ src/wconfig.h.in | 3 ++-
+ src/xutil.c | 3 ++-
+ util/wxcopy.c | 3 ++-
+ util/wxpaste.c | 3 ++-
+ wmlib/WMaker.h | 3 ++-
+ wmlib/app.c | 3 ++-
+ wmlib/app.h | 3 ++-
+ wmlib/command.c | 3 ++-
+ wmlib/event.c | 3 ++-
+ wmlib/menu.c | 3 ++-
+ wmlib/menu.h | 3 ++-
+ wrlib/alpha_combine.c | 3 ++-
+ wrlib/color.c | 3 ++-
+ wrlib/context.c | 3 ++-
+ wrlib/convert.c | 3 ++-
+ wrlib/convolve.c | 3 ++-
+ wrlib/draw.c | 3 ++-
+ wrlib/gif.c | 3 ++-
+ wrlib/gradient.c | 3 ++-
+ wrlib/jpeg.c | 3 ++-
+ wrlib/load.c | 3 ++-
+ wrlib/misc.c | 3 ++-
+ wrlib/nxpm.c | 3 ++-
+ wrlib/png.c | 3 ++-
+ wrlib/ppm.c | 3 ++-
+ wrlib/raster.c | 3 ++-
+ wrlib/rotate.c | 3 ++-
+ wrlib/save.c | 3 ++-
+ wrlib/scale.c | 3 ++-
+ wrlib/tiff.c | 3 ++-
+ wrlib/wraster.h | 3 ++-
+ wrlib/xpixmap.c | 3 ++-
+ wrlib/xpm.c | 3 ++-
+ wrlib/xutil.c | 3 ++-
+ 56 files changed, 132 insertions(+), 93 deletions(-)
+
+diff --git a/WINGs/data.c b/WINGs/data.c
+index 2133b80..c1c11a6 100644
+--- a/WINGs/data.c
++++ b/WINGs/data.c
+@@ -15,7 +15,8 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #include <string.h>
+diff --git a/WINGs/error.c b/WINGs/error.c
+index 7cfc946..1c38daa 100644
+--- a/WINGs/error.c
++++ b/WINGs/error.c
+@@ -15,7 +15,8 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #include "wconfig.h"
+diff --git a/WINGs/findfile.c b/WINGs/findfile.c
+index eb50609..3418c8e 100644
+--- a/WINGs/findfile.c
++++ b/WINGs/findfile.c
+@@ -15,7 +15,8 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #include "wconfig.h"
+diff --git a/WINGs/memory.c b/WINGs/memory.c
+index 39c7fc9..e996e0d 100644
+--- a/WINGs/memory.c
++++ b/WINGs/memory.c
+@@ -15,7 +15,8 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #include "wconfig.h"
+diff --git a/WINGs/wruler.c b/WINGs/wruler.c
+index f8d4af0..3c2b12b 100644
+--- a/WINGs/wruler.c
++++ b/WINGs/wruler.c
+@@ -15,7 +15,8 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #include "WINGsP.h"
+diff --git a/WPrefs.app/po/et.po b/WPrefs.app/po/et.po
+index 46747c1..c856030 100644
+--- a/WPrefs.app/po/et.po
++++ b/WPrefs.app/po/et.po
+@@ -426,8 +426,8 @@ msgid ""
+ "\n"
+ " You should have received a copy of the GNU General Public\n"
+ "License along with this program; if not, write to the Free Software\n"
+-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
+-"02111-1307, USA."
++"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n"
++"02110-1301, USA."
+ msgstr ""
+ " Window Maker on vaba tarkvara. Te vőite seda edasi\n"
+ "levitada ja/vői muuta vastavalt GNU Üldise Avaliku Litsentsi\n"
+@@ -444,8 +444,8 @@ msgstr ""
+ "\n"
+ "Te peaks olema saanud GNU Üldise Avaliku Litsentsi koopia\n"
+ "koos selle programmiga, kui ei, siis kontakteeruge Free\n"
+-"Software Foundation'iga, 59 Temple Place - Suite 330,\n"
+-"Boston, MA 02111-1307, USA."
++"Software Foundation'iga, 51 Franklin St, Fifth Floor,\n"
++"Boston, MA 02110-1301, USA."
+
+ #: ../src/dialog.c:1507
+ msgid "Legal"
+diff --git a/po/be.po b/po/be.po
+index 8c9d9af..151e618 100644
+--- a/po/be.po
++++ b/po/be.po
+@@ -427,8 +427,8 @@ msgid ""
+ "\n"
+ " You should have received a copy of the GNU General Public\n"
+ "License along with this program; if not, write to the Free Software\n"
+-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
+-"02111-1307, USA."
++"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n"
++"02110-1301, USA."
+ msgstr ""
+ " Window Maker з'яўляецца свабодным праграмным\n"
+ "забеспячэннем і распаўсюджваецца на ўмовах ліцэнзі\n"
+@@ -441,7 +441,7 @@ msgstr ""
+ " Копія GNU GPL распаўсюджваецца разам з гэтай\n"
+ "праграмай. Калі вы атрымалі гэтую праграму без копіі\n"
+ "ліцэнзіі, звярніціся ў Free Software Foundation, Inc.,\n"
+-"59 Temple Place - Suite 330, Boston, Ma 02111-1307, USA."
++"51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
+
+ #: ../src/dialog.c:1621
+ msgid "Legal"
+diff --git a/po/bg.po b/po/bg.po
+index c4df6e3..64b88de 100644
+--- a/po/bg.po
++++ b/po/bg.po
+@@ -549,8 +549,8 @@ msgid ""
+ "\n"
+ " You should have received a copy of the GNU General Public\n"
+ "License along with this program; if not, write to the Free Software\n"
+-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
+-"02111-1307, USA."
++"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n"
++"02110-1301, USA."
+ msgstr ""
+ " Уиндоу Мейкър е свободен софтуер; може да го разпространявате и/или\n"
+ "изменяте съгласно условията на Основната общодостъпна лицензия ГНУ,\n"
+@@ -564,8 +564,8 @@ msgstr ""
+ "\n"
+ " Би трябвало а сте получили копие на Основната общодостъпна\n"
+ "лицензия ГНУ (GNU General Public License) заедно с тази програма; в\n"
+-"противен случай пишете до Free Software Foundation, Inc., 59 Temple\n"
+-"Place - Suite 330, Boston, MA 02111-1307, USA."
++"противен случай пишете до Free Software Foundation, Inc., 51 Franklin St,\n"
++"Fifth Floor, Boston, MA 02110-1301, USA."
+
+ #: ../src/dialog.c:1621
+ msgid "Legal"
+diff --git a/po/ca.po b/po/ca.po
+index c1909ee..9246ab9 100644
+--- a/po/ca.po
++++ b/po/ca.po
+@@ -446,8 +446,8 @@ msgid ""
+ "\n"
+ " You should have received a copy of the GNU General Public\n"
+ "License along with this program; if not, write to the Free Software\n"
+-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
+-"02111-1307, USA."
++"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n"
++"02110-1301, USA."
+ msgstr ""
+ " Window Maker és programari lliure; el podeu redistribuïr i/o modificar "
+ "sota els termes de la Llicència Pública General GNU tal com ha estat "
+@@ -461,7 +461,7 @@ msgstr ""
+ "\n"
+ " Haurieu d'haver rebut una còpia de Llicència Pública General GNU "
+ "juntament amb aquest programa; en cas contrari demaneu-la a la Free Software "
+-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, E.U.A. "
++"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, E.U.A. "
+
+ #: ../src/dialog.c:1551
+ msgid "Legal"
+diff --git a/po/cs.po b/po/cs.po
+index 94f60d2..d157968 100644
+--- a/po/cs.po
++++ b/po/cs.po
+@@ -433,8 +433,8 @@ msgid ""
+ "\n"
+ " You should have received a copy of the GNU General Public\n"
+ "License along with this program; if not, write to the Free Software\n"
+-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
+-"02111-1307, USA."
++"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n"
++"02110-1301, USA."
+ msgstr ""
+ "Window Maker je volně šiřitelný software; můžete ho předat dál nebo\n"
+ "upravit podle podmínek GNU licence (Genral Public Licence), která\n"
+@@ -449,8 +449,8 @@ msgstr ""
+ "\n"
+ "\n"
+ "Měli by jste obdržet kopii GNU licence s tímto programem; pokud\n"
+-"tomu tak není napište organizaci Free Software Foundation:\n"
+-"Inc., 59 Temple Place - Suite 330, Boston MA, 02111-1307, USA"
++"tomu tak není napište organizaci Free Software Foundation,\n"
++"Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
+
+ #: ../src/dialog.c:1505
+ msgid "Legal"
+diff --git a/po/da.po b/po/da.po
+index 3f5fea7..ce99464 100644
+--- a/po/da.po
++++ b/po/da.po
+@@ -508,8 +508,8 @@ msgid ""
+ "\n"
+ " You should have received a copy of the GNU General Public\n"
+ "License along with this program; if not, write to the Free Software\n"
+-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
+-"02111-1307, USA."
++"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n"
++"02110-1301, USA."
+ msgstr ""
+
+ #: ../src/dialog.c:1590
+diff --git a/po/de.po b/po/de.po
+index 1267d80..3734830 100644
+--- a/po/de.po
++++ b/po/de.po
+@@ -449,8 +449,8 @@ msgid ""
+ "\n"
+ " You should have received a copy of the GNU General Public\n"
+ "License along with this program; if not, write to the Free Software\n"
+-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
+-"02111-1307, USA."
++"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n"
++"02110-1301, USA."
+ msgstr ""
+
+ #: ../src/dialog.c:1415
+diff --git a/po/es.po b/po/es.po
+index 2a7c68f..cc0a50e 100644
+--- a/po/es.po
++++ b/po/es.po
+@@ -453,8 +453,8 @@ msgid ""
+ "\n"
+ " You should have received a copy of the GNU General Public\n"
+ "License along with this program; if not, write to the Free Software\n"
+-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA\n"
+-"02110-1301 USA."
++"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n"
++"02110-1301, USA."
+ msgstr ""
+ " Window Maker es software libre; puede redistribuirlo y/o\n"
+ "modificarlo bajo los términos de la Licencia Pública General de GNU\n"
+@@ -469,8 +469,8 @@ msgstr ""
+ "\n"
+ " Debería haber recibido una copia de la Licencia Pública General de\n"
+ "GNU junto con este programa. Si no es así, escriba a Free Software\n"
+-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
+-"02111-1307, Estados Unidos de América."
++"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n"
++"02110-1301, Estados Unidos de América."
+
+ #: ../src/dialog.c:1389
+ msgid "Legal"
+diff --git a/po/et.po b/po/et.po
+index 11ef15e..6870721 100644
+--- a/po/et.po
++++ b/po/et.po
+@@ -482,8 +482,8 @@ msgid ""
+ "\n"
+ " You should have received a copy of the GNU General Public\n"
+ "License along with this program; if not, write to the Free Software\n"
+-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
+-"02111-1307, USA."
++"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n"
++"02110-1301, USA."
+ msgstr ""
+ " Window Maker on vaba tarkvara. Te võite seda edasi\n"
+ "levitada ja/või muuta vastavalt GNU Üldise Avaliku Litsentsi\n"
+@@ -498,8 +498,8 @@ msgstr ""
+ "\n"
+ "Te peaks olema saanud GNU Üldise Avaliku Litsentsi koopia\n"
+ "koos selle programmiga, kui ei, siis kontakteeruge Free\n"
+-"Software Foundation'iga, 59 Temple Place - Suite 330,\n"
+-"Boston, MA 02111-1307, USA."
++"Software Foundation'iga, 51 Franklin St, Fifth Floor,\n"
++"Boston, MA 02110-1301, USA."
+
+ #: ../src/dialog.c:1564
+ msgid "Legal"
+diff --git a/po/fi.po b/po/fi.po
+index 5ff7eea..c439873 100644
+--- a/po/fi.po
++++ b/po/fi.po
+@@ -421,8 +421,8 @@ msgid ""
+ "\n"
+ " You should have received a copy of the GNU General Public\n"
+ "License along with this program; if not, write to the Free Software\n"
+-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
+-"02111-1307, USA."
++"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n"
++"02110-1301, USA."
+ msgstr ""
+ " Window Maker on vapaa ohjelmisto; voit jakaa sitä edelleen ja/tai\n"
+ "muokata sitä Free Software Foundationin julkaiseman GNU General Public\n"
+@@ -439,8 +439,8 @@ msgstr ""
+ "\n"
+ " Tämän ohjelman mukana pitäisi tulla kopio GNU General Public\n"
+ "Licensestä. Jos näin ei ole, ilmoita siitä osoitteeseen Free Software\n"
+-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
+-"02111-1307, USA."
++"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n"
++"02110-1301, USA."
+
+ #: ../src/dialog.c:1507
+ msgid "Legal"
+diff --git a/po/fr.po b/po/fr.po
+index 3b73cd6..dac859f 100644
+--- a/po/fr.po
++++ b/po/fr.po
+@@ -432,8 +432,8 @@ msgid ""
+ "\n"
+ " You should have received a copy of the GNU General Public\n"
+ "License along with this program; if not, write to the Free Software\n"
+-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
+-"02111-1307, USA."
++"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n"
++"02110-1301, USA."
+ msgstr ""
+ " Window Maker est un logiciel libre ; il peut être redistribué\n"
+ "et/ou modifié selon les termes de la Licence Publique Générale du\n"
+@@ -448,8 +448,8 @@ msgstr ""
+ "\n"
+ " Vous devriez avoir reçu une copie de la Licence Publique\n"
+ "Générale avec ce programme ; dans le cas contraire, écrivez à la\n"
+-"Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n"
+-"Boston, MA 02111-1307, USA."
++"Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,\n"
++"Boston, MA 02110-1301, USA."
+
+ #: ../src/dialog.c:1547
+ msgid "Legal"
+diff --git a/po/hy.po b/po/hy.po
+index 4800a04..fdad0a9 100644
+--- a/po/hy.po
++++ b/po/hy.po
+@@ -548,8 +548,8 @@ msgid ""
+ "\n"
+ " You should have received a copy of the GNU General Public\n"
+ "License along with this program; if not, write to the Free Software\n"
+-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
+-"02111-1307, USA."
++"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n"
++"02110-1301, USA."
+ msgstr ""
+ " Window Maker-ը ազատ ծրագիր է; դուք կարող եք փոփոխել և/կամ\n"
+ "տարածել այն ըստ Ազատ Ծրարգերի Հիմնադրամի (Free Software Foundation)\n"
+@@ -563,8 +563,8 @@ msgstr ""
+ "\n"
+ " You should have received a copy of the GNU General Public\n"
+ "License along with this program; if not, write to the Free Software\n"
+-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
+-"02111-1307, USA."
++"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n"
++"02110-1301, USA."
+
+ #: ../src/dialog.c:1564
+ msgid "Legal"
+diff --git a/po/it.po b/po/it.po
+index 75c47cb..68b9af5 100644
+--- a/po/it.po
++++ b/po/it.po
+@@ -482,8 +482,8 @@ msgid ""
+ "\n"
+ " You should have received a copy of the GNU General Public\n"
+ "License along with this program; if not, write to the Free Software\n"
+-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
+-"02111-1307, USA."
++"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n"
++"02110-1301, USA."
+ msgstr ""
+ " Window Maker è software libero; può essere ridistribuito e/o modificato\n"
+ "nei termini della GNU General Public License come pubblicata dalla Free\n"
+@@ -497,7 +497,7 @@ msgstr ""
+ "\n"
+ " Dovreste aver ricevuto una copia della GNU General Public License\n"
+ "insieme a questo programma; se non è così, scrivete alla Free Software\n"
+-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
++"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
+
+ #: ../src/dialog.c:1563
+ msgid "Legal"
+diff --git a/po/ms.po b/po/ms.po
+index 6a0bce5..4e623ec 100644
+--- a/po/ms.po
++++ b/po/ms.po
+@@ -427,8 +427,8 @@ msgid ""
+ "\n"
+ " You should have received a copy of the GNU General Public\n"
+ "License along with this program; if not, write to the Free Software\n"
+-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
+-"02111-1307, USA."
++"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n"
++"02110-1301, USA."
+ msgstr ""
+
+ #: ../src/dialog.c:1586
+diff --git a/po/ru.po b/po/ru.po
+index eee8383..53fc543 100644
+--- a/po/ru.po
++++ b/po/ru.po
+@@ -453,8 +453,8 @@ msgid ""
+ "\n"
+ " You should have received a copy of the GNU General Public\n"
+ "License along with this program; if not, write to the Free Software\n"
+-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
+-"02111-1307, USA."
++"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n"
++"02110-1301, USA."
+ msgstr ""
+
+ #: ../src/dialog.c:1621
+diff --git a/po/sk.po b/po/sk.po
+index 8df10f8..dfd3ce8 100644
+--- a/po/sk.po
++++ b/po/sk.po
+@@ -451,8 +451,8 @@ msgid ""
+ "\n"
+ " You should have received a copy of the GNU General Public\n"
+ "License along with this program; if not, write to the Free Software\n"
+-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
+-"02111-1307, USA."
++"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n"
++"02110-1301, USA."
+ msgstr ""
+ " Tento program je free software; môžete ho rozširovať a/alebo \n"
+ "modifikovať v súlade s GNU General Public License, ktorú publikuje\n"
+@@ -468,7 +468,7 @@ msgstr ""
+ "\n"
+ "Kópiu GNU General Public License by ste mali obdržať \n"
+ "spolu s týmto programom; ak nie, píšte na Free Software Foundation,\n"
+-" Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,\n"
++" Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,\n"
+ "USA."
+
+ #: ../src/dialog.c:1551
+diff --git a/po/zh_TW.po b/po/zh_TW.po
+index 49d89a2..93181fe 100644
+--- a/po/zh_TW.po
++++ b/po/zh_TW.po
+@@ -481,8 +481,8 @@ msgid ""
+ "\n"
+ " You should have received a copy of the GNU General Public\n"
+ "License along with this program; if not, write to the Free Software\n"
+-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
+-"02111-1307, USA."
++"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n"
++"02110-1301, USA."
+ msgstr ""
+
+ #: ../src/dialog.c:1563
+diff --git a/src/wconfig.h.in b/src/wconfig.h.in
+index f4acba8..c21638d 100644
+--- a/src/wconfig.h.in
++++ b/src/wconfig.h.in
+@@ -17,7 +17,8 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #ifndef WMCONFIG_H_
+diff --git a/src/xutil.c b/src/xutil.c
+index dd52afc..fc3ebd1 100644
+--- a/src/xutil.c
++++ b/src/xutil.c
+@@ -15,7 +15,8 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #include <X11/Xlib.h>
+diff --git a/util/wxcopy.c b/util/wxcopy.c
+index d716e81..60e790d 100644
+--- a/util/wxcopy.c
++++ b/util/wxcopy.c
+@@ -14,7 +14,8 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #include <stdio.h>
+diff --git a/util/wxpaste.c b/util/wxpaste.c
+index 87fc892..bb8fe51 100644
+--- a/util/wxpaste.c
++++ b/util/wxpaste.c
+@@ -14,7 +14,8 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #include "../config.h"
+diff --git a/wmlib/WMaker.h b/wmlib/WMaker.h
+index 23def87..724b326 100644
+--- a/wmlib/WMaker.h
++++ b/wmlib/WMaker.h
+@@ -15,7 +15,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #ifndef _WMLIB_H_
+diff --git a/wmlib/app.c b/wmlib/app.c
+index 2389df3..9cd27c8 100644
+--- a/wmlib/app.c
++++ b/wmlib/app.c
+@@ -16,7 +16,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #include <X11/Xlib.h>
+diff --git a/wmlib/app.h b/wmlib/app.h
+index 3f38f1f..4cac95c 100644
+--- a/wmlib/app.h
++++ b/wmlib/app.h
+@@ -16,7 +16,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #ifndef _APP_H_
+diff --git a/wmlib/command.c b/wmlib/command.c
+index 8c643d9..70ec0f5 100644
+--- a/wmlib/command.c
++++ b/wmlib/command.c
+@@ -16,7 +16,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #include <X11/Xlib.h>
+diff --git a/wmlib/event.c b/wmlib/event.c
+index 6caeb75..ceb5ae9 100644
+--- a/wmlib/event.c
++++ b/wmlib/event.c
+@@ -16,7 +16,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #include <stdlib.h>
+diff --git a/wmlib/menu.c b/wmlib/menu.c
+index 46f6de1..0378427 100644
+--- a/wmlib/menu.c
++++ b/wmlib/menu.c
+@@ -16,7 +16,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #include <stdlib.h>
+diff --git a/wmlib/menu.h b/wmlib/menu.h
+index 9163eac..a611a1a 100644
+--- a/wmlib/menu.h
++++ b/wmlib/menu.h
+@@ -16,7 +16,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #ifndef _MENU_H_
+diff --git a/wrlib/alpha_combine.c b/wrlib/alpha_combine.c
+index e670d62..b410186 100644
+--- a/wrlib/alpha_combine.c
++++ b/wrlib/alpha_combine.c
+@@ -14,7 +14,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #include "wraster.h"
+diff --git a/wrlib/color.c b/wrlib/color.c
+index 75140f9..c0c7719 100644
+--- a/wrlib/color.c
++++ b/wrlib/color.c
+@@ -16,7 +16,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #include <config.h>
+diff --git a/wrlib/context.c b/wrlib/context.c
+index 0fe956c..6a4f04e 100644
+--- a/wrlib/context.c
++++ b/wrlib/context.c
+@@ -16,7 +16,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #include <config.h>
+diff --git a/wrlib/convert.c b/wrlib/convert.c
+index a05e363..2b0d415 100644
+--- a/wrlib/convert.c
++++ b/wrlib/convert.c
+@@ -16,7 +16,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ /* Problems:
+diff --git a/wrlib/convolve.c b/wrlib/convolve.c
+index 270fa7c..57072f0 100644
+--- a/wrlib/convolve.c
++++ b/wrlib/convolve.c
+@@ -15,7 +15,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #include <config.h>
+diff --git a/wrlib/draw.c b/wrlib/draw.c
+index 071f016..7f54c7a 100644
+--- a/wrlib/draw.c
++++ b/wrlib/draw.c
+@@ -17,7 +17,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #include <config.h>
+diff --git a/wrlib/gif.c b/wrlib/gif.c
+index 29068ad..081f1ee 100644
+--- a/wrlib/gif.c
++++ b/wrlib/gif.c
+@@ -16,7 +16,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #include <config.h>
+diff --git a/wrlib/gradient.c b/wrlib/gradient.c
+index 383ecf8..718f879 100644
+--- a/wrlib/gradient.c
++++ b/wrlib/gradient.c
+@@ -17,7 +17,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #include <config.h>
+diff --git a/wrlib/jpeg.c b/wrlib/jpeg.c
+index 22a8767..68f4e02 100644
+--- a/wrlib/jpeg.c
++++ b/wrlib/jpeg.c
+@@ -16,7 +16,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #include <config.h>
+diff --git a/wrlib/load.c b/wrlib/load.c
+index d636250..d3ae8ad 100644
+--- a/wrlib/load.c
++++ b/wrlib/load.c
+@@ -16,7 +16,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #include <config.h>
+diff --git a/wrlib/misc.c b/wrlib/misc.c
+index 7117d81..bbebee3 100644
+--- a/wrlib/misc.c
++++ b/wrlib/misc.c
+@@ -15,7 +15,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+ #include <config.h>
+
+diff --git a/wrlib/nxpm.c b/wrlib/nxpm.c
+index 706d241..45ace0d 100644
+--- a/wrlib/nxpm.c
++++ b/wrlib/nxpm.c
+@@ -16,7 +16,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #include <config.h>
+diff --git a/wrlib/png.c b/wrlib/png.c
+index 5cb9918..e28d730 100644
+--- a/wrlib/png.c
++++ b/wrlib/png.c
+@@ -16,7 +16,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #include <config.h>
+diff --git a/wrlib/ppm.c b/wrlib/ppm.c
+index d89d917..e4bd758 100644
+--- a/wrlib/ppm.c
++++ b/wrlib/ppm.c
+@@ -16,7 +16,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #include <config.h>
+diff --git a/wrlib/raster.c b/wrlib/raster.c
+index f01db84..fbc73a7 100644
+--- a/wrlib/raster.c
++++ b/wrlib/raster.c
+@@ -16,7 +16,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #include <config.h>
+diff --git a/wrlib/rotate.c b/wrlib/rotate.c
+index 472c51a..b1379ba 100644
+--- a/wrlib/rotate.c
++++ b/wrlib/rotate.c
+@@ -16,7 +16,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #include <config.h>
+diff --git a/wrlib/save.c b/wrlib/save.c
+index 7ae379a..1c8b78b 100644
+--- a/wrlib/save.c
++++ b/wrlib/save.c
+@@ -16,7 +16,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #include <config.h>
+diff --git a/wrlib/scale.c b/wrlib/scale.c
+index c5b5caf..6990afe 100644
+--- a/wrlib/scale.c
++++ b/wrlib/scale.c
+@@ -16,7 +16,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #include <config.h>
+diff --git a/wrlib/tiff.c b/wrlib/tiff.c
+index 56f0636..accdfbe 100644
+--- a/wrlib/tiff.c
++++ b/wrlib/tiff.c
+@@ -16,7 +16,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #include <config.h>
+diff --git a/wrlib/wraster.h b/wrlib/wraster.h
+index b55af32..40f031b 100644
+--- a/wrlib/wraster.h
++++ b/wrlib/wraster.h
+@@ -15,7 +15,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ /*
+diff --git a/wrlib/xpixmap.c b/wrlib/xpixmap.c
+index 219ac62..14bed08 100644
+--- a/wrlib/xpixmap.c
++++ b/wrlib/xpixmap.c
+@@ -16,7 +16,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #include <config.h>
+diff --git a/wrlib/xpm.c b/wrlib/xpm.c
+index 9237689..5ce1ea1 100644
+--- a/wrlib/xpm.c
++++ b/wrlib/xpm.c
+@@ -16,7 +16,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #include <config.h>
+diff --git a/wrlib/xutil.c b/wrlib/xutil.c
+index 0588ae3..6d0b242 100644
+--- a/wrlib/xutil.c
++++ b/wrlib/xutil.c
+@@ -16,7 +16,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #include <config.h>
+--
+1.8.1
+
diff --git a/0002-Include-LGPL-with-correct-FSF-address.patch b/0002-Include-LGPL-with-correct-FSF-address.patch
new file mode 100644
index 0000000..f882666
--- /dev/null
+++ b/0002-Include-LGPL-with-correct-FSF-address.patch
@@ -0,0 +1,144 @@
+From 930ac143a80aa585e33ec17c03ea231a50041bf4 Mon Sep 17 00:00:00 2001
+From: Andreas Bierfert <andreas.bierfert at lowlatency.de>
+Date: Mon, 7 Jan 2013 21:33:47 +0100
+Subject: [PATCH 2/2] Include LGPL with correct FSF address
+
+(see http://www.gnu.org/licenses/old-licenses/lgpl-2.0.txt)
+---
+ wmlib/COPYING.LIB | 20 ++++++++++----------
+ wrlib/COPYING | 20 ++++++++++----------
+ 2 files changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/wmlib/COPYING.LIB b/wmlib/COPYING.LIB
+index eb685a5..5bc8fb2 100644
+--- a/wmlib/COPYING.LIB
++++ b/wmlib/COPYING.LIB
+@@ -1,15 +1,15 @@
+- GNU LIBRARY GENERAL PUBLIC LICENSE
+- Version 2, June 1991
++ GNU LIBRARY GENERAL PUBLIC LICENSE
++ Version 2, June 1991
+
+ Copyright (C) 1991 Free Software Foundation, Inc.
+- 675 Mass Ave, Cambridge, MA 02139, USA
++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ [This is the first released version of the library GPL. It is
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
+
+- Preamble
++ Preamble
+
+ The licenses for most software are designed to take away your
+ freedom to share and change it. By contrast, the GNU General Public
+@@ -99,7 +99,7 @@ works together with the library.
+ Note that it is possible for a library to be covered by the ordinary
+ General Public License rather than by this special one.
+
+- GNU LIBRARY GENERAL PUBLIC LICENSE
++ GNU LIBRARY GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library which
+@@ -411,7 +411,7 @@ decision will be guided by the two goals of preserving the free status
+ of all derivatives of our free software and of promoting the sharing
+ and reuse of software generally.
+
+- NO WARRANTY
++ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+ WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+@@ -434,9 +434,9 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ DAMAGES.
+
+- END OF TERMS AND CONDITIONS
++ END OF TERMS AND CONDITIONS
+
+- Appendix: How to Apply These Terms to Your New Libraries
++ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+ possible use to the public, we recommend making it free software that
+@@ -463,8 +463,8 @@ convey the exclusion of warranty; and each file should have at least the
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+- License along with this library; if not, write to the Free
+- Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ License along with this library; if not, write to the Free Software
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ Also add information on how to contact you by electronic and paper mail.
+
+diff --git a/wrlib/COPYING b/wrlib/COPYING
+index eb685a5..5bc8fb2 100644
+--- a/wrlib/COPYING
++++ b/wrlib/COPYING
+@@ -1,15 +1,15 @@
+- GNU LIBRARY GENERAL PUBLIC LICENSE
+- Version 2, June 1991
++ GNU LIBRARY GENERAL PUBLIC LICENSE
++ Version 2, June 1991
+
+ Copyright (C) 1991 Free Software Foundation, Inc.
+- 675 Mass Ave, Cambridge, MA 02139, USA
++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ [This is the first released version of the library GPL. It is
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
+
+- Preamble
++ Preamble
+
+ The licenses for most software are designed to take away your
+ freedom to share and change it. By contrast, the GNU General Public
+@@ -99,7 +99,7 @@ works together with the library.
+ Note that it is possible for a library to be covered by the ordinary
+ General Public License rather than by this special one.
+
+- GNU LIBRARY GENERAL PUBLIC LICENSE
++ GNU LIBRARY GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library which
+@@ -411,7 +411,7 @@ decision will be guided by the two goals of preserving the free status
+ of all derivatives of our free software and of promoting the sharing
+ and reuse of software generally.
+
+- NO WARRANTY
++ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+ WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+@@ -434,9 +434,9 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ DAMAGES.
+
+- END OF TERMS AND CONDITIONS
++ END OF TERMS AND CONDITIONS
+
+- Appendix: How to Apply These Terms to Your New Libraries
++ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+ possible use to the public, we recommend making it free software that
+@@ -463,8 +463,8 @@ convey the exclusion of warranty; and each file should have at least the
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+- License along with this library; if not, write to the Free
+- Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ License along with this library; if not, write to the Free Software
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ Also add information on how to contact you by electronic and paper mail.
+
+--
+1.8.1
+
diff --git a/WindowMaker.spec b/WindowMaker.spec
index 736dec4..2613906 100644
--- a/WindowMaker.spec
+++ b/WindowMaker.spec
@@ -1,7 +1,7 @@
Summary: A fast, feature rich Window Manager
Name: WindowMaker
Version: 0.95.4
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Group: User Interface/Desktops
URL: http://www.windowmaker.org
@@ -19,6 +19,14 @@ Source4: WPrefs-uk.po
# http://repo.or.cz/w/wmaker-crm.git/patch/37677b2ec08c514e2234400244d15b989c4b8faf?hp=a2de2c34eea348aaff5f39434ce297a322672140
Patch0: 0001-Fix-underlinking.patch
+# fix incorrect fsf address
+# see
+# http://repo.or.cz/w/wmaker-crm.git/commit/085224973a3c03c184afd362273f4746c54f5db1
+# and
+# http://repo.or.cz/w/wmaker-crm.git/commit/0b74ae41944dbec80e7a26bd02312d4ae6cebff7
+Patch1: 0001-Fix-incorrect-FSF-address.patch
+Patch2: 0002-Include-LGPL-with-correct-FSF-address.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
# X BR
BuildRequires: libICE-devel
@@ -107,6 +115,9 @@ icons and a few themes.
%patch0 -p1 -b .fixunderlinking
+%patch1 -p1 -b .fixfsfaddress
+%patch2 -p1 -b .usecurrentlgpl
+
# add uk translation
cp %{SOURCE3} po/uk.po
cp %{SOURCE4} WPrefs.app/po/uk.po
@@ -300,6 +311,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/get-wutil-flags*
%changelog
+* Tue Jan 08 2013 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.95.4-3
+- more fsf fixes from wmaker-crm git
+
* Mon Jan 07 2013 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- 0.95.4-2
- fix incorrect fsf address
More information about the scm-commits
mailing list