r1253 - in glibc-package/trunk/debian: . control.in rules.d
Author: aurel32
Date: 2006-02-28 19:21:40 +0000 (Tue, 28 Feb 2006)
New Revision: 1253
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/libc0.1
glibc-package/trunk/debian/rules.d/control.mk
Log:
Add kfreebsd-amd64 to rules.d/control.mk
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-02-28 14:30:30 UTC (rev 1252)
+++ glibc-package/trunk/debian/changelog 2006-02-28 19:21:40 UTC (rev 1253)
@@ -12,7 +12,8 @@
for the main pass. Otherwise alternate libraries would conflict with the
main one when using multiarch.
* Fix the build-dependencies for kfreebsd-amd64.
- * Add sysdeps/kfreebsd-amd64.mk
+ * Add sysdeps/kfreebsd-amd64.mk and add kfreebsd-amd64 to
+ rules.d/control.mk.
* Make libc6-i386-dev conflicts with all versions of ia32-libs-dev. As it
won't be built anymore on amd64, this will automatically remove it during
the upgrade.
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2006-02-28 14:30:30 UTC (rev 1252)
+++ glibc-package/trunk/debian/control 2006-02-28 19:21:40 UTC (rev 1253)
@@ -45,7 +45,7 @@
by default. This created a package that unpacked to an excess of 30 megs.
Package: nscd
-Architecture: alpha amd64 arm armeb i386 m68k mips mipsel powerpc ppc64 sparc ia64 hppa s390 sh3 sh4 sh3eb sh4eb kfreebsd-i386
+Architecture: alpha amd64 arm armeb i386 m68k mips mipsel powerpc ppc64 sparc ia64 hppa s390 sh3 sh4 sh3eb sh4eb kfreebsd-i386 kfreebsd-amd64
Section: admin
Priority: optional
Depends: libc6 (>= ${Source-Version})
@@ -272,7 +272,7 @@
installer. Do not install it on a normal system.
Package: libc0.1
-Architecture: kfreebsd-i386
+Architecture: kfreebsd-i386 kfreebsd-amd64
Section: libs
Priority: required
Provides: ${locale-compat:Depends}
@@ -283,7 +283,7 @@
Timezone data is also included.
Package: libc0.1-dev
-Architecture: kfreebsd-i386
+Architecture: kfreebsd-i386 kfreebsd-amd64
Section: libdevel
Priority: standard
Depends: libc0.1 (= ${Source-Version})
@@ -293,7 +293,7 @@
and link programs which use the standard C library.
Package: libc0.1-dbg
-Architecture: kfreebsd-i386
+Architecture: kfreebsd-i386 kfreebsd-amd64
Section: libdevel
Priority: extra
Provides: libc-dbg
@@ -307,7 +307,7 @@
Most people will not need this package.
Package: libc0.1-prof
-Architecture: kfreebsd-i386
+Architecture: kfreebsd-i386 kfreebsd-amd64
Section: libdevel
Priority: extra
Depends: libc0.1 (= ${Source-Version})
@@ -316,7 +316,7 @@
with gprof.
Package: libc0.1-pic
-Architecture: kfreebsd-i386
+Architecture: kfreebsd-i386 kfreebsd-amd64
Section: libdevel
Priority: optional
Conflicts: libc-pic
@@ -331,7 +331,7 @@
Package: libc0.1-udeb
XC-Package-Type: udeb
-Architecture: kfreebsd-i386
+Architecture: kfreebsd-i386 kfreebsd-amd64
Section: debian-installer
Priority: extra
Provides: libc0.1, libc-udeb, ${locale-compat:Depends}
Modified: glibc-package/trunk/debian/control.in/libc0.1
===================================================================
--- glibc-package/trunk/debian/control.in/libc0.1 2006-02-28 14:30:30 UTC (rev 1252)
+++ glibc-package/trunk/debian/control.in/libc0.1 2006-02-28 19:21:40 UTC (rev 1253)
@@ -1,5 +1,5 @@
Package: libc0.1
-Architecture: kfreebsd-i386
+Architecture: kfreebsd-i386 kfreebsd-amd64
Section: libs
Priority: required
Provides: ${locale-compat:Depends}
@@ -10,7 +10,7 @@
Timezone data is also included.
Package: libc0.1-dev
-Architecture: kfreebsd-i386
+Architecture: kfreebsd-i386 kfreebsd-amd64
Section: libdevel
Priority: standard
Depends: libc0.1 (= ${Source-Version})
@@ -20,7 +20,7 @@
and link programs which use the standard C library.
Package: libc0.1-dbg
-Architecture: kfreebsd-i386
+Architecture: kfreebsd-i386 kfreebsd-amd64
Section: libdevel
Priority: extra
Provides: libc-dbg
@@ -34,7 +34,7 @@
Most people will not need this package.
Package: libc0.1-prof
-Architecture: kfreebsd-i386
+Architecture: kfreebsd-i386 kfreebsd-amd64
Section: libdevel
Priority: extra
Depends: libc0.1 (= ${Source-Version})
@@ -43,7 +43,7 @@
with gprof.
Package: libc0.1-pic
-Architecture: kfreebsd-i386
+Architecture: kfreebsd-i386 kfreebsd-amd64
Section: libdevel
Priority: optional
Conflicts: libc-pic
@@ -58,7 +58,7 @@
Package: libc0.1-udeb
XC-Package-Type: udeb
-Architecture: kfreebsd-i386
+Architecture: kfreebsd-i386 kfreebsd-amd64
Section: debian-installer
Priority: extra
Provides: libc0.1, libc-udeb, ${locale-compat:Depends}
Modified: glibc-package/trunk/debian/rules.d/control.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/control.mk 2006-02-28 14:30:30 UTC (rev 1252)
+++ glibc-package/trunk/debian/rules.d/control.mk 2006-02-28 19:21:40 UTC (rev 1253)
@@ -1,6 +1,6 @@
control_deps := $(addprefix debian/control.in/, libc6 libc6.1 libc0.1 libc0.3 sparc64 s390x powerpc ppc64 opt amd64)
-threads_archs := alpha amd64 arm armeb i386 m68k mips mipsel powerpc ppc64 sparc ia64 hppa s390 sh3 sh4 sh3eb sh4eb kfreebsd-i386
+threads_archs := alpha amd64 arm armeb i386 m68k mips mipsel powerpc ppc64 sparc ia64 hppa s390 sh3 sh4 sh3eb sh4eb kfreebsd-i386 kfreebsd-amd64
debian/control.in/libc6: debian/control.in/libc debian/rules.d/control.mk
sed -e 's%@libc@%libc6%g' \
@@ -13,7 +13,7 @@
sed -e 's%@libc@%libc0.3%g;s%@archs@%hurd-i386%g;s/nscd, //' < $< > $@
debian/control.in/libc0.1: debian/control.in/libc debian/rules.d/control.mk
- sed -e 's%@libc@%libc0.1%g;s%@archs@%kfreebsd-i386%g' < $< > $@
+ sed -e 's%@libc@%libc0.1%g;s%@archs@%kfreebsd-i386 kfreebsd-amd64%g' < $< > $@
debian/control: $(stamp)control
$(stamp)control: debian/control.in/main $(control_deps) \
Reply to: