Dependency touchups and working-directory hack

This commit is contained in:
Michael Lustfield 2017-10-25 22:37:37 -05:00
Родитель 8d99600ab8
Коммит e6d6016e45
5 изменённых файлов: 23 добавлений и 16 удалений

5
debian/control поставляемый
Просмотреть файл

@ -201,17 +201,22 @@ Multi-Arch: foreign
Built-Using: ${misc:Built-Using} Built-Using: ${misc:Built-Using}
Depends: fonts-font-awesome, Depends: fonts-font-awesome,
lsb-base (>= 3.0-6), lsb-base (>= 3.0-6),
libjs-autolink,
libjs-cssrelpreload, libjs-cssrelpreload,
libjs-clipboard, libjs-clipboard,
libjs-codemirror, libjs-codemirror,
libjs-dropzone,
libjs-emojify, libjs-emojify,
libjs-highlight.js, libjs-highlight.js,
libjs-jquery, libjs-jquery,
libjs-jquery-areyousure, libjs-jquery-areyousure,
libjs-jquery-gitgraph, libjs-jquery-gitgraph,
libjs-jquery-minicolors, libjs-jquery-minicolors,
libjs-jquery-timepicker,
libjs-pdf, libjs-pdf,
libjs-semanticui,
libjs-simplemde, libjs-simplemde,
libjs-vue,
octicons, octicons,
pdf.js-common, pdf.js-common,
${misc:Depends} ${misc:Depends}

3
debian/copyright поставляемый
Просмотреть файл

@ -1,7 +1,8 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: gitea Upstream-Name: gitea
Source: https://github.com/go-gitea/gitea Source: https://github.com/go-gitea/gitea
Files-Excluded: public/vendor Files-Excluded: public/vendor/assets
public/vendor/plugins
vendor vendor
Files: * Files: *

26
debian/gitea-common.links поставляемый
Просмотреть файл

@ -51,33 +51,33 @@ usr/share/javascript/jquery-timepicker/jquery-ui-timepicker-addon.js
# libjs-dropzone # libjs-dropzone
usr/share/javascript/libjs-dropzone/dropzone.min.js usr/share/javascript/libjs-dropzone/dropzone.min.js
usr/share/gitea/public/vendor/dropzone/dropzone.js usr/share/gitea/public/vendor/plugins/dropzone/dropzone.js
usr/share/javascript/libjs-dropzone/dropzone.css usr/share/javascript/libjs-dropzone/dropzone.css
usr/share/gitea/public/vendor/dropzone/dropzone.css usr/share/gitea/public/vendor/plugins/dropzone/dropzone.css
# libjs-autolink # libjs-autolink
usr/share/javascript/libjs-autolink/autolink-min.js usr/share/javascript/libjs-autolink/autolink-min.js
usr/share/gitea/public/vendor/autolink/autolink.js usr/share/gitea/public/vendor/plugins/autolink/autolink.js
# libjs-semantic # libjs-semanticui
usr/share/javascript/libjs-semanticui/semantic.css usr/share/javascript/libjs-semanticui/semantic.css
usr/share/gitea/public/vendor/semantic/semantic.min.css usr/share/gitea/public/vendor/plugins/semantic/semantic.min.css
usr/share/javascript/libjs-semanticui/semantic.js usr/share/javascript/libjs-semanticui/semantic.js
usr/share/gitea/public/vendor/semantic/semantic.min.js usr/share/gitea/public/vendor/plugins/semantic/semantic.min.js
usr/share/javascript/libjs-semanticui/themes usr/share/javascript/libjs-semanticui/themes
usr/share/gitea/public/vendor/semantic/themes usr/share/gitea/public/vendor/plugins/semantic/themes
# libjs-jquery-minicolor # libjs-jquery-minicolors
usr/share/javascript/jquery-minicolors usr/share/javascript/jquery-minicolors
usr/share/gitea/public/vendor/jquery.minicolors usr/share/gitea/public/vendor/jquery.minicolors
# libjs-cssrelpreload # libjs-cssrelpreload
usr/share/javascript/cssrelpreload/cssrelpreload.js usr/share/javascript/cssrelpreload/cssrelpreload.js
usr/share/gitea/public/vendor/cssrelpreload/cssrelpreload.min.js usr/share/gitea/public/vendor/plugins/cssrelpreload/cssrelpreload.min.js
usr/share/javascript/cssrelpreload/loadCSS.js usr/share/javascript/cssrelpreload/loadCSS.js
usr/share/gitea/public/vendor/cssrelpreload/loadCSS.min.js usr/share/gitea/public/vendor/plugins/cssrelpreload/loadCSS.min.js
usr/share/javascript/cssrelpreload/onloadCSS.js usr/share/javascript/cssrelpreload/onloadCSS.js
usr/share/gitea/public/vendor/cssrelpreload/onloadCSS.min.js usr/share/gitea/public/vendor/plugins/cssrelpreload/onloadCSS.min.js
# libjs-emojify # libjs-emojify
usr/share/javascript/emojify.js/emojify.min.js usr/share/javascript/emojify.js/emojify.min.js
@ -85,7 +85,7 @@ usr/share/javascript/emojify.js/emojify.min.js
usr/share/javascript/emojify.js/images/emoji usr/share/javascript/emojify.js/images/emoji
usr/share/gitea/public/vendor/plugins/emojify/images usr/share/gitea/public/vendor/plugins/emojify/images
# libjs-gitgraph # libjs-jquery-gitgraph
usr/share/javascript/jquery-gitgraph/gitgraph.min.js usr/share/javascript/jquery-gitgraph/gitgraph.min.js
usr/share/gitea/public/vendor/plugins/gitgraph/gitgraph.js usr/share/gitea/public/vendor/plugins/gitgraph/gitgraph.js
usr/share/javascript/jquery-gitgraph/gitgraph.css usr/share/javascript/jquery-gitgraph/gitgraph.css
@ -95,7 +95,7 @@ usr/share/javascript/jquery-gitgraph/gitgraph.css
usr/share/javascript/jquery-areyousure/jquery.are-you-sure.min.js usr/share/javascript/jquery-areyousure/jquery.are-you-sure.min.js
usr/share/gitea/public/vendor/plugins/jquery.areyousure/jquery.are-you-sure.js usr/share/gitea/public/vendor/plugins/jquery.areyousure/jquery.are-you-sure.js
# libjs-pdf / pdf.js-common # libjs-pdf
usr/share/javascript/pdf usr/share/javascript/pdf
usr/share/gitea/public/vendor/plugins/pdfjs usr/share/gitea/public/vendor/plugins/pdfjs

3
debian/gitea.init поставляемый
Просмотреть файл

@ -37,8 +37,9 @@ STOP_SCHEDULE="${STOP_SCHEDULE:-QUIT/5/TERM/1/KILL/5}"
do_start() do_start()
{ {
export GITEA_WORK_DIR="$WORKINGDIR"
$USERBIND $DAEMON $USERBIND $DAEMON
sh -c "USER=$USER start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile \\ sh -c "USER=$USER GITEA_WORK_DIR=$WORKINGDIR start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile \\
--background --chdir $WORKINGDIR --chuid $USER \\ --background --chdir $WORKINGDIR --chuid $USER \\
--exec $DAEMON -- $DAEMON_ARGS" --exec $DAEMON -- $DAEMON_ARGS"
} }

2
debian/gitea.service поставляемый
Просмотреть файл

@ -23,7 +23,7 @@ Documentation=man:gitea(1)
WorkingDirectory=/var/lib/gitea WorkingDirectory=/var/lib/gitea
ExecStart=/usr/bin/gitea web ExecStart=/usr/bin/gitea web
Restart=always Restart=always
Environment=USER=gitea HOME=/var/lib/gitea Environment=USER=gitea HOME=/var/lib/gitea GITEA_WORK_DIR=/var/lib/gitea
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target