From 160d76b7750bdfa4c861c87edd8d7bc02c457ab9 Mon Sep 17 00:00:00 2001
From: Daniel Bissani Furlin <dbf15@inf.ufpr.br>
Date: Tue, 1 Aug 2017 10:26:56 -0300
Subject: [PATCH] Issue SCRUM#209: Keep all packages

---
 .gitlab-ci.yml           | 4 +---
 package/debian/changelog | 7 +++++++
 package/debian/rules     | 4 ----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3e87dfb..2d403d5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,8 +25,6 @@ build:
     - cd package ; debuild -us -uc
     - cd ../
     - mkdir build/
-    - rm ubiquity-*
-    - rm oem*
     - mv ${PACKAGE}* build/
     - echo "Estágio de Build finalizado."
 
@@ -38,7 +36,7 @@ test:
   script:
     # TODO: find a way to get the dependencies automatically
     - export DEBIAN_FRONTEND=noninteractive
-    - apt-get update && apt-get -q -y install libc6 libdebconfclient0 libdebian-installer4 libiw30 libparted-fs-resize0 libparted2 debconf init-system-helpers lsb-base python3:any ubiquity-frontend-gtk ubiquity-artwork-2.21.63.3 laptop-detect lsb-release ubiquity-casper python3-apt console-setup iso-codes passwd adduser os-prober rdate ntfs-3g ecryptfs-utils cryptsetup policykit-1 python3-icu python3-pam language-selector-common archdetect-deb dpkg-repack apt-clone wget grub-common dbus-x11 sbsigntool
+    - apt-get update && apt-get -q -y install libc6 libdebconfclient0 libdebian-installer4 libiw30 libparted-fs-resize0 libparted2 debconf init-system-helpers lsb-base python3:any ubiquity-frontend-gtk ubiquity-artwork-2.21.63.4 laptop-detect lsb-release ubiquity-casper python3-apt console-setup iso-codes passwd adduser os-prober rdate ntfs-3g ecryptfs-utils cryptsetup policykit-1 python3-icu python3-pam language-selector-common archdetect-deb dpkg-repack apt-clone wget grub-common dbus-x11 sbsigntool python3-aptdaemon.gtk3widgets genisoimage apt-utils bogl-bterm tasksel python3-pyqt4 kwin-x11 kwin xauth python3-dbus.mainloop.qt
     - dpkg -i build/*.deb
     - echo "Estágio de Teste finalizado"
   dependencies:
diff --git a/package/debian/changelog b/package/debian/changelog
index 0ad0927..c2ee19c 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,3 +1,10 @@
+ubiquity (2.21.63.4) testing; urgency=medium
+
+  * Add educational linux's logo.
+  * Skip create user step, users already predefined
+
+ -- Daniel Bissani Furlin <dbf15@c3sl.ufpr.br>  Tue, 01 Aug 2017 10:19:23 -0300
+
 ubiquity (2.21.63.3) testing; urgency=medium
 
   * ubi-prepare.py: default to disabling Secure Boot when third party drivers
diff --git a/package/debian/rules b/package/debian/rules
index 39d4711..5db5faf 100755
--- a/package/debian/rules
+++ b/package/debian/rules
@@ -294,10 +294,6 @@ binary-arch: tests install-stamp
 	dh_shlibdeps
 	dh_gencontrol -- -V'console-setup-depends=$(console-setup-depends)' -Vmangled-version='$(MANGLED_VERSION)'
 	dh_md5sums
-	# edit file used by dpkg-genchanges to generate ".changes" file, remove all
-	# but last line so we can deploy the package without others debs files
-	# generated by build process.
-	sed -i -n '$$p' debian/files
 	NO_PNG_PKG_MANGLE=1 dh_builddeb -- -Zxz
 
 binary: binary-indep binary-arch
-- 
GitLab