From 00f050ec1365f436c1079c5e0ba24b625c455d16 Mon Sep 17 00:00:00 2001 From: "Simon P. Ditner" Date: Wed, 13 Aug 2014 14:07:11 -0700 Subject: [PATCH 1/4] In order to reference the debian directory within the .install file for jitsi-meet-prosody, the -Xdebian argument needs to be removed from the call to dh_install in debian/rules. This requires a more explicit jitsi-meet.install file. The project files should likely be relocated to a src/ directory or similar to eliminate the verbose jitsi-meet.install --- debian/jitsi-meet-prosody.install | 2 +- debian/jitsi-meet.install | 11 +++++++++-- debian/rules | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/debian/jitsi-meet-prosody.install b/debian/jitsi-meet-prosody.install index b7e674a4a..384e31dfb 100644 --- a/debian/jitsi-meet-prosody.install +++ b/debian/jitsi-meet-prosody.install @@ -1 +1 @@ -debian/usr/share/* /usr/share/ +debian/usr/share/doc/jitsi-meet-prosody/* /usr/share/doc/jitsi-meet-prosody/ diff --git a/debian/jitsi-meet.install b/debian/jitsi-meet.install index a9db9170c..f32164571 100644 --- a/debian/jitsi-meet.install +++ b/debian/jitsi-meet.install @@ -1,2 +1,9 @@ -* /usr/share/jitsi-meet/ -debian/usr/share/* /usr/share/ +*.js /usr/share/jitsi-meet/ +*.html /usr/share/jitsi-meet/ +*.ico /usr/share/jitsi-meet/ +libs/* /usr/share/jitsi-meet/ +css/* /usr/share/jitsi-meet/ +debian/usr/share/doc/jitsi-meet/* /usr/share/doc/jitsi-meet/ +sounds/* /usr/share/jitsi-meet/ +fonts/* /usr/share/jitsi-meet/ +images/* /usr/share/jitsi-meet/ diff --git a/debian/rules b/debian/rules index 7bda609c0..48f8853b3 100755 --- a/debian/rules +++ b/debian/rules @@ -10,6 +10,6 @@ #export DH_VERBOSE=1 %: - dh_install -Xdebian -Xdoc -XINSTALL.md -XLICENSE -XREADME.md usr/share/jitsi-meet/ + dh_install dh $@ From 99936f46e381d4bfbbaff4dec57529573048e801 Mon Sep 17 00:00:00 2001 From: "Simon P. Ditner" Date: Wed, 13 Aug 2014 14:18:25 -0700 Subject: [PATCH 2/4] Corrected destination dirs. --- debian/jitsi-meet.install | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/debian/jitsi-meet.install b/debian/jitsi-meet.install index f32164571..46ee2bc36 100644 --- a/debian/jitsi-meet.install +++ b/debian/jitsi-meet.install @@ -1,9 +1,10 @@ *.js /usr/share/jitsi-meet/ +*.json /usr/share/jitsi-meet/ *.html /usr/share/jitsi-meet/ *.ico /usr/share/jitsi-meet/ -libs/* /usr/share/jitsi-meet/ -css/* /usr/share/jitsi-meet/ -debian/usr/share/doc/jitsi-meet/* /usr/share/doc/jitsi-meet/ -sounds/* /usr/share/jitsi-meet/ -fonts/* /usr/share/jitsi-meet/ -images/* /usr/share/jitsi-meet/ +libs /usr/share/jitsi-meet/ +css /usr/share/jitsi-meet/ +sounds /usr/share/jitsi-meet/ +fonts /usr/share/jitsi-meet/ +images /usr/share/jitsi-meet/ +debian/usr/share/doc/jitsi-meet /usr/share/doc/ From 2282f7648092e92b877a2785c709a23caa882c41 Mon Sep 17 00:00:00 2001 From: "Simon P. Ditner" Date: Wed, 13 Aug 2014 14:20:11 -0700 Subject: [PATCH 3/4] Removed another wildcard. --- debian/jitsi-meet-prosody.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/jitsi-meet-prosody.install b/debian/jitsi-meet-prosody.install index 384e31dfb..88264b23a 100644 --- a/debian/jitsi-meet-prosody.install +++ b/debian/jitsi-meet-prosody.install @@ -1 +1 @@ -debian/usr/share/doc/jitsi-meet-prosody/* /usr/share/doc/jitsi-meet-prosody/ +debian/usr/share/doc/jitsi-meet-prosody /usr/share/doc/ From c51331733611b64a0087f1b158c3d677a432b8d4 Mon Sep 17 00:00:00 2001 From: "Simon P. Ditner" Date: Thu, 14 Aug 2014 10:19:08 -0700 Subject: [PATCH 4/4] .dirs file is required to create the directory for self-signed certificate generation in the jitsi-meet-prosody.postinst script. --- debian/jitsi-meet-prosody.dirs | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 debian/jitsi-meet-prosody.dirs diff --git a/debian/jitsi-meet-prosody.dirs b/debian/jitsi-meet-prosody.dirs new file mode 100644 index 000000000..bc0777ea2 --- /dev/null +++ b/debian/jitsi-meet-prosody.dirs @@ -0,0 +1 @@ +/var/lib/prosody diff --git a/debian/rules b/debian/rules index 48f8853b3..bf3fe75c8 100755 --- a/debian/rules +++ b/debian/rules @@ -11,5 +11,5 @@ %: dh_install - + dh_installdirs dh $@