Move Files, fix license

i-nex · Jan 29, 2014 · a8e46c0 · a8e46c0
1 parent af59491
commit a8e46c0
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 9 deletions.
diff --git a/JSON/cpu.c → JSON/i-nex-cpuid.c b/JSON/cpu.c → JSON/i-nex-cpuid.c
diff --git a/JSON/cpusage.c → JSON/i-nex-cpusage.c b/JSON/cpusage.c → JSON/i-nex-cpusage.c
diff --git a/JSON/edid-decode.c → JSON/i-nex-edid.c b/JSON/edid-decode.c → JSON/i-nex-edid.c
diff --git a/JSON/glinfo.c → JSON/i-nex-glinfo.c b/JSON/glinfo.c → JSON/i-nex-glinfo.c
diff --git a/JSON/uname.c → JSON/i-nex-uname.c b/JSON/uname.c → JSON/i-nex-uname.c
diff --git a/JSON/free.c → JSON/i-nex-usage.c b/JSON/free.c → JSON/i-nex-usage.c
@@ -71,7 +71,7 @@ int main() {
 		printf("	},\n");
 		printf("	\"USED_PLUS_CACHED\": %ld ,\n", (kb_main_used - buffers_plus_cached)/1024);
 		printf("	\"FREE_PLUS_CACHED\": %ld ,\n", (kb_main_free + buffers_plus_cached)/1024);
-		printf("			\"TOTAL\": {\n");			
+		printf("			\"TOTAL\": {\n");
 		printf("			\"TOTAL\": {\n");
 		printf("				\"TOTAL\": %ld ,\n", (kb_main_total + kb_swap_total)/1024);
 		printf("				\"USED\": %ld ,\n", (kb_main_used + kb_swap_used)/1024);

diff --git a/Makefile b/Makefile
@@ -65,12 +65,12 @@ dependency_build ?= git \
 
 make:
 	@printf "\033[1;31mCompile edid-decode as inex-decode \033[0m$1\n"
-	$(CC) -o i-nex-edid JSON/edid-decode.c $(CFLAGS) $(additional_confflags)
-	$(CC) -o i-nex-cpuid JSON/cpu.c -static $(CC_OPTS_LIBCPUID) $(additional_confflags)
-	$(CC) -o i-nex-usage JSON/free.c -static $(CC_OPTS_LIBPROCPS) $(additional_confflags)
-	$(CC) -o i-nex-cpusage JSON/cpusage.c $(additional_confflags)
-	$(CC) -o i-nex-glinfo JSON/glinfo.c $(libx11) $(libgl) $(libxext) $(additional_confflags)
-	$(CC) -o i-nex-uname JSON/uname.c $(additional_confflags)
+	$(CC) -o i-nex-edid JSON/i-nex-edid.c $(CFLAGS) $(additional_confflags)
+	$(CC) -o i-nex-cpuid JSON/i-nex-cpuid.c -static $(CC_OPTS_LIBCPUID) $(additional_confflags)
+	$(CC) -o i-nex-usage JSON/i-nex-usage.c -static $(CC_OPTS_LIBPROCPS) $(additional_confflags)
+	$(CC) -o i-nex-cpusage JSON/i-nex-cpusage.c $(additional_confflags)
+	$(CC) -o i-nex-glinfo JSON/i-nex-glinfo.c $(libx11) $(libgl) $(libxext) $(additional_confflags)
+	$(CC) -o i-nex-uname JSON/i-nex-uname.c $(additional_confflags)
 	@printf "\033[1;31mCompile src/i-nex stage 1 \033[0m$1\n"
 	$(GBC) $(GBCOPTS) src/i-nex
 	@printf "\033[1;31mCompile src/i-nex stage 2 \033[0m$1\n"

diff --git a/debian/copyright b/debian/copyright
@@ -88,7 +88,7 @@ License: GPL-3+
  License version 3 can be found in the file
  `/usr/share/common-licenses/GPL-3'.
 
-Files: edid-decode.c
+Files: JSON/i-nex-edid.c
 Copyright: Red Hat, Inc.
 License: Copyright 2006-2009 Red Hat, Inc.
   Permission is hereby granted, free of charge, to any person obtaining a
@@ -107,7 +107,19 @@ License: Copyright 2006-2009 Red Hat, Inc.
   IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-
+Files: JSON/*.c
+Copyright: 2011-2014 eloaders <eloaders@linux.pl>
+License: GPL-3+
+ This software is licensed to you under the GNU General Public License,
+ version 3 (GPLv3). There is NO WARRANTY for this software, express or
+ implied, including the implied warranties of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv3
+ along with this software; if not, see <http://www.gnu.org/licenses/>.
+ .
+ On Ubuntu and Debian systems, the full text of the GNU General Public
+ License version 3 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
+
 Files: src/i-nex/Database/Logos/*
 Copyright: Intel, AMD
 License: Registered trademarks