Merge pull request #1804 from sathieu/packaging

Move debian directory out of root directory
mozilla-services · Dec 2, 2015 · 90eea62 · 90eea62
2 parents c7906e5 + 10fc5f2
commit 90eea62
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -246,7 +246,7 @@ if (UNIX AND DPKG_EXECUTABLE)
         DEPENDS hekad
         COMMENT "Custom deb target")
 
-    add_subdirectory(debian)
+    add_subdirectory(packaging/debian)
 endif()
 
 # MOVING INCLUSION OF CPACK DOWN HERE SO IT ACTUALLY GETS THE VARIABLES WE SET

diff --git a/cmake/CMakeDebHelperInstall.cmake b/cmake/CMakeDebHelperInstall.cmake
@@ -8,7 +8,7 @@ endif()
 # Copy all generated files where the packing will happen,
 # exclude the DEBIAN-directory.
 file( COPY
-	"${CPACK_OUTPUT_FILE_PREFIX}/debian/${CPACK_DEBIAN_PACKAGE_NAME}/"
+	"${CPACK_OUTPUT_FILE_PREFIX}/packaging/debian/${CPACK_DEBIAN_PACKAGE_NAME}/"
 	DESTINATION "${CMAKE_CURRENT_BINARY_DIR}" 
 	PATTERN DEBIAN EXCLUDE
 ) 
diff --git a/debian/CMakeLists.txt → packaging/debian/CMakeLists.txt b/debian/CMakeLists.txt → packaging/debian/CMakeLists.txt
diff --git a/debian/heka.init.in → packaging/debian/heka.init.in b/debian/heka.init.in → packaging/debian/heka.init.in
diff --git a/debian/heka.postinst.in → packaging/debian/heka.postinst.in b/debian/heka.postinst.in → packaging/debian/heka.postinst.in
diff --git a/debian/heka.postrm.in → packaging/debian/heka.postrm.in b/debian/heka.postrm.in → packaging/debian/heka.postrm.in
diff --git a/debian/heka.preinst.in → packaging/debian/heka.preinst.in b/debian/heka.preinst.in → packaging/debian/heka.preinst.in
diff --git a/debian/heka.service.in → packaging/debian/heka.service.in b/debian/heka.service.in → packaging/debian/heka.service.in