From 5d91af6a44c5938f6fcf873df2e1b6c12c49b5fe Mon Sep 17 00:00:00 2001
From: Dagen Brock <dagenbrock@gmail.com>
Date: Wed, 22 Aug 2018 14:23:11 -0500
Subject: [PATCH 1/2] add a simple deb packaging script to ci

---
 .gitlab-ci.yml | 24 +++++++++++++++++++++++-
 assets/control | 10 ++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 assets/control

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fa2945f..13e76b4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -94,15 +94,36 @@ package-ubuntu-sdl2:
     paths:
       - gsplus-ubuntu-sdl.tar.bz2
     expire_in: 10 minutes
+
+package-ubuntu-sdl2-deb:
+  tags:
+    - ubuntu
+  stage: package
+  variables:
+    GIT_STRATEGY: fetch
+    PACKAGE_NAME: gsplus_$CI_BUILD_ID-0
+  script:
+    - mkdir -p $PACKAGE_NAME/usr/local/bin
+    - mkdir -p $PACKAGE_NAME/DEBIAN
+    - cp gsplus $PACKAGE_NAME/usr/local/bin
+    - cp assets/control $PACKAGE_NAME/DEBIAN
+    - dpkg-dev --build $PACKAGE_NAME
+  artifacts:
+    paths:
+      - $PACKAGE_NAME
+    expire_in: 10 minutes
+
 deploy-ubuntu:
   tags:
     - ubuntu
   stage: deploy
   variables:
     GIT_STRATEGY: none
+    PACKAGE_NAME: gsplus_$CI_BUILD_ID-0
+
   script:
     - aws s3 cp gsplus-ubuntu-sdl.tar.bz2 s3://$AWS_BUCKET/$CI_TAG/$CI_VERSION/$CI_PIPELINE_ID/ubuntu-sdl/$CI_BUILD_ID/ --acl public-read
-
+    - aws s3 cp $PACKAGE_NAME s3://$AWS_BUCKET/$CI_TAG/$CI_VERSION/$CI_PIPELINE_ID/ubuntu-sdl-deb/$CI_BUILD_ID/ --acl public-read
 
 
 
@@ -270,6 +291,7 @@ deploy-win-sdl2:
 update-website-universal:
   tags:
     - osx
+    - linux
   stage: updatewebsite
   variables:
     GIT_STRATEGY: none
diff --git a/assets/control b/assets/control
new file mode 100644
index 0000000..6f878f7
--- /dev/null
+++ b/assets/control
@@ -0,0 +1,10 @@
+Package: gsplus
+Version: 0.14-0
+Section: base
+Priority: optional
+Architecture: amd64
+Depends: libsdl2-2.0-0, libfreetype6, libsdl2-image-2.0-0
+Maintainer: Dagen Brock <dagenbrock@gmail.com>
+Description: GSplus
+ An Apple IIgs emulator for multiple platforms,
+ based on KEGS

From 64dbfac188a6cdc8b347a9ca81b72817dd7c79fa Mon Sep 17 00:00:00 2001
From: Dagen Brock <dagenbrock@gmail.com>
Date: Wed, 22 Aug 2018 14:30:02 -0500
Subject: [PATCH 2/2] fix artifact name

---
 .gitlab-ci.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 13e76b4..e1de630 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -82,7 +82,7 @@ package-ubuntu-sdl2:
   script:
     - mkdir $PACKAGE_DIR
     - mkdir $PACKAGE_DIR/doc
-    - mv gsplus-ubuntu-sdl.bin $PACKAGE_DIR/gsplus
+    - cp gsplus-ubuntu-sdl.bin $PACKAGE_DIR/gsplus
     - cp src/config.txt $PACKAGE_DIR
     - 'echo "# CI_BUILD_ID: $CI_BUILD_ID" >> $PACKAGE_DIR/config.txt'
     - cp src/parallel.rom %PACKAGE_DIR%
@@ -101,16 +101,16 @@ package-ubuntu-sdl2-deb:
   stage: package
   variables:
     GIT_STRATEGY: fetch
-    PACKAGE_NAME: gsplus_$CI_BUILD_ID-0
+    PACKAGE_NAME: gsplus_$CI_VERSION-0
   script:
     - mkdir -p $PACKAGE_NAME/usr/local/bin
     - mkdir -p $PACKAGE_NAME/DEBIAN
-    - cp gsplus $PACKAGE_NAME/usr/local/bin
+    - cp gsplus-ubuntu-sdl.bin $PACKAGE_NAME/usr/local/bin/gsplus
     - cp assets/control $PACKAGE_NAME/DEBIAN
-    - dpkg-dev --build $PACKAGE_NAME
+    - dpkg-deb --build $PACKAGE_NAME
   artifacts:
     paths:
-      - $PACKAGE_NAME
+      - $PACKAGE_NAME.deb
     expire_in: 10 minutes
 
 deploy-ubuntu:
@@ -119,11 +119,11 @@ deploy-ubuntu:
   stage: deploy
   variables:
     GIT_STRATEGY: none
-    PACKAGE_NAME: gsplus_$CI_BUILD_ID-0
+    PACKAGE_NAME: gsplus_$CI_VERSION-0
 
   script:
     - aws s3 cp gsplus-ubuntu-sdl.tar.bz2 s3://$AWS_BUCKET/$CI_TAG/$CI_VERSION/$CI_PIPELINE_ID/ubuntu-sdl/$CI_BUILD_ID/ --acl public-read
-    - aws s3 cp $PACKAGE_NAME s3://$AWS_BUCKET/$CI_TAG/$CI_VERSION/$CI_PIPELINE_ID/ubuntu-sdl-deb/$CI_BUILD_ID/ --acl public-read
+    - aws s3 cp $PACKAGE_NAME.deb s3://$AWS_BUCKET/$CI_TAG/$CI_VERSION/$CI_PIPELINE_ID/ubuntu-sdl-deb/$CI_BUILD_ID/ --acl public-read
 
 
 
@@ -291,7 +291,6 @@ deploy-win-sdl2:
 update-website-universal:
   tags:
     - osx
-    - linux
   stage: updatewebsite
   variables:
     GIT_STRATEGY: none