Kolab Groupware OBS

Changes of Revision 19

debian.rules Changed

@@ -3,14 +3,11 @@
 include /usr/share/dpkg/pkg-info.mk
 
 DESTDIR   = $(CURDIR)/debian/guam
-# LIBDIR	  = $(CURDIR)/debian/guam-libs
-# BUNDLEDIR = $(CURDIR)/debian/guam-bundled-libs
 
 %:
 	dh $@ --with=systemd
 
 override_dh_auto_build:
-	# sed -i -e 's/include_erts,\s*false/include_erts, true/' rebar.config
 	export DEBUG=1
 	export HEX_OFFLINE=true
 	export REBAR_CACHE_DIR="cache/rebar3/"
@@ -26,6 +23,7 @@
 		--verbose
 
 override_dh_auto_clean:
+    # do nothing, rebar3 clean would clear the artifacts that we need above
     #./rebar3 clean || :
 
 override_dh_auto_test:
@@ -81,10 +79,6 @@
 	cp -a _build/default/rel/guam/bin \
 		$(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/
 
-	#cp -a _build/default/rel/guam/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/ebin \
-	#		$(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/
-
-
 	# Remove the sources
 	find _build/default/rel/guam/lib/ -type d -name "src" -exec rm -Rf {} +
 
@@ -104,21 +98,7 @@
 
 	# Symlink for system-installed libraries
 	mkdir -p $(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)
-	ln -s ../../lib $(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/lib
-
-	# Bundled runtime system and libraries
-	# mkdir -p $(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)
-	# cp -a _build/default/rel/guam/erts-* \
-	# 	$(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/
-	# cp -a _build/default/rel/guam/lib \
-	# 	$(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/
-	# rm -r $(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)
-	# ln -s .. $(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)
-	# for dir in $(EIMAP_DIR) $(LAGER_SYSLOG_DIR); do \
-	# 	rm -r $(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/lib/$$dir; \
-	# 	ln -s ../../$$dir $(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/lib/$$dir; \
-	# done
+	ln -s ../../../../lib $(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/lib
 
 override_dh_gencontrol:
-	#dh_gencontrol -- $(SUBSTVARS)
 	dh_gencontrol