CVS eclipse-emf/debian

[Stephan Michels]

Update of /cvsroot/pkg-java/eclipse-emf/debian
In directory haydn:/tmp/cvs-serv9726

Modified Files:
	changelog control 
Log Message:
* debian/control: Add the package itself to the Build-Conflicts, because
  it would disturb the pdebuild process.


--- /cvsroot/pkg-java/eclipse-emf/debian/changelog	2005/12/17 12:26:46	1.1
+++ /cvsroot/pkg-java/eclipse-emf/debian/changelog	2005/12/17 19:24:52	1.2
@@ -2,5 +2,7 @@
 
   [ Stephan Michels ]
   * Initial Version.
+  * debian/control: Add the package itself to the Build-Conflicts, because
+    it would disturb the pdebuild process.
 
- -- Stephan Michels <stephan at apache.org>  Mon, 28 Nov 2005 17:28:27 +0100
+ -- Stephan Michels <stephan at apache.org>  Sat, 17 Dec 2005 20:22:47 +0100
--- /cvsroot/pkg-java/eclipse-emf/debian/control	2005/12/17 12:26:46	1.1
+++ /cvsroot/pkg-java/eclipse-emf/debian/control	2005/12/17 19:24:52	1.2
@@ -4,6 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Stephan Michels <stephan at apache.org>
 Build-Depends: debhelper (>> 4.2), eclipse (>= 3.1.1-5)
+Build-Conflicts: eclipse-emf
 Standards-Version: 3.6.2
 
 Package: eclipse-emf