From 5ac7e0539f5cc262a9f5f0dc57233f4e09656748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salvador=20Pardi=C3=B1as?= Date: Wed, 21 Jun 2017 00:08:28 -0300 Subject: [PATCH 01/10] Added AUR link (#115) --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 90fe552..a870c99 100644 --- a/README.md +++ b/README.md @@ -62,5 +62,8 @@ $ make $ sudo make install ``` +# Distribution Packages +[Arch Linux](https://aur.archlinux.org/packages/woeusb-git/) + ## License WoeUSB is sold under the [GPL license](https://github.com/slacka/WoeUSB/blob/master/COPYING). From 57a510bd8c5a8fa0927289f2d45b706d72093aa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salvador=20Pardi=C3=B1as?= Date: Sun, 2 Jul 2017 03:25:31 -0300 Subject: [PATCH 02/10] Fixed autoreconf error (#116) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The migration of README to README.md and README.upstream causes `autoreconf --force --install` command to error with `Makefile.am: error: required file './README' not found`, this is due to the GNU Automake strictness is previously set to GNU(which requires the README file's existence). This commit loosen the strictness to `foreign` to avoid the README file requirement. Authored-by: Salvador Pardiñas Reviewed-by: 林博仁 Signed-off-by: 林博仁 --- Makefile.am | 1 - configure.in | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index d69b7af..327d65e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,3 @@ -AUTOMAKE_OPTIONS = gnu SUBDIRS = src innoSetup debian diff --git a/configure.in b/configure.in index 201d63a..143c8ca 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ AC_INIT(woeusb, @@WOEUSB_VERSION@@) AC_CONFIG_SRCDIR([src]) -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([foreign]) AC_CONFIG_MACRO_DIR([m4]) MY_PACKAGE_INIT([WoeUSB]) From 054a2e9f70095729eff41942c4b6067331048317 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salvador=20Pardi=C3=B1as?= Date: Thu, 6 Jul 2017 22:49:19 -0300 Subject: [PATCH 03/10] Created needed m4 folder .keep file is needed because Git doesn't allow empty folders --- m4/.keep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 m4/.keep diff --git a/m4/.keep b/m4/.keep new file mode 100644 index 0000000..e69de29 From ee746167995d5cfc8b867d88888a03af5f2978a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salvador=20Pardi=C3=B1as?= Date: Thu, 6 Jul 2017 23:33:15 -0300 Subject: [PATCH 04/10] Better fix for m4 --- Makefile.am | 1 - m4/.keep | 0 2 files changed, 1 deletion(-) delete mode 100644 m4/.keep diff --git a/Makefile.am b/Makefile.am index 327d65e..dacaac9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,6 @@ SUBDIRS = src innoSetup debian # M4 -ACLOCAL_AMFLAGS = -I m4 ## Pour fichier COPYING pkgdocdir=$(prefix) diff --git a/m4/.keep b/m4/.keep deleted file mode 100644 index e69de29..0000000 From fdecc0821160437697e5985b7706ccb5e8fb795a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salvador=20Pardi=C3=B1as?= Date: Sun, 9 Jul 2017 23:25:50 -0300 Subject: [PATCH 05/10] Updated README to add autoreconf step --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a870c99..cccc8b9 100644 --- a/README.md +++ b/README.md @@ -57,6 +57,7 @@ $ dpkg-buildpackage -uc -b # NOTE: Currently due to bug in the build system this $ sudo gdebi ../woeusb__.deb # Generic method +$ autoreconf --force --install # Most non-debian derived distros will need this $ ./configure $ make $ sudo make install From a4866c51cb443c3109c41ff49ed9d0ede91249cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salvador=20Pardi=C3=B1as?= Date: Sun, 9 Jul 2017 23:43:06 -0300 Subject: [PATCH 06/10] Fixed italics --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index cccc8b9..6533bba 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ [![Build Status](https://travis-ci.org/slacka/WoeUSB.svg?branch=master)](https://travis-ci.org/slacka/WoeUSB) + _A Linux program to create Windows USB stick installer from a real Windows DVD or an image._ This package contains two programs: From 05eda7ada6a14f987120428bdbfd1068f193e53d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salvador=20Pardi=C3=B1as?= Date: Mon, 10 Jul 2017 00:01:18 -0300 Subject: [PATCH 07/10] Fixed locale issue #50 --- configure.in | 2 ++ src/locale/Makefile.am | 5 ++++- src/locale/fr/LC_MESSAGES/Makefile.am | 5 ++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 143c8ca..c30065b 100644 --- a/configure.in +++ b/configure.in @@ -37,6 +37,8 @@ AC_OUTPUT([Makefile src/locale/Makefile src/locale/fr/Makefile src/locale/fr/LC_MESSAGES/Makefile +# src/locale/zh_TW/Makefile +# src/locale/zh_TW/LC_MESSAGES/Makefile debian/Makefile innoSetup/Makefile]) diff --git a/src/locale/Makefile.am b/src/locale/Makefile.am index b5ec410..0f19938 100755 --- a/src/locale/Makefile.am +++ b/src/locale/Makefile.am @@ -1,4 +1,7 @@ # Il faut mettre les fichiers dans le sous dossier locale de share... -SUBDIRS = fr +SUBDIRS = fr #zh_TW EXTRA_DIST = $(srcdir)/*.mo $(srcdir)/*.po + +all-local: + msgfmt default.po -o default.mo diff --git a/src/locale/fr/LC_MESSAGES/Makefile.am b/src/locale/fr/LC_MESSAGES/Makefile.am index 879591b..04adec5 100755 --- a/src/locale/fr/LC_MESSAGES/Makefile.am +++ b/src/locale/fr/LC_MESSAGES/Makefile.am @@ -1,5 +1,8 @@ # Il faut mettre les fichiers dans le sous dossier locale/fr/LC_MESSAGES de share... pkgdatadir=$(mypkgdatadir)/locale/fr/LC_MESSAGES -dist_pkgdata_DATA = $(srcdir)/*.mo EXTRA_DIST = $(srcdir)/*.po + +all-local: + msgfmt trad.po -o trad.mo + msgfmt wxstd.po -o wxstd.mo From a4b83fcbad2192b40da35c4384335e9940e6055a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salvador=20Pardi=C3=B1as?= Date: Mon, 10 Jul 2017 01:09:36 -0300 Subject: [PATCH 08/10] Fixed compile issue I hate autoconf. --- configure.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/configure.in b/configure.in index c30065b..143c8ca 100644 --- a/configure.in +++ b/configure.in @@ -37,8 +37,6 @@ AC_OUTPUT([Makefile src/locale/Makefile src/locale/fr/Makefile src/locale/fr/LC_MESSAGES/Makefile -# src/locale/zh_TW/Makefile -# src/locale/zh_TW/LC_MESSAGES/Makefile debian/Makefile innoSetup/Makefile]) From 3d29ed0dbd56c828e55586d516656afebdf7187b Mon Sep 17 00:00:00 2001 From: Sebastian Meier zu Biesen Date: Sat, 22 Jul 2017 15:01:23 +0100 Subject: [PATCH 09/10] updated readme as this(WoeUSB) is not really sold added a strikethrough for the word 'sold' and replaced it with 'distributed' --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6533bba..d9fc749 100644 --- a/README.md +++ b/README.md @@ -68,4 +68,4 @@ $ sudo make install [Arch Linux](https://aur.archlinux.org/packages/woeusb-git/) ## License -WoeUSB is sold under the [GPL license](https://github.com/slacka/WoeUSB/blob/master/COPYING). +WoeUSB is sold distributed under the [GPL license](https://github.com/slacka/WoeUSB/blob/master/COPYING). From 8da397e3dfb350a3675c364edc9c8d2300db8791 Mon Sep 17 00:00:00 2001 From: Sebastian Meier zu Biesen Date: Tue, 25 Jul 2017 12:18:35 +0100 Subject: [PATCH 10/10] Updated Readme.MD to adhere more closely to GPL terms as requested by @slacka have removed the HTML tags to strikeout the "offending" word ;) 'sold' has been replaced with 'distributed' --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d9fc749..03a72fc 100644 --- a/README.md +++ b/README.md @@ -68,4 +68,4 @@ $ sudo make install [Arch Linux](https://aur.archlinux.org/packages/woeusb-git/) ## License -WoeUSB is sold distributed under the [GPL license](https://github.com/slacka/WoeUSB/blob/master/COPYING). +WoeUSB is distributed under the [GPL license](https://github.com/slacka/WoeUSB/blob/master/COPYING).