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

Re: need libc5 non-maintainer upgrade



I started compiling libc5 with Ray Dassen's patch.  It will probably
take a few hours to complete.

I changed the patch a bit more.  I added the following lines to the
control entry for libc5-dev:

  Conflicts: libc (<<4.6.27-11), libc-dev
  Provides: libc-dev
  Replaces: ppp (<<2.2.0f-22)

I took them from the latest libc5-dev in bo, which is 5.4.33-3.  The
conflict/provide of libc-dev will make it conflict with libc6-dev (as
it should, since it installs files with the same names).

I'm attaching the new patch to this mail.  Someone stop me if I
did something wrong ;-)

Richard Braakman
diff -ur /tmp/libc-5.4.38/debian/changelog libc-5.4.38/debian/changelog
--- /tmp/libc-5.4.38/debian/changelog	Thu Jan  1 18:55:14 1998
+++ libc-5.4.38/debian/changelog	Thu Jan  1 18:53:19 1998
@@ -1,3 +1,26 @@
+libc (5.4.38-0.4) unstable; urgency=low
+
+  * Non-maintainer release of the changes logged for -0.2 and -0.3:
+      - build libc5-dev and libc5-dbg in addition to -altdev and -altdbg
+      - libc5, libc5-altdev, and libc5-altdbg no longer conflict with libc5-dev
+  * Added Conflicts/Provides/Replaces lines from old libc5-dev (5.4.33-3)
+
+ -- Richard Braakman <dark@xs4all.nl>  Thu,  1 Jan 1998 18:39:11 +0100
+
+libc (5.4.38-0.3) unstable; urgency=low
+
+  * Added description for -dbg package to control files: -0.2 didn't build
+    on my hamm system.
+  * Fixed some grammar.
+
+ -- J.H.M. Dassen (Ray) <jdassen@wi.leidenuniv.nl>  Thu,  1 Jan 1998 16:53:46 +0100
+
+libc (5.4.38-0.2) unstable; urgency=low
+
+  * Build -dev and -dbg packages to make Scott Ellis happy.
+
+ -- David Engel <david@sw.ods.com>  Mon, 29 Dec 1997 17:05:58 -0600
+
 libc (5.4.38-0.1) unstable; urgency=high
 
   * new upstream version (fixes #15340)
diff -ur /tmp/libc-5.4.38/debian/config.i386 libc-5.4.38/debian/config.i386
--- /tmp/libc-5.4.38/debian/config.i386	Thu Jan  1 18:55:14 1998
+++ libc-5.4.38/debian/config.i386	Thu Jan  1 18:32:26 1998
@@ -1,8 +1,8 @@
 STATIC_SHARED=
 MAKE=make
 SPEED=fast
-HOST_ROOTDIR=/usr/i486-linuxlibc1
-HOST_BINDIR=/usr/i486-linuxlibc1/bin
+HOST_ROOTDIR=/usr
+HOST_BINDIR=/usr/bin
 TARGET_ROOTDIR=/
 TARGET_MACHINE=i486-linuxlibc1
 TARGET_OS=linux
diff -ur /tmp/libc-5.4.38/debian/control libc-5.4.38/debian/control
--- /tmp/libc-5.4.38/debian/control	Thu Jan  1 18:55:14 1998
+++ libc-5.4.38/debian/control	Thu Jan  1 18:46:38 1998
@@ -12,8 +12,6 @@
  These libraries are modified to make them work better in a libc6
  environment.
 PRE-DEPENDS: ldso (>=1.7.14-2)
-DEPENDS: libc6 (>=2.0.4-1)
-CONFLICTS: libc5-dev, wg15-locale, locales (<<2.0.4-1)
 ARCHITECTURE: any
 
 PACKAGE: libc5-altdev
@@ -24,7 +22,6 @@
  libraries.  This package can be used to build libc5-base binaries
  even when the libc6-dev package is installed.
 DEPENDS: libc5 (=${Source-Version})
-CONFLICTS: libc5-dev
 ARCHITECTURE: any
 
 PACKAGE: libc5-altdbg
@@ -35,5 +32,24 @@
  This package can be used to debug libc5 even when the libc6-dev package
  is installed.
 DEPENDS: libc5-altdev (=${Source-Version})
-CONFLICTS: libc5-dev
+ARCHITECTURE: any
+
+PACKAGE: libc5-dev
+SECTION: oldlibs
+PRIORITY: standard
+DESCRIPTION: The Linux C library version 5 (dev files).
+ Includes libc headers, kernel headers (v2.0.29) and static 
+ libraries.
+DEPENDS: libc5 (=${Source-Version})
+CONFLICTS: libc (<<4.6.27-11), libc-dev
+PROVIDES: libc-dev
+REPLACES: ppp (<<2.2.0f-22)
+ARCHITECTURE: any
+
+PACKAGE: libc5-dbg
+SECTION: oldlibs
+PRIORITY: optional
+DESCRIPTION: The Linux C library version 5 (debug files).
+ Includes a static library compiled with debugging info.
+DEPENDS: libc5-dev (=${Source-Version})
 ARCHITECTURE: any
diff -ur /tmp/libc-5.4.38/debian/control.bo libc-5.4.38/debian/control.bo
--- /tmp/libc-5.4.38/debian/control.bo	Thu Jan  1 18:55:14 1998
+++ libc-5.4.38/debian/control.bo	Thu Jan  1 18:32:26 1998
@@ -42,7 +42,7 @@
 SECTION: devel
 PRIORITY: optional
 DESCRIPTION: The Linux C library version 5 (debug files).
- Includes a static libraries compiled with debugging info.
+ Includes a static library compiled with debugging info.
 DEPENDS: libc5-dev (=${Source-Version})
 ARCHITECTURE: any
 
@@ -50,7 +50,7 @@
 SECTION: devel
 PRIORITY: optional
 DESCRIPTION: The locale binaries of the Linux C library version 5.
- These binries are needed to compile the locale file to work with libc
+ These binaries are needed to compile the locale file to work with libc
  version 5.4.0 and higher.
 DEPENDS: libc5 (>=5.4.0-0)
 CONFLICTS: locales, libc6
diff -ur /tmp/libc-5.4.38/debian/control.hamm libc-5.4.38/debian/control.hamm
--- /tmp/libc-5.4.38/debian/control.hamm	Thu Jan  1 18:55:14 1998
+++ libc-5.4.38/debian/control.hamm	Thu Jan  1 18:46:38 1998
@@ -12,8 +12,6 @@
  These libraries are modified to make them work better in a libc6
  environment.
 PRE-DEPENDS: ldso (>=1.7.14-2)
-DEPENDS: libc6 (>=2.0.4-1)
-CONFLICTS: libc5-dev, wg15-locale, locales (<<2.0.4-1)
 ARCHITECTURE: any
 
 PACKAGE: libc5-altdev
@@ -24,7 +22,6 @@
  libraries.  This package can be used to build libc5-base binaries
  even when the libc6-dev package is installed.
 DEPENDS: libc5 (=${Source-Version})
-CONFLICTS: libc5-dev
 ARCHITECTURE: any
 
 PACKAGE: libc5-altdbg
@@ -35,5 +32,24 @@
  This package can be used to debug libc5 even when the libc6-dev package
  is installed.
 DEPENDS: libc5-altdev (=${Source-Version})
-CONFLICTS: libc5-dev
+ARCHITECTURE: any
+
+PACKAGE: libc5-dev
+SECTION: oldlibs
+PRIORITY: standard
+DESCRIPTION: The Linux C library version 5 (dev files).
+ Includes libc headers, kernel headers (v2.0.29) and static 
+ libraries.
+DEPENDS: libc5 (=${Source-Version})
+CONFLICTS: libc (<<4.6.27-11), libc-dev
+PROVIDES: libc-dev
+REPLACES: ppp (<<2.2.0f-22)
+ARCHITECTURE: any
+
+PACKAGE: libc5-dbg
+SECTION: oldlibs
+PRIORITY: optional
+DESCRIPTION: The Linux C library version 5 (debug files).
+ Includes a static library compiled with debugging info.
+DEPENDS: libc5-dev (=${Source-Version})
 ARCHITECTURE: any
diff -ur /tmp/libc-5.4.38/debian/rules libc-5.4.38/debian/rules
--- /tmp/libc-5.4.38/debian/rules	Thu Jan  1 18:55:14 1998
+++ libc-5.4.38/debian/rules	Thu Jan  1 18:32:26 1998
@@ -103,8 +103,8 @@
 	mv dev-tmp/usr/lib/libg.a dev-tmp/usr/lib/libc_p.a dbg-tmp/usr/lib
 	install -d alt-tmp/usr/$(aa)-linuxlibc1
 	install -d altdbg-tmp/usr/$(aa)-linuxlibc1
-	mv dev-tmp/usr/* alt-tmp/usr/$(aa)-linuxlibc1
-	mv dbg-tmp/usr/* altdbg-tmp/usr/$(aa)-linuxlibc1
+	cp -a dev-tmp/usr/* alt-tmp/usr/$(aa)-linuxlibc1
+	cp -a dbg-tmp/usr/* altdbg-tmp/usr/$(aa)-linuxlibc1
 	#
 	install -d run-tmp/usr/doc/$(p)
 ifeq ($(dist),bo)
@@ -188,7 +188,7 @@
 	dpkg-name -o -s .. locale-tmp.deb
 	touch binary-locale
 
-binary-hamm: build debian/utmp-conv binary-arch binary-alt 
+binary-hamm: build debian/utmp-conv binary-arch binary-alt binary-dev
 
 binary-bo: binary-arch binary-locale binary-pic binary-dev
 

Reply to: