r45 - in trunk/packages/libogg/debian: . patches

[Adeodato Simó]

Author: adeodato
Date: 2006-01-18 03:08:30 +0000 (Wed, 18 Jan 2006)
New Revision: 45

Added:
   trunk/packages/libogg/debian/README.Debian-source
   trunk/packages/libogg/debian/patches/
   trunk/packages/libogg/debian/patches/external_rfc_links.diff
   trunk/packages/libogg/debian/patches/series
Modified:
   trunk/packages/libogg/debian/changelog
Log:
Do not ship RFCs in the tarball. Several bits needed to accommodate to
this.


Added: trunk/packages/libogg/debian/README.Debian-source
===================================================================
--- trunk/packages/libogg/debian/README.Debian-source	2006-01-18 03:02:07 UTC (rev 44)
+++ trunk/packages/libogg/debian/README.Debian-source	2006-01-18 03:08:30 UTC (rev 45)
@@ -0,0 +1,12 @@
+The tarball libogg_1.1.3.orig.tar.gz has been repackaged from
+libogg-1.1.3.tar.gz as shipped by Xiph.org to remove the following
+files, due to their non-free license:
+
+   libogg-1.1.3/doc/rfc3533.txt
+   libogg-1.1.3/doc/rfc3534.txt
+
+Incidentally, and for convenience, the debian/ subdir has been removed
+as well.
+
+ -- Adeodato Simó <dato at net.com.org.es>  Wed, 18 Jan 2006 03:55:12 +0100
+

Modified: trunk/packages/libogg/debian/changelog
===================================================================
--- trunk/packages/libogg/debian/changelog	2006-01-18 03:02:07 UTC (rev 44)
+++ trunk/packages/libogg/debian/changelog	2006-01-18 03:08:30 UTC (rev 45)
@@ -4,6 +4,9 @@
 
   * New upstream release packaged. (Closes: #342577)
 
+    As noted in README.Debian-source, the files rfc3533.txt and rfc3534.txt
+    have been removed from the doc/ subdirectory for their non-free license.
+
   * Move HTML documentation from /usr/share/doc/libogg-dev itself to an html/
     subdirectory of it. As it happens, this closes: #300680.
 
@@ -17,6 +20,11 @@
 
   * Add debian/compat file, instead of exporting DH_COMPAT.
 
+  * debian/patches:
+    + external_rfc_links.diff: patch HTML documentation to reference external
+      RFCs instead of local copies, and doc/Makefile.* not to install them,
+      since these are not present in the Debian repacked tarball.
+
   * Update download URL in debian/copyright.
 
   * Add debian/watch file.

Added: trunk/packages/libogg/debian/patches/external_rfc_links.diff
===================================================================
--- trunk/packages/libogg/debian/patches/external_rfc_links.diff	2006-01-18 03:02:07 UTC (rev 44)
+++ trunk/packages/libogg/debian/patches/external_rfc_links.diff	2006-01-18 03:08:30 UTC (rev 45)
@@ -0,0 +1,36 @@
+--- doc/Makefile.am.orig
++++ doc/Makefile.am
+@@ -5,7 +5,6 @@
+ docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+ 
+ doc_DATA = framing.html index.html oggstream.html ogg-multiplex.html \
+-	stream.png vorbisword2.png white-ogg.png white-xifish.png \
+-	rfc3533.txt rfc3534.txt
++	stream.png vorbisword2.png white-ogg.png white-xifish.png
+ 
+ EXTRA_DIST = $(doc_DATA)
+--- doc/Makefile.in.orig
++++ doc/Makefile.in
+@@ -180,8 +180,7 @@
+ SUBDIRS = libogg
+ docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+ doc_DATA = framing.html index.html oggstream.html ogg-multiplex.html \
+-	stream.png vorbisword2.png white-ogg.png white-xifish.png \
+-	rfc3533.txt rfc3534.txt
++	stream.png vorbisword2.png white-ogg.png white-xifish.png
+ 
+ EXTRA_DIST = $(doc_DATA)
+ all: all-recursive
+--- doc/index.html.orig
++++ doc/index.html
+@@ -89,8 +89,8 @@
+ <h2>RFC documentation</h2>
+ 
+ <ul>
+-<li><a href="rfc3533.txt">rfc3533: The Ogg Encapsulation Format Version 0</a></li>
+-<li><a href="rfc3534.txt">rfc3534: The application/ogg Media Type</a></li>
++<li><a href="http://rfc.net/rfc3533.html">rfc3533: The Ogg Encapsulation Format Version 0</a></li>
++<li><a href="http://rfc.net/rfc3534.html">rfc3534: The application/ogg Media Type</a></li>
+ </ul>
+ 
+ <div id="copyright">

Added: trunk/packages/libogg/debian/patches/series
===================================================================
--- trunk/packages/libogg/debian/patches/series	2006-01-18 03:02:07 UTC (rev 44)
+++ trunk/packages/libogg/debian/patches/series	2006-01-18 03:08:30 UTC (rev 45)
@@ -0,0 +1 @@
+external_rfc_links.diff -p0