Use underscore for PPA components

cginternals · Oct 12, 2018 · ab3b72e · ab3b72e
1 parent 24a1cbf
commit ab3b72e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/deploy/ubuntu-ppa/debian/rules b/deploy/ubuntu-ppa/debian/rules
@@ -32,14 +32,14 @@ libcpplocate-meta:
 	rm -rf debian/tmp
 
 libcpplocate:
-	cd $(BUILDDIR); DESTDIR=../debian/tmp COMPONENT=runtime-cpp make component_install
+	cd $(BUILDDIR); DESTDIR=../debian/tmp COMPONENT=runtime_cpp make component_install
 	mkdir -p debian/tmp/DEBIAN
 	dpkg-gencontrol -plibcpplocate
 	dpkg --build debian/tmp ..
 	rm -rf debian/tmp
 
 libcpplocate-dev:
-	cd $(BUILDDIR); DESTDIR=../debian/tmp COMPONENT=dev-cpp make component_install
+	cd $(BUILDDIR); DESTDIR=../debian/tmp COMPONENT=dev_cpp make component_install
 	mkdir -p debian/tmp/DEBIAN
 	dpkg-gencontrol -plibcpplocate-dev
 	dpkg --build debian/tmp ..
@@ -53,8 +53,8 @@ libcpplocate-docs:
 	rm -rf debian/tmp
 
 libcpplocate-dbg:
-	cd $(BUILDDEBUGDIR); DESTDIR=../debian/tmp COMPONENT=runtime-cpp make component_install
-	cd $(BUILDDEBUGDIR); DESTDIR=../debian/tmp COMPONENT=dev-cpp make component_install
+	cd $(BUILDDEBUGDIR); DESTDIR=../debian/tmp COMPONENT=runtime_cpp make component_install
+	cd $(BUILDDEBUGDIR); DESTDIR=../debian/tmp COMPONENT=dev_cpp make component_install
 	rm -rf debian/tmp/usr/include
 	rm debian/tmp/usr/share/*/*-config.cmake
 	rm debian/tmp/usr/share/*/cmake/*/*-export.cmake
@@ -70,14 +70,14 @@ libcpplocate-all:
 	rm -rf debian/tmp
 
 liblocate:
-	cd $(BUILDDIR); DESTDIR=../debian/tmp COMPONENT=runtime-c make component_install
+	cd $(BUILDDIR); DESTDIR=../debian/tmp COMPONENT=runtime_c make component_install
 	mkdir -p debian/tmp/DEBIAN
 	dpkg-gencontrol -pliblocate
 	dpkg --build debian/tmp ..
 	rm -rf debian/tmp
 
 liblocate-dev:
-	cd $(BUILDDIR); DESTDIR=../debian/tmp COMPONENT=dev-c make component_install
+	cd $(BUILDDIR); DESTDIR=../debian/tmp COMPONENT=dev_c make component_install
 	mkdir -p debian/tmp/DEBIAN
 	dpkg-gencontrol -pliblocate-dev
 	dpkg --build debian/tmp ..
@@ -90,8 +90,8 @@ liblocate-docs:
 	rm -rf debian/tmp
 
 liblocate-dbg:
-	cd $(BUILDDEBUGDIR); DESTDIR=../debian/tmp COMPONENT=runtime-c make component_install
-	cd $(BUILDDEBUGDIR); DESTDIR=../debian/tmp COMPONENT=dev-c make component_install
+	cd $(BUILDDEBUGDIR); DESTDIR=../debian/tmp COMPONENT=runtime_c make component_install
+	cd $(BUILDDEBUGDIR); DESTDIR=../debian/tmp COMPONENT=dev_c make component_install
 	rm -rf debian/tmp/usr/include
 	rm debian/tmp/usr/share/*/*-config.cmake
 	rm debian/tmp/usr/share/*/cmake/*/*-export.cmake

diff --git a/deploy/ubuntu-ppa/recipe.txt b/deploy/ubuntu-ppa/recipe.txt
@@ -1,3 +1,3 @@
 # git-build-recipe format 0.4 deb-version {debupstream}+{revno}
-lp:cpplocate v1
-nest-part packaging lp:cpplocate deploy/ubuntu-ppa/debian debian v1
+lp:cpplocate v2
+nest-part packaging lp:cpplocate deploy/ubuntu-ppa/debian debian v2