From d07b88e469abbb7c82d10fbe17473d529aaa4388 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sat, 14 May 2011 21:07:55 +0000
Subject: Add freedesktop.org desktop files for chocolate-doom, chocolate-setup
 (thanks Adrián Chaves Fernández).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2337
---
 data/.gitignore  |  4 ++++
 data/Makefile.am | 21 +++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 data/.gitignore
 create mode 100644 data/Makefile.am

(limited to 'data')

diff --git a/data/.gitignore b/data/.gitignore
new file mode 100644
index 00000000..a76bba93
--- /dev/null
+++ b/data/.gitignore
@@ -0,0 +1,4 @@
+Makefile.in
+Makefile
+*-doom.png
+*-setup.png
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 00000000..dccb51a3
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,21 @@
+
+EXTRA_DIST=              \
+        README           \
+        doom.ico         \
+        doom8.ico        \
+        doom.png         \
+        setup.ico        \
+        setup8.ico       \
+        setup.png        \
+        convert-icon
+
+iconsdir = $(prefix)/share/icons
+icons_DATA = @PROGRAM_PREFIX@doom.png   \
+             @PROGRAM_PREFIX@setup.png
+
+@PROGRAM_PREFIX@doom.png : doom.png
+	cp $^ $@
+
+@PROGRAM_PREFIX@setup.png : setup.png
+	cp $^ $@
+
-- 
cgit v1.2.3


From 736082f2c07aec39311b8356e474f447c06abcd3 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Thu, 21 Jul 2011 14:21:57 +0000
Subject: Don't use $^ in Makefiles, as it s a GNU make extension (thanks Jakub
 Lach).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2354
---
 data/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
index dccb51a3..05951cb0 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -14,8 +14,8 @@ icons_DATA = @PROGRAM_PREFIX@doom.png   \
              @PROGRAM_PREFIX@setup.png
 
 @PROGRAM_PREFIX@doom.png : doom.png
-	cp $^ $@
+	cp $< $@
 
 @PROGRAM_PREFIX@setup.png : setup.png
-	cp $^ $@
+	cp $< $@
 
-- 
cgit v1.2.3


From 2e67fde263924a1f3f3b792dbd38bd58b7a3b948 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Mon, 22 Aug 2011 18:40:26 +0000
Subject: Add clarification note about icon copyright status (thanks to Chris
 Metcalf for clarification by email).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2358
---
 data/README | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'data')

diff --git a/data/README b/data/README
index 82fac17e..c3be61a6 100644
--- a/data/README
+++ b/data/README
@@ -3,6 +3,10 @@ The Chocolate Doom icon is based on an image by Chris Metcalf
 
     http://www.flickr.com/photos/laffy4k/448920776/
 
+Chris has kindly agreed that the Chocolate Doom icon may be used under
+the GNU GPL, so the copyright status of the icon is the same as that of
+the rest of the project.
+
 The "foo8.ico" files are 8-bit depth only, while the "foo.ico" files
 contain full 32-bit versions, scaled to different sizes and with proper
 alpha masks (as well as the 8-bit versions).  The 8-bit versions are
-- 
cgit v1.2.3