[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r3612 - in glibc-package/trunk/debian: . control.in



Author: aurel32
Date: 2009-07-12 12:41:18 +0000 (Sun, 12 Jul 2009)
New Revision: 3612

Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/control
   glibc-package/trunk/debian/control.in/main
Log:
  * debian/control.in/main: Build-Conflicts on dpkg-dev (= 1.15.3).
    Closes: #536482.



Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2009-07-12 12:28:30 UTC (rev 3611)
+++ glibc-package/trunk/debian/changelog	2009-07-12 12:41:18 UTC (rev 3612)
@@ -6,8 +6,10 @@
   [ Aurelien Jarno ]
   * Don't ship /usr/include/scsi/scsi.h anymore.  Closes: #535809.
   * Add sysdeps/sh4.mk.  Closes: #536199. 
+  * debian/control.in/main: Build-Conflicts on dpkg-dev (= 1.15.3).
+    Closes: #536482.
 
- -- Aurelien Jarno <aurel32@debian.org>  Sat, 11 Jul 2009 02:11:14 +0200
+ -- Aurelien Jarno <aurel32@debian.org>  Sun, 12 Jul 2009 14:39:01 +0200
 
 eglibc (2.9-19) unstable; urgency=low
 

Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control	2009-07-12 12:28:30 UTC (rev 3611)
+++ glibc-package/trunk/debian/control	2009-07-12 12:41:18 UTC (rev 3612)
@@ -10,9 +10,10 @@
  g++-4.3 (>= 4.3.0-7), g++-4.3-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 sparc],
  g++-4.3 (>= 4.3.3-2) [alpha]
 Build-Depends-Indep: perl, po-debconf (>= 1.0)
+Build-Conflicts: dpkg-dev (= 1.15.3)
 Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
 Uploaders: Ben Collins <bcollins@debian.org>, GOTO Masanori <gotom@debian.org>, Philip Blundell <pb@nexus.co.uk>, Jeff Bailey <jbailey@raspberryginger.com>, Daniel Jacobowitz <dan@debian.org>, Clint Adams <schizo@debian.org>, Aurelien Jarno <aurel32@debian.org>, Pierre Habouzit <madcoder@debian.org>
-Standards-Version: 3.8.2
+Standards-Version: 3.8.1
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-glibc/glibc-package/
 Vcs-Svn: svn://svn.debian.org/pkg-glibc/glibc-package/
 
@@ -353,7 +354,7 @@
 Priority: optional
 Depends: libc6 (= ${binary:Version})
 Replaces: libc6-dev-i386
-Breaks: fakeroot (<= 1.12.2), gnu-efi (<= 3.0e-2), fakechroot (<= 2.9-1), fglrx-glx-ia32 (<= 1:9-5-1), ia32-libs (<= 2.7), ia32-libs-gtk (<= 2.7), lib32asound2 (<= 1.0.20-2), lib32asound2-dev (<= 1.0.20-2), lib32bz2-1.0 (<= 1.0.5-2), lib32bz2-dev (<= 1.0.5-2), lib32ffi-dev (<= 3.0.7-1), lib32ffi5 (<= 3.0.7-1), lib32g2c0 (<= 1:3.4.6-9), lib32gcc1 (<= 1:4.4.0-6), lib32gfortran3 (<= 4.4.0-6), lib32gmp3 (<= 2:4.3.1+dfsg-1), lib32gmp3-dev (<= 2:4.3.1+dfsg-1), lib32gmpxx4 (<= 2:4.3.1+dfsg-1), lib32gomp1 (<= 4.4.0-6), lib32icu-dev (<= 4.0.1-2), lib32icu38, lib32icu40 (<= 4.0.1-2), lib32mudflap0 (<= 4.4.0-6), lib32ncurses5 (<= 5.7+20090523-1), lib32ncurses5-dev (<= 5.7+20090523-1), lib32ncursesw5 (<= 5.7+20090523-1), lib32ncursesw5-dev (<= 5.7+20090523-1), lib32nss-mdns (<= 0.10-3), lib32objc2 (<= 4.4.0-6), lib32readline5 (<= 5.2-4), lib32readline5-dev (<= 5.2-4), lib32stdc++6 (<= 4.4.0-6), lib32stdc++6-4.4-dbg (<= 4.4.0-6), lib32z1 (<= 1:1.2.3.3.dfsg-13), lib32z1-dev (<= 1:1.2.3.3.
 dfsg-13), libc6-dev-i386 (<= 2.9-14), nvidia-glx-ia32 (<= 185.18.14-1), nvidia-libvdpau-ia32 (<= 185.18.14-1)
+Breaks: fakeroot (<= 1.12.2), gnu-efi (<= 3.0e-2), fakechroot (<= 2.9-1), fglrx-glx-ia32 (<= 1:9-5-1), ia32-libs (<= 2.7), ia32-libs-gtk (<= 2.7), lib32asound2 (<= 1.0.20-2), lib32asound2-dev (<= 1.0.20-2), lib32bz2-1.0 (<= 1.0.5-2), lib32bz2-dev (<= 1.0.5-2), lib32ffi-dev (<= 3.0.7-1), lib32ffi5 (<= 3.0.7-1), lib32g2c0 (<= 1:3.4.6-9), lib32gcc1 (<= 1:4.4.0-6), lib32gfortran3 (<= 4.4.0-6), lib32gmp3 (<= 2:4.3.1+dfsg-1), lib32gmp3-dev (<= 2:4.3.1+dfsg-1), lib32gmpxx4 (<= 2:4.3.1+dfsg-1), lib32gomp1 (<= 4.4.0-6), lib32icu-dev (<= 4.0.1-2), lib32icu38 (<= 4.0.1-2), lib32icu40 (<= 4.0.1-2), lib32mudflap0 (<= 4.4.0-6), lib32ncurses5 (<= 5.7+20090523-1), lib32ncurses5-dev (<= 5.7+20090523-1), lib32ncursesw5 (<= 5.7+20090523-1), lib32ncursesw5-dev (<= 5.7+20090523-1), lib32nss-mdns (<= 0.10-3), lib32objc2 (<= 4.4.0-6), lib32readline5 (<= 5.2-4), lib32readline5-dev (<= 5.2-4), lib32stdc++6 (<= 4.4.0-6), lib32stdc++6-4.4-dbg (<= 4.4.0-6), lib32z1 (<= 1:1.2.3.3.dfsg-13), lib32z1-dev (
 <= 1:1.2.3.3.dfsg-13), libc6-dev-i386 (<= 2.9-14), nvidia-glx-ia32 (<= 185.18.14-1), nvidia-libvdpau-ia32 (<= 185.18.14-1)
 Description: GNU C Library: 32-bit shared libraries for AMD64
  This package includes shared versions of the standard C
  library and the standard math library, as well as many others.

Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main	2009-07-12 12:28:30 UTC (rev 3611)
+++ glibc-package/trunk/debian/control.in/main	2009-07-12 12:41:18 UTC (rev 3612)
@@ -10,6 +10,7 @@
  g++-4.3 (>= 4.3.0-7), g++-4.3-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 sparc],
  g++-4.3 (>= 4.3.3-2) [alpha]
 Build-Depends-Indep: perl, po-debconf (>= 1.0)
+Build-Conflicts: dpkg-dev (= 1.15.3)
 Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
 Uploaders: Ben Collins <bcollins@debian.org>, GOTO Masanori <gotom@debian.org>, Philip Blundell <pb@nexus.co.uk>, Jeff Bailey <jbailey@raspberryginger.com>, Daniel Jacobowitz <dan@debian.org>, Clint Adams <schizo@debian.org>, Aurelien Jarno <aurel32@debian.org>, Pierre Habouzit <madcoder@debian.org>
 Standards-Version: 3.8.1


Reply to: