summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.com>2024-04-13 01:35:10 +0100
committerGStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org>2024-04-13 15:54:35 +0000
commit36c465c4b5c32c47cac5a266cf06dee274322616 (patch)
tree7252b1124def21f871f2c0291e23574d0ebd6d20
parentce63b6a4b016c42de0f67d925a946d313aad975b (diff)
conference: 2013: move sponsor brief pdf from build dir to source dir
Should not have htdocs/ in git, only src/*, and then copy over things from there if needed. Part-of: <https://gitlab.freedesktop.org/gstreamer/www/-/merge_requests/107>
-rw-r--r--src/copy/documents/gstreamer-sponsor-2013.pdf (renamed from htdocs/conference/2013/gstreamer-sponsor.pdf)bin36078 -> 36078 bytes
-rw-r--r--src/htdocs/conference/2013/Makefile.am8
2 files changed, 4 insertions, 4 deletions
diff --git a/htdocs/conference/2013/gstreamer-sponsor.pdf b/src/copy/documents/gstreamer-sponsor-2013.pdf
index 8b7f13d6..8b7f13d6 100644
--- a/htdocs/conference/2013/gstreamer-sponsor.pdf
+++ b/src/copy/documents/gstreamer-sponsor-2013.pdf
Binary files differ
diff --git a/src/htdocs/conference/2013/Makefile.am b/src/htdocs/conference/2013/Makefile.am
index 6a1d1e3c..d5e4cc66 100644
--- a/src/htdocs/conference/2013/Makefile.am
+++ b/src/htdocs/conference/2013/Makefile.am
@@ -8,10 +8,10 @@ images = \
sponsor_150x50_google.png \
lwn.png
-#documents = \
-# gstreamer-sponsor.pdf
+documents = \
+ gstreamer-sponsor.pdf
-#gstreamer-sponsor.pdf:
-# cp $(top_srcdir)/copy/documents/gstreamer-sponsor-2012.pdf gstreamer-sponsor.pdf
+gstreamer-sponsor.pdf:
+ cp $(top_srcdir)/copy/documents/gstreamer-sponsor-2013.pdf gstreamer-sponsor.pdf
include $(top_srcdir)/html.make