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

[Lisandro Damián Nicanor Pérez Meyer]

The following commit has been merged in the master branch:
commit 5f5196649a15b0be4036bfb9398ba87844db9d74
Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
Date:   Mon Oct 24 22:05:20 2011 -0300

    Do not force the removal of librecad-doc.
    
    Once it's an orphaned package it will most surely get removed by apt.

diff --git a/debian/changelog b/debian/changelog
index 41ad2ce..00d8df6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,6 @@ librecad (1.0.0~rc4+nolibs-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Fix missing fonts in upstream tarball (Closes: #644984, #646030).
-  * 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 1409e0e..ac51338 100644
--- a/debian/control
+++ b/debian/control
@@ -27,8 +27,6 @@ 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