r5279 - in glibc-package/trunk/debian: . rules.d
Author: aurel32
Date: 2012-06-03 19:38:37 +0000 (Sun, 03 Jun 2012)
New Revision: 5279
Modified:
glibc-package/trunk/debian/control
glibc-package/trunk/debian/rules.d/control.mk
Log:
Fix a typo in rules.d/control.mk
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2012-06-03 18:25:31 UTC (rev 5278)
+++ glibc-package/trunk/debian/control 2012-06-03 19:38:37 UTC (rev 5279)
@@ -168,7 +168,7 @@
Suggests: glibc-doc, manpages-dev
Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
Breaks: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11), cmake (<< 2.8.4+dfsg.1-5), gcc-4.4 (<< 4.4.6-4), gcc-4.5 (<< 4.5.3-2), gcc-4.6 (<< 4.6.0-12), make (<< 3.81-8.1), pkg-config (<< 0.26-1), libjna-java (<< 3.2.7-4), liblouis-dev (<< 2.3.0-2), liblouisxml-dev (<< 2.4.0-2), libhwloc-dev (<< 1.2-3)
-Conflicts: libc6.1-dev libc0.1-dev libc0.3-dev
+Conflicts: libc6.1-dev, libc0.1-dev, libc0.3-dev,
Description: Embedded GNU C Library: Development Libraries and Header Files
Contains the symlinks, headers, and object files needed to compile
and link programs which use the standard C library.
@@ -257,7 +257,7 @@
Suggests: glibc-doc, manpages-dev
Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
Breaks: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11), cmake (<< 2.8.4+dfsg.1-5), gcc-4.4 (<< 4.4.6-4), gcc-4.5 (<< 4.5.3-2), gcc-4.6 (<< 4.6.0-12), make (<< 3.81-8.1), pkg-config (<< 0.26-1), libjna-java (<< 3.2.7-4), liblouis-dev (<< 2.3.0-2), liblouisxml-dev (<< 2.4.0-2), libhwloc-dev (<< 1.2-3)
-Conflicts: libc6-dev libc0.1-dev libc0.3-dev
+Conflicts: libc6-dev, libc0.1-dev, libc0.3-dev,
Description: Embedded GNU C Library: Development Libraries and Header Files
Contains the symlinks, headers, and object files needed to compile
and link programs which use the standard C library.
@@ -346,7 +346,7 @@
Suggests: glibc-doc, manpages-dev
Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
Breaks: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11), cmake (<< 2.8.4+dfsg.1-5), gcc-4.4 (<< 4.4.6-4), gcc-4.5 (<< 4.5.3-2), gcc-4.6 (<< 4.6.0-12), make (<< 3.81-8.1), pkg-config (<< 0.26-1), libjna-java (<< 3.2.7-4), liblouis-dev (<< 2.3.0-2), liblouisxml-dev (<< 2.4.0-2), libhwloc-dev (<< 1.2-3)
-Conflicts: libc6-dev libc6.1-dev libc0.1-dev
+Conflicts: libc6-dev, libc6.1-dev, libc0.1-dev,
Description: Embedded GNU C Library: Development Libraries and Header Files
Contains the symlinks, headers, and object files needed to compile
and link programs which use the standard C library.
@@ -435,7 +435,7 @@
Suggests: glibc-doc, manpages-dev
Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
Breaks: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11), cmake (<< 2.8.4+dfsg.1-5), gcc-4.4 (<< 4.4.6-4), gcc-4.5 (<< 4.5.3-2), gcc-4.6 (<< 4.6.0-12), make (<< 3.81-8.1), pkg-config (<< 0.26-1), libjna-java (<< 3.2.7-4), liblouis-dev (<< 2.3.0-2), liblouisxml-dev (<< 2.4.0-2), libhwloc-dev (<< 1.2-3)
-Conflicts: libc6-dev libc6.1-dev libc0.3-dev
+Conflicts: libc6-dev, libc6.1-dev, libc0.3-dev,
Description: Embedded GNU C Library: Development Libraries and Header Files
Contains the symlinks, headers, and object files needed to compile
and link programs which use the standard C library.
Modified: glibc-package/trunk/debian/rules.d/control.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/control.mk 2012-06-03 18:25:31 UTC (rev 5278)
+++ glibc-package/trunk/debian/rules.d/control.mk 2012-06-03 19:38:37 UTC (rev 5279)
@@ -9,7 +9,7 @@
$(patsubst %,debian/control.in/%,$(libc_packages)) :: debian/control.in/% : debian/control.in/libc debian/rules.d/control.mk
sed -e "s%@libc@%$*%g" \
-e "s%@archs@%$($(subst .,_,$*)_archs)%g" \
- -e "s%@libc-dev-conflict@%$(foreach arch,$(filter-out $*,$(libc_packages)),$(arch)-dev)%g" \
+ -e "s%@libc-dev-conflict@%$(foreach arch,$(filter-out $*,$(libc_packages)),$(arch)-dev,)%g" \
< $< > $@
debian/control: $(stamp)control
Reply to: