Re: 3.0-rc6 upload

[Bjørn Mork <bjorn@mork.no>]

Ben Hutchings <ben@decadent.org.uk> writes:
> On Tue, 2011-07-05 at 07:29 +0000, maximilian attems wrote:
>> upload of 3.0-rc6 soonest to exp.
>> 
>> 3.0 is awaited with an high probabilty next week.
>> (with an unstable upload shortly after that)
>> some build breakage is expected due the "unreal" version bump.
>> It is very likely to keep three digits, for backward compat.
>
> We have to keep three digits at least for this release, otherwise the
> version of linux-libc-dev will go backwards.

Huh?  That cannot be impossible to fix, can it?  I assume something like
this for the upstream build script could be applied to your build script
as well?  Or am I missing the obvious (again)?


diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index f6cbc3d..ffbcc3b 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -13,7 +13,7 @@
 set -e
 
 create_package() {
-       local pname="$1" pdir="$2"
+       local pname="$1" pdir="$2" version="$3"
 
        cp debian/copyright "$pdir/usr/share/doc/$pname/"
        cp debian/changelog "$pdir/usr/share/doc/$pname/changelog.Debian"
@@ -60,9 +60,12 @@ create_package() {
        if [ -n "$debarch" ] ; then
                forcearch="-DArchitecture=$debarch"
        fi
+       if [ -n "$version" ] ; then
+               version="-v$version"
+       fi
 
        # Create the package
-       dpkg-gencontrol -isp $forcearch -p$pname -P"$pdir"
+       dpkg-gencontrol -isp $forcearch $version -p$pname -P"$pdir"
        dpkg --build "$pdir" ..
 }
 
@@ -287,7 +290,7 @@ Description: Linux support headers for userspace development
  are used by the installed headers for GNU glibc and other system libraries.
 EOF
 
-create_package "$libc_headers_packagename" "$libc_headers_dir"
+create_package "$libc_headers_packagename" "$libc_headers_dir" "1:$packageversion"
 create_package "$packagename" "$tmpdir"
 
 exit 0



Anyway, doesn't look like Linus has disabled SUBLEVEL in the Makefile
yet, so this discussion is probably pointless...


Bjørn