From 8e515d05f34ec144c7926d839b1f58b2204a4db6 Mon Sep 17 00:00:00 2001
From: Erick Hitter <git-contrib@ethitter.com>
Date: Mon, 27 May 2019 18:17:46 -0700
Subject: [PATCH] Fixing structure again
---
source/Makefile | 11 -----------
source/debian/compat | 2 +-
source/debian/rules | 13 +++++++++++++
source/{fakeroot => }/etc/default/nginx | 0
source/{fakeroot => }/etc/init.d/nginx | 0
source/{fakeroot => }/etc/logrotate.d/nginx | 0
source/{fakeroot => }/etc/nginx/conf.d/default.conf | 0
source/{fakeroot => }/etc/nginx/fastcgi_params | 0
source/{fakeroot => }/etc/nginx/koi-utf | 0
source/{fakeroot => }/etc/nginx/koi-win | 0
source/{fakeroot => }/etc/nginx/mime.types | 0
source/{fakeroot => }/etc/nginx/modules/.gitkeep | 0
source/{fakeroot => }/etc/nginx/nginx.conf | 0
source/{fakeroot => }/etc/nginx/scgi_params | 0
source/{fakeroot => }/etc/nginx/uwsgi_params | 0
source/{fakeroot => }/etc/nginx/win-utf | 0
.../{fakeroot => }/usr/lib/nginx/modules/.gitkeep | 0
source/{fakeroot => }/usr/sbin/.gitkeep | 0
source/{fakeroot => }/usr/share/doc/nginx/README | 0
source/{fakeroot => }/usr/share/doc/nginx/copyright | 0
source/{fakeroot => }/usr/share/nginx/html/50x.html | 0
.../{fakeroot => }/usr/share/nginx/html/index.html | 0
source/{fakeroot => }/var/cache/nginx/.gitkeep | 0
source/{fakeroot => }/var/log/nginx/.gitkeep | 0
24 files changed, 14 insertions(+), 12 deletions(-)
delete mode 100644 source/Makefile
rename source/{fakeroot => }/etc/default/nginx (100%)
rename source/{fakeroot => }/etc/init.d/nginx (100%)
rename source/{fakeroot => }/etc/logrotate.d/nginx (100%)
rename source/{fakeroot => }/etc/nginx/conf.d/default.conf (100%)
rename source/{fakeroot => }/etc/nginx/fastcgi_params (100%)
rename source/{fakeroot => }/etc/nginx/koi-utf (100%)
rename source/{fakeroot => }/etc/nginx/koi-win (100%)
rename source/{fakeroot => }/etc/nginx/mime.types (100%)
rename source/{fakeroot => }/etc/nginx/modules/.gitkeep (100%)
rename source/{fakeroot => }/etc/nginx/nginx.conf (100%)
rename source/{fakeroot => }/etc/nginx/scgi_params (100%)
rename source/{fakeroot => }/etc/nginx/uwsgi_params (100%)
rename source/{fakeroot => }/etc/nginx/win-utf (100%)
rename source/{fakeroot => }/usr/lib/nginx/modules/.gitkeep (100%)
rename source/{fakeroot => }/usr/sbin/.gitkeep (100%)
rename source/{fakeroot => }/usr/share/doc/nginx/README (100%)
rename source/{fakeroot => }/usr/share/doc/nginx/copyright (100%)
rename source/{fakeroot => }/usr/share/nginx/html/50x.html (100%)
rename source/{fakeroot => }/usr/share/nginx/html/index.html (100%)
rename source/{fakeroot => }/var/cache/nginx/.gitkeep (100%)
rename source/{fakeroot => }/var/log/nginx/.gitkeep (100%)
diff --git a/source/Makefile b/source/Makefile
deleted file mode 100644
index 0ae581b..0000000
--- a/source/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-install:
- install fakeroot/etc/default/nginx /etc/default/nginx
- install fakeroot/etc/init.d/nginx /etc/init.d/nginx
- install fakeroot/etc/logrotate.d/nginx /etc/logrotate.d/nginx
- install fakeroot/etc/nginx/ /etc/nginx/
- install fakeroot/usr/lib/nginx/modules/ /usr/lib/nginx/modules/
- install -m 0755 fakeroot/usr/sbin/nginx /usr/sbin/nginx
- install fakeroot/usr/share/doc/nginx/ /usr/share/doc/nginx/
- install fakeroot/usr/share/nginx/ /usr/share/nginx/
- install fakeroot/var/cache/nginx/ /var/cache/nginx/
- install fakeroot/var/log/nginx/ /var/log/nginx/
diff --git a/source/debian/compat b/source/debian/compat
index 7ed6ff8..ec63514 100644
--- a/source/debian/compat
+++ b/source/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/source/debian/rules b/source/debian/rules
index cbe925d..dc36a12 100755
--- a/source/debian/rules
+++ b/source/debian/rules
@@ -1,3 +1,16 @@
#!/usr/bin/make -f
%:
dh $@
+
+override_dh_auto_install:
+ dh_auto_install
+ install etc/default/nginx /etc/default/nginx
+ install etc/init.d/nginx /etc/init.d/nginx
+ install etc/logrotate.d/nginx /etc/logrotate.d/nginx
+ install etc/nginx/ /etc/nginx/
+ install usr/lib/nginx/modules/ /usr/lib/nginx/modules/
+ install -m 0755 usr/sbin/nginx /usr/sbin/nginx
+ install usr/share/doc/nginx/ /usr/share/doc/nginx/
+ install usr/share/nginx/ /usr/share/nginx/
+ install var/cache/nginx/ /var/cache/nginx/
+ install var/log/nginx/ /var/log/nginx/
diff --git a/source/fakeroot/etc/default/nginx b/source/etc/default/nginx
similarity index 100%
rename from source/fakeroot/etc/default/nginx
rename to source/etc/default/nginx
diff --git a/source/fakeroot/etc/init.d/nginx b/source/etc/init.d/nginx
similarity index 100%
rename from source/fakeroot/etc/init.d/nginx
rename to source/etc/init.d/nginx
diff --git a/source/fakeroot/etc/logrotate.d/nginx b/source/etc/logrotate.d/nginx
similarity index 100%
rename from source/fakeroot/etc/logrotate.d/nginx
rename to source/etc/logrotate.d/nginx
diff --git a/source/fakeroot/etc/nginx/conf.d/default.conf b/source/etc/nginx/conf.d/default.conf
similarity index 100%
rename from source/fakeroot/etc/nginx/conf.d/default.conf
rename to source/etc/nginx/conf.d/default.conf
diff --git a/source/fakeroot/etc/nginx/fastcgi_params b/source/etc/nginx/fastcgi_params
similarity index 100%
rename from source/fakeroot/etc/nginx/fastcgi_params
rename to source/etc/nginx/fastcgi_params
diff --git a/source/fakeroot/etc/nginx/koi-utf b/source/etc/nginx/koi-utf
similarity index 100%
rename from source/fakeroot/etc/nginx/koi-utf
rename to source/etc/nginx/koi-utf
diff --git a/source/fakeroot/etc/nginx/koi-win b/source/etc/nginx/koi-win
similarity index 100%
rename from source/fakeroot/etc/nginx/koi-win
rename to source/etc/nginx/koi-win
diff --git a/source/fakeroot/etc/nginx/mime.types b/source/etc/nginx/mime.types
similarity index 100%
rename from source/fakeroot/etc/nginx/mime.types
rename to source/etc/nginx/mime.types
diff --git a/source/fakeroot/etc/nginx/modules/.gitkeep b/source/etc/nginx/modules/.gitkeep
similarity index 100%
rename from source/fakeroot/etc/nginx/modules/.gitkeep
rename to source/etc/nginx/modules/.gitkeep
diff --git a/source/fakeroot/etc/nginx/nginx.conf b/source/etc/nginx/nginx.conf
similarity index 100%
rename from source/fakeroot/etc/nginx/nginx.conf
rename to source/etc/nginx/nginx.conf
diff --git a/source/fakeroot/etc/nginx/scgi_params b/source/etc/nginx/scgi_params
similarity index 100%
rename from source/fakeroot/etc/nginx/scgi_params
rename to source/etc/nginx/scgi_params
diff --git a/source/fakeroot/etc/nginx/uwsgi_params b/source/etc/nginx/uwsgi_params
similarity index 100%
rename from source/fakeroot/etc/nginx/uwsgi_params
rename to source/etc/nginx/uwsgi_params
diff --git a/source/fakeroot/etc/nginx/win-utf b/source/etc/nginx/win-utf
similarity index 100%
rename from source/fakeroot/etc/nginx/win-utf
rename to source/etc/nginx/win-utf
diff --git a/source/fakeroot/usr/lib/nginx/modules/.gitkeep b/source/usr/lib/nginx/modules/.gitkeep
similarity index 100%
rename from source/fakeroot/usr/lib/nginx/modules/.gitkeep
rename to source/usr/lib/nginx/modules/.gitkeep
diff --git a/source/fakeroot/usr/sbin/.gitkeep b/source/usr/sbin/.gitkeep
similarity index 100%
rename from source/fakeroot/usr/sbin/.gitkeep
rename to source/usr/sbin/.gitkeep
diff --git a/source/fakeroot/usr/share/doc/nginx/README b/source/usr/share/doc/nginx/README
similarity index 100%
rename from source/fakeroot/usr/share/doc/nginx/README
rename to source/usr/share/doc/nginx/README
diff --git a/source/fakeroot/usr/share/doc/nginx/copyright b/source/usr/share/doc/nginx/copyright
similarity index 100%
rename from source/fakeroot/usr/share/doc/nginx/copyright
rename to source/usr/share/doc/nginx/copyright
diff --git a/source/fakeroot/usr/share/nginx/html/50x.html b/source/usr/share/nginx/html/50x.html
similarity index 100%
rename from source/fakeroot/usr/share/nginx/html/50x.html
rename to source/usr/share/nginx/html/50x.html
diff --git a/source/fakeroot/usr/share/nginx/html/index.html b/source/usr/share/nginx/html/index.html
similarity index 100%
rename from source/fakeroot/usr/share/nginx/html/index.html
rename to source/usr/share/nginx/html/index.html
diff --git a/source/fakeroot/var/cache/nginx/.gitkeep b/source/var/cache/nginx/.gitkeep
similarity index 100%
rename from source/fakeroot/var/cache/nginx/.gitkeep
rename to source/var/cache/nginx/.gitkeep
diff --git a/source/fakeroot/var/log/nginx/.gitkeep b/source/var/log/nginx/.gitkeep
similarity index 100%
rename from source/fakeroot/var/log/nginx/.gitkeep
rename to source/var/log/nginx/.gitkeep
--
GitLab