[SCM] 2D CAD system branch, master, updated. debian/1.0.0-rc1+nolibs-4-31-g757a168

[Lisandro Damián Nicanor Pérez Meyer]

The following commit has been merged in the master branch:
commit a92b4f3df1fc0c3185ac765d39094151e245fdd6
Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
Date:   Tue Oct 11 22:35:39 2011 -0300

    Add Conflicts and Replaces to remove librecad-doc.

diff --git a/debian/changelog b/debian/changelog
index d8b398e..460fcb3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 librecad (1.0.0~rc3+nolibs-2) unstable; urgency=low
 
   * Fix missing fonts in upstream tarball (Closes: #644984).
+  * Add Conflicts and Replaces librecad-doc (<= 1.0.0~rc1+nolibs-4) to be sure
+    the non-free stuff gets removed.
 
  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Tue, 11 Oct 2011 22:26:01 -0300
 
diff --git a/debian/control b/debian/control
index ac51338..1409e0e 100644
--- a/debian/control
+++ b/debian/control
@@ -27,6 +27,8 @@ Description: Computer-aided design (CAD) system
 Package: librecad-data
 Architecture: all
 Depends: ${misc:Depends}
+Conflicts: librecad-doc (<= 1.0.0~rc1+nolibs-4)
+Replaces: librecad-doc (<= 1.0.0~rc1+nolibs-4)
 Description: Computer-aided design (CAD) system -- shared files
  LibreCAD is an application for computer aided design (CAD) in two
  dimensions (2D).

-- 
2D CAD system