Merge branch 'move-to-github'

24 files changed, 68 insertions, 23 deletions

diff --git a/README.txt b/README.txt
index 97aeac3..6703638 100644
--- a/README.txt
+++ b/README.txt
@@ -25,12 +25,13 @@ For more information, visit to Waffle's website.
 Links
 =====
 
+source:         git://github.com/waffle-gl/waffle
+gitweb:         https://github.com/waffle-gl/waffle
+issue-tracker:  https://github.com/waffle-gl/waffle/issues
 website:        http://people.freedesktop.org/~chadversary/waffle
 mailing-list:   waffle@lists.freedesktop.org
-maintainer:     Chad Versace <chad.versace@linux.intel.com>
-source:         git://people.freedesktop.org/~chadversary/waffle.git
-gitweb:         http://cgit.freedesktop.org/~chadversary/waffle
 license:        BSD [http://www.opensource.org/licenses/bsd-license.php]
+maintainer:     Chad Versace <chad.versace@linux.intel.com>
 
 
 Examples
@@ -39,15 +40,12 @@ Examples
 For example code and makefiles that demonstrate how to use and build with
 Waffle, see the following:
 
-    - Online examples at
-      http://people.freedesktop.org/~chadversary/waffle/examples .
+    - The 'examples' directory in the source repository:
+      http://cgit.freedesktop.org/~chadversary/waffle/tree/examples
 
     - Installed examples at $PREFIX/share/doc/waffle-VERSION/examples, if
       Waffle is installed on your system.
 
-    - The 'examples' directory in the source repository:
-      http://cgit.freedesktop.org/~chadversary/waffle/tree/examples
-
 
 Build Requirements
 ==================
@@ -103,7 +101,7 @@ For full details on configuring, building, and installing Waffle, see
 0. Be in the correct directory
 ------------------------------
 
-    git clone git://people.freedesktop.org/~chadversary/waffle
+    git clone git://github.com/waffle-gl/waffle
     cd waffle
 
 or
diff --git a/debian/control b/debian/control
index b32fa07..cba8b69 100644
--- a/debian/control
+++ b/debian/control
@@ -16,8 +16,8 @@ Build-Depends: binutils (>> 2.18),
                xsltproc
 Standards-Version: 3.9.5
 Homepage: http://people.freedesktop.org/~chadversary/waffle
-Vcs-Git: git://people.freedesktop.org/~chadversary/waffle.git
-Vcs-Browser: http://cgit.freedesktop.org/~chadversary/waffle
+Vcs-Git: git://github.com/waffle-gl/waffle
+Vcs-Browser: https://github.com/waffle-gl/waffle
 
 Package: libwaffle-1
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 891b397..0d8943e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: waffle
 Upstream-Contact: Chad Versace <chad.versace@linux.intel.com>
-Source: http://cgit.freedesktop.org/~chadversary/waffle
+Source: https://github.com/waffle-gl/waffle
 
 Files: *
 Copyright: Intel Corproation
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
index 0d9afdc..ea25ed7 100644
--- a/man/CMakeLists.txt
+++ b/man/CMakeLists.txt
@@ -26,6 +26,7 @@
 set(common_sources
     common/author-chad.versace.xml
     common/copyright.xml
+    common/issues.xml
     common/error-codes.xml
     common/legalnotice.xml
     common/return-value.xml
diff --git a/man/common/issues.xml b/man/common/issues.xml
new file mode 100644
index 0000000..70021e7
--- /dev/null
+++ b/man/common/issues.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+<!DOCTYPE copyright PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
+<refsect1>
+  <title>Issues</title>
+  <para>
+    Please report bugs or and feature requests to
+    <ulink url="https://github.com/waffle-gl/waffle/issues"/>.
+  </para>
+</refsect1>
+
+<!--
+vim:tw=120 et ts=2 sw=2:
+-->
diff --git a/man/waffle.7.xml b/man/waffle.7.xml
index d89c984..f983329 100644
--- a/man/waffle.7.xml
+++ b/man/waffle.7.xml
@@ -74,19 +74,22 @@ Link with -lwaffle-1.
       Your distribution should have installed
       example source code that demonstrates how to use waffle at
       <filename>/usr/share/doc/waffle-${version}/examples</filename>.
-      You can also find example code on
-      <ulink url="http://people.freedesktop.org/~chadversary/waffle">waffle</ulink>'s website.
+      You can also find
+      <ulink url="https://github.com/waffle-gl/waffle/tree/master/examples">examples</ulink>
+      in Waffle's source repository.
     </para>
 
   </refsect1>
 
+  <xi:include href="common/issues.xml"/>
+
   <refsect1>
     <title>See Also</title>
 
     <para>
       <simplelist>
         <member>Website: http://people.freedesktop.org/~chadversary/waffle</member>
-        <member>Source: git://people.freedesktop.org/~chadversary/waffle.git</member>
+        <member>Source: git://github.com/waffle-gl/waffle</member>
       </simplelist>
     </para>
 
diff --git a/man/waffle_attrib_list.3.xml b/man/waffle_attrib_list.3.xml
index 7e12951..9b390ba 100644
--- a/man/waffle_attrib_list.3.xml
+++ b/man/waffle_attrib_list.3.xml
@@ -147,6 +147,8 @@
 
   </refsect1>
 
+  <xi:include href="common/issues.xml"/>
+
   <refsect1>
     <title>See Also</title>
     <para>
diff --git a/man/waffle_config.3.xml b/man/waffle_config.3.xml
index 479a3ce..edfa37e 100644
--- a/man/waffle_config.3.xml
+++ b/man/waffle_config.3.xml
@@ -651,6 +651,8 @@ const int32_t attrib_list[] = {
     </refsect2>
   </refsect1>
 
+  <xi:include href="common/issues.xml"/>
+
   <refsect1>
     <title>See Also</title>
     <para>
diff --git a/man/waffle_context.3.xml b/man/waffle_context.3.xml
index ce89008..91fca9b 100644
--- a/man/waffle_context.3.xml
+++ b/man/waffle_context.3.xml
@@ -235,6 +235,8 @@ struct waffle_context;
     </para>
   </refsect1>
 
+  <xi:include href="common/issues.xml"/>
+
   <refsect1>
     <title>See Also</title>
     <para>
diff --git a/man/waffle_display.3.xml b/man/waffle_display.3.xml
index 337eb9c..755c632 100644
--- a/man/waffle_display.3.xml
+++ b/man/waffle_display.3.xml
@@ -167,6 +167,8 @@ struct waffle_display;
     </para>
   </refsect1>
 
+  <xi:include href="common/issues.xml"/>
+
   <refsect1>
     <title>See Also</title>
     <para>
diff --git a/man/waffle_dl.3.xml b/man/waffle_dl.3.xml
index 357470d..b089b93 100644
--- a/man/waffle_dl.3.xml
+++ b/man/waffle_dl.3.xml
@@ -117,6 +117,8 @@
 
   </refsect1>
 
+  <xi:include href="common/issues.xml"/>
+
   <refsect1>
     <title>See Also</title>
     <para>
diff --git a/man/waffle_enum.3.xml b/man/waffle_enum.3.xml
index 9518b80..c6ad548 100644
--- a/man/waffle_enum.3.xml
+++ b/man/waffle_enum.3.xml
@@ -151,6 +151,8 @@ enum waffle_enum {
 
   </refsect1>
 
+  <xi:include href="common/issues.xml"/>
+
   <refsect1>
     <title>See Also</title>
     <para>
diff --git a/man/waffle_error.3.xml b/man/waffle_error.3.xml
index 718a48e..35ed4e5 100644
--- a/man/waffle_error.3.xml
+++ b/man/waffle_error.3.xml
@@ -293,6 +293,8 @@ struct waffle_error_info {
 
   </refsect1>
 
+  <xi:include href="common/issues.xml"/>
+
   <refsect1>
     <title>See Also</title>
     <para>
diff --git a/man/waffle_feature_test_macros.7.xml b/man/waffle_feature_test_macros.7.xml
index 4ef68db..210dfe3 100644
--- a/man/waffle_feature_test_macros.7.xml
+++ b/man/waffle_feature_test_macros.7.xml
@@ -97,6 +97,8 @@
 
   </refsect1>
 
+  <xi:include href="common/issues.xml"/>
+
   <refsect1>
     <title>See Also</title>
 
diff --git a/man/waffle_gbm.3.xml b/man/waffle_gbm.3.xml
index fc41b45..2478b40 100644
--- a/man/waffle_gbm.3.xml
+++ b/man/waffle_gbm.3.xml
@@ -65,6 +65,8 @@ struct waffle_gbm_window {
     </synopsis>
   </refsynopsisdiv>
 
+  <xi:include href="common/issues.xml"/>
+
   <refsect1>
     <title>See Also</title>
     <para>
diff --git a/man/waffle_get_proc_address.3.xml b/man/waffle_get_proc_address.3.xml
index a2a42a5..a609894 100644
--- a/man/waffle_get_proc_address.3.xml
+++ b/man/waffle_get_proc_address.3.xml
@@ -116,6 +116,8 @@
     </para>
   </refsect1>
 
+  <xi:include href="common/issues.xml"/>
+
   <refsect1>
     <title>See Also</title>
     <para>
diff --git a/man/waffle_glx.3.xml b/man/waffle_glx.3.xml
index 71f2bee..eb7c5d8 100644
--- a/man/waffle_glx.3.xml
+++ b/man/waffle_glx.3.xml
@@ -63,6 +63,8 @@ struct waffle_glx_window {
     </synopsis>
   </refsynopsisdiv>
 
+  <xi:include href="common/issues.xml"/>
+
   <refsect1>
     <title>See Also</title>
     <para>
diff --git a/man/waffle_init.3.xml b/man/waffle_init.3.xml
index 79d0afa..a1b9cd3 100644
--- a/man/waffle_init.3.xml
+++ b/man/waffle_init.3.xml
@@ -222,6 +222,8 @@ main()
     </programlisting>
   </refsect1>
 
+  <xi:include href="common/issues.xml"/>
+
   <refsect1>
     <title>See Also</title>
     <para>
diff --git a/man/waffle_is_extension_in_string.3.xml b/man/waffle_is_extension_in_string.3.xml
index 15b6418..2328c5a 100644
--- a/man/waffle_is_extension_in_string.3.xml
+++ b/man/waffle_is_extension_in_string.3.xml
@@ -91,6 +91,8 @@
     </para>
   </refsect1>
 
+  <xi:include href="common/issues.xml"/>
+
   <refsect1>
     <title>See Also</title>
     <para>
diff --git a/man/waffle_make_current.3.xml b/man/waffle_make_current.3.xml
index e28f031..3fe3980 100644
--- a/man/waffle_make_current.3.xml
+++ b/man/waffle_make_current.3.xml
@@ -100,6 +100,8 @@
     </para>
   </refsect1>
 
+  <xi:include href="common/issues.xml"/>
+
   <refsect1>
     <title>See Also</title>
     <para>
diff --git a/man/waffle_native.3.xml b/man/waffle_native.3.xml
index 5554f4a..01febd2 100644
--- a/man/waffle_native.3.xml
+++ b/man/waffle_native.3.xml
@@ -95,6 +95,8 @@ union waffle_native_window {
 
   </refsect1>
 
+  <xi:include href="common/issues.xml"/>
+
   <refsect1>
     <title>See Also</title>
     <para>
diff --git a/man/waffle_wayland.3.xml b/man/waffle_wayland.3.xml
index 0559d96..2af1b2f 100644
--- a/man/waffle_wayland.3.xml
+++ b/man/waffle_wayland.3.xml
@@ -69,6 +69,8 @@ struct waffle_wayland_window {
     </synopsis>
   </refsynopsisdiv>
 
+  <xi:include href="common/issues.xml"/>
+
   <refsect1>
     <title>See Also</title>
     <para>
diff --git a/man/waffle_window.3.xml b/man/waffle_window.3.xml
index adc1987..de046fa 100644
--- a/man/waffle_window.3.xml
+++ b/man/waffle_window.3.xml
@@ -167,6 +167,8 @@ struct waffle_window;
     </para>
   </refsect1>
 
+  <xi:include href="common/issues.xml"/>
+
   <refsect1>
     <title>See Also</title>
     <para>
diff --git a/man/wflinfo.1.xml b/man/wflinfo.1.xml
index a5f1715..4060f38 100644
--- a/man/wflinfo.1.xml
+++ b/man/wflinfo.1.xml
@@ -173,16 +173,10 @@
 
   </refsect1>
 
+  <xi:include href="common/issues.xml"/>
+
   <refsect1>
     <title>See Also</title>
-
-    <para>
-      <simplelist>
-        <member>Website: http://people.freedesktop.org/~chadversary/waffle</member>
-        <member>Source: git://people.freedesktop.org/~chadversary/waffle.git</member>
-      </simplelist>
-    </para>
-
     <para>
       <simplelist>
         <member><citerefentry><refentrytitle>waffle</refentrytitle><manvolnum>7</manvolnum></citerefentry></member>