From a8365c64b4cb753d76a092f736e3b34a61447eb6 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 26 Oct 2015 04:45:27 +0100 Subject: Move logo-with-version creation into upstream code and away from debian/rules. --- Makefile.am | 2 +- data/Makefile.am | 6 +++++- data/logo.png | Bin 4350 -> 0 bytes debian/rules | 1 - 4 files changed, 6 insertions(+), 3 deletions(-) delete mode 100644 data/logo.png diff --git a/Makefile.am b/Makefile.am index bf0bb1f..95dd62b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ # -*- Mode: Automake; indent-tabs-mode: t; tab-width: 4 -*- -SUBDIRS = data po src tests +SUBDIRS = src data po tests EXTRA_DIST = \ autogen.sh \ diff --git a/data/Makefile.am b/data/Makefile.am index a40334b..c0e49c9 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -37,6 +37,9 @@ dist_pkgdata_DATA = \ ubuntu_badge.png \ unknown_badge.png +logo.png: logo-bare.png + ../src/logo-generator --logo logo-bare.png --text '$(VERSION)' --output logo.png + @GSETTINGS_RULES@ gsettings_SCHEMAS = org.ArcticaProject.arctica-greeter.gschema.xml @@ -46,4 +49,5 @@ EXTRA_DIST = \ $(gsettings_SCHEMAS) DISTCLEANFILES = \ - Makefile.in + Makefile.in \ + logo.png diff --git a/data/logo.png b/data/logo.png deleted file mode 100644 index 29a9c97..0000000 Binary files a/data/logo.png and /dev/null differ diff --git a/debian/rules b/debian/rules index bd670f1..10f73bf 100755 --- a/debian/rules +++ b/debian/rules @@ -11,7 +11,6 @@ override_dh_autoreconf: override_dh_auto_build: dh_auto_build - ./src/logo-generator --logo data/logo-bare.png --text '15.10' --output logo.png override_dh_auto_install: dh_auto_install -- cgit v1.2.3