[SCM] Packaging for ogre branch, master, updated. upstream/1.4.8.dfsg1-89-g246c1ac

[Andres Mejia]

The following commit has been merged in the master branch:
commit 2a65721a0a29207de48cd780a6f2d51fed18b132
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sat Jul 19 22:15:17 2008 -0400

    New packaging for ogre-1.4.8. Non-free documentation are removed.

diff --git a/debian/changelog b/debian/changelog
index d248681..6e3d294 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,14 @@
-ogre (1.4.8.dfsg1-2) unstable; urgency=low
+ogre (1.4.8.dfsg2-1) unstable; urgency=low
 
+  * New upstream release. (Closes: #479280)
+  * Removing non-free documentation from main packaging. (Closes: #485899)
   * Fix copyright file. Using proposal found in
     http://wiki.debian.org/Proposals/CopyrightFormat.
   * Bumped to Standards-Version 3.8.0.
   * Add get-orig-source rule. Just runs external script.
   * Add note about correct Wings3D homepage in libogre-dev README.Debian file.
 
- -- Andres Mejia <mcitadel at gmail.com>  Fri, 20 Jun 2008 23:30:14 -0400
+ -- Andres Mejia <mcitadel at gmail.com>  Sat, 19 Jul 2008 21:59:38 -0400
 
 ogre (1.4.8.dfsg1-1) unstable; urgency=low
 
diff --git a/debian/ogre-doc.README.Debian b/debian/ogre-doc.README.Debian
new file mode 100644
index 0000000..0341b16
--- /dev/null
+++ b/debian/ogre-doc.README.Debian
@@ -0,0 +1,7 @@
+Missing API and Manual documentation
+====================================
+
+It was found that the API and Manual were generated and distributed under the
+CC-BY-SA 2.5 license, which is non-free. Because of this, the manual and API
+documentation is removed from the main packaging. If you want this documentation
+installed, install the ogre-doc-non-free package.
diff --git a/debian/ogre-doc.docs b/debian/ogre-doc.docs
index c043b52..a86c104 100644
--- a/debian/ogre-doc.docs
+++ b/debian/ogre-doc.docs
@@ -7,9 +7,7 @@ Docs/ogre-logo.gif
 Docs/ReadMe.html
 Docs/README.linux
 Docs/style.css
-Docs/api
 Docs/licenses
-Docs/manual
 Docs/Readme
 Docs/shadows
 Docs/vbo-update
diff --git a/debian/ogre-get-orig-source b/debian/ogre-get-orig-source
index a60a9ac..85283af 100755
--- a/debian/ogre-get-orig-source
+++ b/debian/ogre-get-orig-source
@@ -4,7 +4,7 @@
 # distributed through Debian.
 
 # Some variables to make maintaining this script easier
-OGRE_VERSION="1.4.8.dfsg1"
+OGRE_VERSION="1.4.8.dfsg2"
 OGRE_TARBALL="ogre-v1-4-8.tar.bz2"
 OGRE_TARBALL_CHECKSUM="c9034bdbd4c7cd79a4dd38811765262a"
 
@@ -107,6 +107,10 @@ rm -r ogre-$OGRE_VERSION/Samples/Common/include
 rm -r ogre-$OGRE_VERSION/Samples/Common/setup
 rm -r ogre-$OGRE_VERSION/Samples/ReadMe.html
 
+# Remove non-free autogenerated documentation
+rm -rf ogre-$OGRE_VERSION/Docs/manual/
+rm -rf ogre-$OGRE_VERSION/Docs/api/
+
 # Remove autom4te.cache directories
 echo "Removing generated directories from autotools."
 rm -r ogre-$OGRE_VERSION/autom4te.cache
diff --git a/debian/rules b/debian/rules
index 0afcfc9..1cbc948 100755
--- a/debian/rules
+++ b/debian/rules
@@ -125,7 +125,7 @@ binary-indep: install
 	     debian/ogre-doc/usr/share/doc/ogre-doc/Upstream_ChangeLog.html
 	dh_fixperms -i
 	dh_compress -i -Nogre-doc
-	dh_compress -pogre-doc -X.txt 
+	dh_compress -pogre-doc -X.txt
 	dh_installdeb -i
 	dh_gencontrol -i
 	dh_md5sums -i

-- 
Packaging for ogre