Merge remote-tracking branch 'origin/remove_common'

.gitignore

@@ -62,8 +62,4 @@ third_party/luajit/src/lj_libdef.h
 third_party/luajit/src/lj_recdef.h
 third_party/luajit/src/lj_vm.s
 VERSION
-debian/*.debhelper
-debian/*.log
-debian/*.substvars
-*.cdbs-orig
 src/00000000000000000001.snap

debian/control

@@ -14,29 +14,30 @@ Homepage: http://tarantool.org/
 VCS-Browser: https://github.com/tarantool/tarantool
 VCS-Git: git://github.com/tarantool/tarantool.git
 
-Package: tarantool-common
-Architecture: all
-Priority: optional
-Depends: ${misc:Depends}, adduser
-Description: Tarantool in-memory database - common files
- Tarantool is an in-memory database and Lua application server.
- This package provides scripts to work with tarantool configuration
- and log files.
+# Package: tarantool-common
+# Architecture: all
+# Priority: optional
+# Depends: ${misc:Depends}, adduser
+# Description: Tarantool in-memory database - common files
+#  Tarantool is an in-memory database and Lua application server.
+#  This package provides scripts to work with tarantool configuration
+#  and log files.
 
 Package: tarantool
 Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
 Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: tarantool-dbg (<< 1.5.2),
- tarantool-common (<< 1.6~),
+#  tarantool-common (<< 1.6~),
  tarantool-client (<< 1.6~),
  tarantool-client-dbg (<< 1.6~),
  tarantool-plugins (<< 1.6~),
  tarantool-mysql-plugin (<< 1.6~),
  tarantool-postgresql-plugin (<< 1.6~),
  libtarantool-dev (<< 1.6~)
-Recommends: tarantool-common (>= 1.6),
- tarantool-modules
+# Recommends: tarantool-common (>= 1.6),
+#  tarantool-modules
+Recommends: tarantool-modules
 Description: In-memory database with Lua application server
  Tarantool is an in-memory database and Lua application server.
  Its key properties include:

debian/rules

@@ -67,14 +67,14 @@ install/tarantool::
 #         make -C build-area test-force || /bin/true
 
 
-install/tarantool-common::
-	pod2man -c 'tarantool instances control' \
-	    debian/tarantool_instance.pod > build-area/tarantool_instance.1
-	pod2man -c 'tarantool log rotation' \
-	    debian/scripts/tarantool_logrotate \
-	    	 > build-area/tarantool_logrotate.1
-	pod2man -c 'snapshot rotate' \
-	    debian/scripts/tarantool_snapshot_rotate \
-	    	> build-area/tarantool_snapshot_rotate.1
-	install -m0755 extra/logger.pl \
-	    debian/tarantool-common/usr/lib/tarantool/logger
+# install/tarantool-common::
+# 	pod2man -c 'tarantool instances control' \
+# 	    debian/tarantool_instance.pod > build-area/tarantool_instance.1
+# 	pod2man -c 'tarantool log rotation' \
+# 	    debian/scripts/tarantool_logrotate \
+# 	    	 > build-area/tarantool_logrotate.1
+# 	pod2man -c 'snapshot rotate' \
+# 	    debian/scripts/tarantool_snapshot_rotate \
+# 	    	> build-area/tarantool_snapshot_rotate.1
+# 	install -m0755 extra/logger.pl \
+# 	    debian/tarantool-common/usr/lib/tarantool/logger

extra/CMakeLists.txt

@@ -3,23 +3,23 @@
 #
 if (ENABLE_RPM)
 	# chmod +x 655
-	install (FILES tarantool DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/init.d
-		 PERMISSIONS
-		 OWNER_READ OWNER_WRITE
-		 GROUP_READ GROUP_EXECUTE
-		 WORLD_READ WORLD_EXECUTE)
-	# chmod +x 755
-	install (FILES tarantool_multi.sh DESTINATION bin
-		 PERMISSIONS
-		 OWNER_READ OWNER_WRITE OWNER_EXECUTE
-		 GROUP_READ GROUP_EXECUTE
-		 WORLD_READ WORLD_EXECUTE)
-	# chmod +x 755
-	install (FILES tarantool_deploy.sh DESTINATION bin
-		 PERMISSIONS
-		 OWNER_READ OWNER_WRITE OWNER_EXECUTE
-		 GROUP_READ GROUP_EXECUTE
-		 WORLD_READ WORLD_EXECUTE)
+# 	install (FILES tarantool DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/init.d
+# 		 PERMISSIONS
+# 		 OWNER_READ OWNER_WRITE
+# 		 GROUP_READ GROUP_EXECUTE
+# 		 WORLD_READ WORLD_EXECUTE)
+# 	# chmod +x 755
+# 	install (FILES tarantool_multi.sh DESTINATION bin
+# 		 PERMISSIONS
+# 		 OWNER_READ OWNER_WRITE OWNER_EXECUTE
+# 		 GROUP_READ GROUP_EXECUTE
+# 		 WORLD_READ WORLD_EXECUTE)
+# 	# chmod +x 755
+# 	install (FILES tarantool_deploy.sh DESTINATION bin
+# 		 PERMISSIONS
+# 		 OWNER_READ OWNER_WRITE OWNER_EXECUTE
+# 		 GROUP_READ GROUP_EXECUTE
+# 		 WORLD_READ WORLD_EXECUTE)
 endif()
 
 configure_file(rpm/tarantool.rpm.spec.in rpm/tarantool.rpm.spec @ONLY)

extra/rpm/tarantool.rpm.spec.in

@@ -189,9 +189,9 @@ useradd -r -g tarantool tarantool > /dev/null 2>&1
 "%{_mandir}/man1/tarantool.1.gz"
 
 "%{_bindir}/tarantool"
-%{!?scl:"%{_bindir}/tarantool_multi.sh"}
-%{!?scl:"%{_bindir}/tarantool_deploy.sh"}
-%{!?scl:"%{_sysconfdir}/init.d/tarantool"}
+# %{!?scl:"%{_bindir}/tarantool_multi.sh"}
+# %{!?scl:"%{_bindir}/tarantool_deploy.sh"}
+# %{!?scl:"%{_sysconfdir}/init.d/tarantool"}
 
 %files sql-module
 %defattr(-,root,root,-)