aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-10-26 04:45:27 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-10-26 04:45:27 +0100
commita8365c64b4cb753d76a092f736e3b34a61447eb6 (patch)
treef419a641ce429f67582c82b50666ea28b2588e6c
parentda5a410489edf50d0ab064c3b9303b3c87f6bf87 (diff)
downloadarctica-greeter-a8365c64b4cb753d76a092f736e3b34a61447eb6.tar.gz
arctica-greeter-a8365c64b4cb753d76a092f736e3b34a61447eb6.tar.bz2
arctica-greeter-a8365c64b4cb753d76a092f736e3b34a61447eb6.zip
Move logo-with-version creation into upstream code and away from debian/rules.
-rw-r--r--Makefile.am2
-rw-r--r--data/Makefile.am6
-rw-r--r--data/logo.pngbin4350 -> 0 bytes
-rwxr-xr-xdebian/rules1
4 files changed, 6 insertions, 3 deletions
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
--- a/data/logo.png
+++ /dev/null
Binary files 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