Cleanup Ubuntu Builds

* Add line to Readme about Ubuntu packages available on Github
  Releases page.
* Add Ubuntu .deb file to upload list in release.sh.
* Add Ubuntu build to default build list.

* Fix ownership of folders in Ubuntu package.

README.md

@@ -53,6 +53,7 @@ For specific Linux distributions:
 * **Nix/NixOS** - Run `nix-env -iA pencil`. You'll need to be tracking
   [Unstable][nix-unstable].
 * **openSuse** - Available in the [graphics repository][graphics-repository].
+* **Ubuntu** - A .deb is available on the [Releases Page][releases].
 
 ## Build
 

build/build.sh

@@ -16,6 +16,7 @@ run_task() {
   fi
 }
 
+
 prep() {
     rm -Rf ./Outputs/
     mkdir -p ./Outputs
@@ -257,15 +258,15 @@ mac() {
 
 
 ubuntu() {
-    PKG="pencil_${VERSION}"
+    PKG="pencil-${VERSION}-ubuntu-all"
     DIR_TARGET="./Outputs/Ubuntu"
     DIR_BASE="${DIR_TARGET}/${PKG}"
     DIR_DEB="${DIR_BASE}/DEBIAN"
     DIR_SHARE="${DIR_BASE}/usr/share"
 
-    echo "---------------------------------------------"
-    echo "* Building Ubuntu amd 64                    *"
-    echo "---------------------------------------------"
+    echo "-----------------------"
+    echo "* Building Ubuntu deb *"
+    echo "-----------------------"
 
     rm -Rf ${DIR_TARGET}
 
@@ -293,24 +294,25 @@ ubuntu() {
     done
 
     IFS="${old_ifs}"
-    # run_task chown -R root ${DIR_BASE}
     run_task cp ../CHANGELOG.md ${DIR_SHARE}/doc/pencil/changelog
     run_task gzip -9 ${DIR_SHARE}/doc/pencil/changelog
 
     # Remove extra license files to avoid Lintian warning
     rm ${DIR_SHARE}/pencil/content/pencil/license.txt
     rm ${DIR_SHARE}/pencil/license.txt
 
+    # Packages retain ownership, files should be owned by root
+    run_task sudo chown -R root ${DIR_BASE}
+
     run_task dpkg-deb --build ${DIR_BASE}
 
-    #~ run_task cp ./Ubuntu/control ${DIR_BASE}/control
-    #~ run_task cp ./Ubuntu/rules ${DIR_BASE}/rules
-    #~ run_task cd ${DIR_BASE}
+    run_task mv ${DIR_TARGET}/*.deb ./Outputs/
 
-    #~ run_task sh ./deb
-    #~ run_task mv ../evoluspencil_2.0.2_all.deb ../../evoluspencil_2.0.2_all.deb
+    # Clean up the build dir now, while we still have sudo access
+    sudo rm -rf ${DIR_TARGET}
 }
 
+
 clean() {
     echo "------------------------"
     echo "* Removing Built Files *"
@@ -381,6 +383,7 @@ case "$1" in
         mac
         linux
         linuxpkg
+        ubuntu
         ;;
 esac
 

build/release.sh

@@ -82,6 +82,7 @@ main() {
     BUILD_FILES=("Pencil-$NEW_VERSION-firefox.xpi"
                  "Pencil-$NEW_VERSION-linux.tar.gz"
                  "Pencil-$NEW_VERSION-linux-pkg.tar.gz"
+                 "pencil-$NEW_VERSION-ubuntu-all.deb"
                  "Pencil-$NEW_VERSION-mac-osx.zip"
                  "Pencil-$NEW_VERSION-win32.installer.exe")