Merge branch 'HostsUtl-Desktop-Dev'

huhamhire · Aug 4, 2013 · 952fa72 · 952fa72
2 parents e2695bb + 5f048fa
commit 952fa72
Show file tree

Hide file tree

Showing 28 changed files with 980 additions and 235 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -5,3 +5,7 @@
 *.zip   binary
 *.dmg   binary
 *.tar.gz   binary
+*.png   binary
+*.ico   binary
+*.icns  binary
+*.qm    binary
diff --git a/.gitignore b/.gitignore
@@ -1 +1,6 @@
 *.tmp
+*.pyc
+*.data
+Thumbs.db
+hosts
+.DS_Store
diff --git a/README → README.md b/README → README.md
diff --git a/_build.py b/_build.py
@@ -70,16 +70,18 @@
         ]
     ),
     "LICENSE",
-    "README",
+    "README.md",
+    "network.conf",
 ]
 
 if sys.argv > 1:
     tar_flag = 0
     if sys.argv[1] == "py2tar":
         # Pack up script package for Linux users
         file_path = lambda rel_path: SCRIPT_DIR + rel_path
-        includes = ["*.py", "lang/*.qm", "LICENSE", "README"]
-        excludes = ["_*.py", ".gitattributes", "README.md"]
+        includes = [
+            "*.py", "lang/*.qm", "LICENSE", "README.md", "network.conf"]
+        excludes = ["_*.py", ".gitattributes"]
         ex_files = []
         prefix = "HostsUtl-x11-gpl-"
         tar_flag = 1
@@ -88,7 +90,7 @@
         # Pack up source package for Linux users
         file_path = lambda rel_path: SCRIPT_DIR + rel_path
         includes = ["*"]
-        excludes = [".gitattributes", "README.md"]
+        excludes = [".gitattributes"]
         ex_files = []
         prefix = "HostsUtl-source-gpl-"
         tar_flag = 1