From 98306c05b82a37685793ee84af6a1aaebce7518d Mon Sep 17 00:00:00 2001 From: Emmanuel Cazenave Date: Thu, 29 Nov 2018 12:23:10 +0100 Subject: [PATCH] ensure correct debian packaging --- .gitignore | 9 --------- Jenkinsfile | 27 +++++++++++++++++++++++++++ Makefile | 15 ++++++++------- debian/changelog | 5 +++++ debian/compat | 1 + debian/control | 14 ++++++++++++++ debian/rules | 13 +++++++++++++ debian/source/format | 1 + 8 files changed, 69 insertions(+), 16 deletions(-) create mode 100644 Jenkinsfile create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100755 debian/rules create mode 100644 debian/source/format diff --git a/.gitignore b/.gitignore index 2e223a9..084d810 100644 --- a/.gitignore +++ b/.gitignore @@ -1,18 +1,9 @@ /sdist/ /static/*/style.css /static/*/style.css.map -/static/minint/css/styles.css -/static/minint/css/styles.css.map /src/tmp-*.svg .sass-cache /static/*/_data_uris.scss -/static/grandlyon/img/ -/static/grandlyon-gnm/img/signalement/*.png -/static/orleans/img/ -/static/publik/img/ -/static/somme-cd80/img/ -/static/tournai/img/ -/static/chateauroux/img/ /debian/publik-base-theme/ /debian/publik-base-theme.substvars /debian/publik-base-theme.debhelper.log diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..ec8acfb --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,27 @@ +@Library('eo-jenkins-lib@master') import eo.Utils + +pipeline { + agent any + stages { + stage('Packaging') { + steps { + script { + if (env.JOB_NAME == 'rouen-publik-theme' && env.GIT_BRANCH == 'origin/master') { + sh 'sudo -H -u eobuilder /usr/local/bin/eobuilder rouen-publik-theme' + } + } + } + } + } + post { + always { + script { + utils = new Utils() + utils.mail_notify(currentBuild, env, 'admin+jenkins-rouen-publik-theme@entrouvert.com') + } + } + success { + cleanWs() + } + } +} diff --git a/Makefile b/Makefile index 6a92bc9..eba3f83 100644 --- a/Makefile +++ b/Makefile @@ -6,20 +6,21 @@ prefix = /usr all: css publik-base-theme/static/includes/_data_uris.scss: $(wildcard publik-base-theme/static/includes/img/*) - cd publik-base-theme - python make_data_uris.py static/includes/ + cd publik-base-theme; python make_data_uris.py static/includes/ -css: publik-base-theme/static/includes/_data_uris.scss +css: publik-base-theme/static/includes/_data_uris.scss $(wildcard static/rouen/*.scss) cd static/rouen/ && sass style.scss:style.css - rm -rf static/*/.sass-cache/ + rm -rf static/rouen/.sass-cache/ clean: + rm -rf sdist + rm -f static/rouen/_data_uris.scss rm -rf sdist publik-base-theme/static/includes/_data_uris.scss DIST_FILES = \ Makefile static\ - templates themes.json \ - publik-base-theme + themes.json \ + publik-base-theme dist: clean -mkdir sdist @@ -31,7 +32,7 @@ dist: clean install: mkdir -p $(DESTDIR)$(prefix)/share/publik/themes/rouen - cp -r static templates themes.json $(DESTDIR)$(prefix)/share/publik/themes/rouen + cp -r static themes.json $(DESTDIR)$(prefix)/share/publik/themes/rouen dist-bzip2: dist -mkdir sdist diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..248dac7 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +rouen-publik-theme (0.1-1) unstable; urgency=low + + * Initial packaging. + + -- Emmanuel Cazenave Wed, 27 Nov 2018 07:27:48 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..638d122 --- /dev/null +++ b/debian/control @@ -0,0 +1,14 @@ +Source: rouen-publik-theme +Section: web +Priority: optional +Maintainer: Emmanuel Cazenave +Build-Depends: debhelper (>= 8.0.0), ruby-sass (>= 3.4.23), inkscape +Standards-Version: 3.9.4 +Homepage: http://git.entrouvert.org/rouen-publik-theme.git + +Package: rouen-publik-theme +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends}, python-xstatic-abrilfatface +Conflicts: python-authentic2 (< 2.1.20.742.gb6ee096-0) +Breaks: combo (< 0.7.1) +Description: Rouen Publik Theme diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..955dd78 --- /dev/null +++ b/debian/rules @@ -0,0 +1,13 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +%: + dh $@ diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt)