X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=debian%2Frules;h=1d1090d7532085fa0c2ad6911c9e23519a618f8e;hb=fe933ebb2c55b4235fcba5d02af2ba91c272fc88;hp=a4aa5b8cd51abb060a0b7a5b2209277e5512d8d6;hpb=fa45a5b015248f7af49513efa0ab4b5ecee50e75;p=dcpomatic.git

diff --git a/debian/rules b/debian/rules
index a4aa5b8cd..1d1090d75 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,37 +20,31 @@ override_dh_auto_build:
 	./waf build
 
 override_dh_auto_install:
-	./waf install --destdir=debian/dcpomatic
-	mkdir -p debian/dcpomatic/usr/share/locale/de/LC_MESSAGES/
-	cp -a /usr/share/locale/de/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/de/LC_MESSAGES/dcpomatic2-wxstd.mo
-	mkdir -p debian/dcpomatic/usr/share/locale/es/LC_MESSAGES/
-	cp -a /usr/share/locale/es/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/es/LC_MESSAGES/dcpomatic2-wxstd.mo
-	mkdir -p debian/dcpomatic/usr/share/locale/fr/LC_MESSAGES/
-	cp -a /usr/share/locale/fr/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/fr/LC_MESSAGES/dcpomatic2-wxstd.mo
-	mkdir -p debian/dcpomatic/usr/share/locale/it/LC_MESSAGES/
-	cp -a /usr/share/locale/it/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/it/LC_MESSAGES/dcpomatic2-wxstd.mo
-	mkdir -p debian/dcpomatic/usr/share/locale/sv/LC_MESSAGES/
-	cp -a /usr/share/locale/sv/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/sv/LC_MESSAGES/dcpomatic2-wxstd.mo
-	mkdir -p debian/dcpomatic/usr/share/locale/nl/LC_MESSAGES/
-	cp -a /usr/share/locale/nl/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/nl/LC_MESSAGES/dcpomatic2-wxstd.mo
-	mkdir -p debian/dcpomatic/usr/share/locale/pl/LC_MESSAGES/
-	cp -a /usr/share/locale/pl/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/pl/LC_MESSAGES/dcpomatic2-wxstd.mo
-	mkdir -p debian/dcpomatic/usr/share/locale/ru/LC_MESSAGES/
-	cp -a /usr/share/locale/ru/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/ru/LC_MESSAGES/dcpomatic2-wxstd.mo
-	cp -a $(CDIST_DIRECTORY)/src/openssl/apps/openssl debian/dcpomatic/usr/bin/dcpomatic2_openssl
-	cp -a $(CDIST_DIRECTORY)/src/libdcp/build/tools/dcpverify debian/dcpomatic/usr/bin/dcpomatic2_verify
-	cp -ar $(CDIST_DIRECTORY)/share/libdcp debian/dcpomatic/usr/share
+	./waf install --destdir=debian/$(CDIST_PACKAGE)
+	mkdir -p debian/$(CDIST_PACKAGE)/usr/share/locale/de/LC_MESSAGES/
+	cp -a /usr/share/locale/de/LC_MESSAGES/wxstd-3.1.mo debian/$(CDIST_PACKAGE)/usr/share/locale/de/LC_MESSAGES/dcpomatic2-wxstd.mo
+	mkdir -p debian/$(CDIST_PACKAGE)/usr/share/locale/es/LC_MESSAGES/
+	cp -a /usr/share/locale/es/LC_MESSAGES/wxstd-3.1.mo debian/$(CDIST_PACKAGE)/usr/share/locale/es/LC_MESSAGES/dcpomatic2-wxstd.mo
+	mkdir -p debian/$(CDIST_PACKAGE)/usr/share/locale/fr/LC_MESSAGES/
+	cp -a /usr/share/locale/fr/LC_MESSAGES/wxstd-3.1.mo debian/$(CDIST_PACKAGE)/usr/share/locale/fr/LC_MESSAGES/dcpomatic2-wxstd.mo
+	mkdir -p debian/$(CDIST_PACKAGE)/usr/share/locale/it/LC_MESSAGES/
+	cp -a /usr/share/locale/it/LC_MESSAGES/wxstd-3.1.mo debian/$(CDIST_PACKAGE)/usr/share/locale/it/LC_MESSAGES/dcpomatic2-wxstd.mo
+	mkdir -p debian/$(CDIST_PACKAGE)/usr/share/locale/sv/LC_MESSAGES/
+	cp -a /usr/share/locale/sv/LC_MESSAGES/wxstd-3.1.mo debian/$(CDIST_PACKAGE)/usr/share/locale/sv/LC_MESSAGES/dcpomatic2-wxstd.mo
+	mkdir -p debian/$(CDIST_PACKAGE)/usr/share/locale/nl/LC_MESSAGES/
+	cp -a /usr/share/locale/nl/LC_MESSAGES/wxstd-3.1.mo debian/$(CDIST_PACKAGE)/usr/share/locale/nl/LC_MESSAGES/dcpomatic2-wxstd.mo
+	mkdir -p debian/$(CDIST_PACKAGE)/usr/share/locale/pl/LC_MESSAGES/
+	cp -a /usr/share/locale/pl/LC_MESSAGES/wxstd-3.1.mo debian/$(CDIST_PACKAGE)/usr/share/locale/pl/LC_MESSAGES/dcpomatic2-wxstd.mo
+	mkdir -p debian/$(CDIST_PACKAGE)/usr/share/locale/ru/LC_MESSAGES/
+	cp -a /usr/share/locale/ru/LC_MESSAGES/wxstd-3.1.mo debian/$(CDIST_PACKAGE)/usr/share/locale/ru/LC_MESSAGES/dcpomatic2-wxstd.mo
+	cp -a $(CDIST_DIRECTORY)/src/openssl/apps/openssl debian/$(CDIST_PACKAGE)/usr/bin/dcpomatic2_openssl
+	cp -a $(CDIST_DIRECTORY)/src/libdcp/build/tools/dcpverify debian/$(CDIST_PACKAGE)/usr/bin/dcpomatic2_verify
+	cp -ar $(CDIST_DIRECTORY)/share/libdcp debian/$(CDIST_PACKAGE)/usr/share
 
 .PHONY: override_dh_strip
 override_dh_strip:
-	dh_strip $(CDIST_DEBUG_PACKAGE)
+	dh_strip $(CDIST_DEBUG_PACKAGE_FLAG)
 
 override_dh_shlibdeps:
 	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
 
-DISK := debian/dcpomatic/usr/bin/dcpomatic2_disk_writer
-override_dh_fixperms:
-	dh_fixperms
-ifneq ("$(wildcard $(DISK))", "")
-	chmod 4755 $(DISK)
-endif