[Pkg-privacy-commits] [flashproxy] 05/65: move examples out of doc to satisfy policy 12.3

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch _volatile-rc
in repository flashproxy.

commit 668237d54169bcba12c63f497f911b2a55bd3f4f
Author: Ximin Luo <infinity0 at gmx.com>
Date:   Tue Jan 7 14:36:43 2014 +0000

    move examples out of doc to satisfy policy 12.3
---
 debian/flashproxy-facilitator.links       |  1 +
 debian/flashproxy-facilitator.postinst    |  2 +-
 debian/patches/move-initconfig-out-of-doc | 18 ++++++++++++++++++
 debian/patches/nodejs-shebang             |  6 ++++++
 debian/patches/series                     |  1 +
 5 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/debian/flashproxy-facilitator.links b/debian/flashproxy-facilitator.links
new file mode 100644
index 0000000..0e250e7
--- /dev/null
+++ b/debian/flashproxy-facilitator.links
@@ -0,0 +1 @@
+usr/share/flashproxy-facilitator/examples usr/share/doc/flashproxy-facilitator/examples
diff --git a/debian/flashproxy-facilitator.postinst b/debian/flashproxy-facilitator.postinst
index a68d697..98d9c5a 100644
--- a/debian/flashproxy-facilitator.postinst
+++ b/debian/flashproxy-facilitator.postinst
@@ -19,7 +19,7 @@ set -e
 
 fpfacilitatoruser=fp-facilitator
 pkgconfdir=/etc/flashproxy
-exampledir=/usr/share/doc/flashproxy-facilitator/examples
+exampledir=/usr/share/flashproxy-facilitator/examples
 appengineconfdir=${pkgconfdir}/reg-appspot
 appenginedir=/usr/share/flashproxy-facilitator/appengine
 
diff --git a/debian/patches/move-initconfig-out-of-doc b/debian/patches/move-initconfig-out-of-doc
new file mode 100644
index 0000000..ff8b4f3
--- /dev/null
+++ b/debian/patches/move-initconfig-out-of-doc
@@ -0,0 +1,18 @@
+Description: Move init config out of /usr/share/doc
+ Policy 12.3: "Packages must not require the existence of any files in
+ /usr/share/doc/ in order to function."
+Author: Ximin Luo <infinity0 at gmx.com>
+Applied-Upstream: 2af442f799785cf0baa4c18aa85cfdd507986633
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/facilitator/Makefile.am
++++ b/facilitator/Makefile.am
+@@ -7,7 +7,7 @@
+ # unfortunately sysvinit does not support having initscripts in /usr/local/etc
+ # yet, so we have to hard code a path here. :(
+ initscriptdir = /etc/init.d
+-exampledir = $(docdir)/examples
++exampledir = $(pkgdatadir)/examples
+ appenginedir = $(pkgdatadir)/appengine
+ pkgconfdir = $(sysconfdir)/flashproxy
+ appengineconfdir = $(pkgconfdir)/reg-appspot
diff --git a/debian/patches/nodejs-shebang b/debian/patches/nodejs-shebang
index dda807b..478d7a1 100644
--- a/debian/patches/nodejs-shebang
+++ b/debian/patches/nodejs-shebang
@@ -1,3 +1,9 @@
+Description: Fix nodejs shebang line to Debian canonical path
+ Debian mandates /usr/bin/nodejs in order to resolve a naming conflict
+Author: Ximin Luo <infinity0 at gmx.com>
+Forwarded: not-needed
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/proxy/modules/nodejs/main.js
 +++ b/proxy/modules/nodejs/main.js
 @@ -1,4 +1,4 @@
diff --git a/debian/patches/series b/debian/patches/series
index 40f786c..816fa90 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 nodejs-shebang
+move-initconfig-out-of-doc

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/flashproxy.git