[Glibc-bsd-commits] r1968 - in trunk: kfreebsd-6/debian kfreebsd-7/debian

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2007-07-11 14:02:47 +0000 (Wed, 11 Jul 2007)
New Revision: 1968

Modified:
   trunk/kfreebsd-6/debian/changelog
   trunk/kfreebsd-6/debian/rules
   trunk/kfreebsd-7/debian/changelog
   trunk/kfreebsd-7/debian/rules
Log:
  * debian/rules:
    - add support for ~ in the version number.
    - remove the hack for preliminar snapshots.



Modified: trunk/kfreebsd-6/debian/changelog
===================================================================
--- trunk/kfreebsd-6/debian/changelog	2007-07-10 19:04:26 UTC (rev 1967)
+++ trunk/kfreebsd-6/debian/changelog	2007-07-11 14:02:47 UTC (rev 1968)
@@ -1,3 +1,11 @@
+kfreebsd-6 (6.2-3) unreleased; urgency=low
+
+  * debian/rules:
+    - add support for ~ in the version number.
+    - remove the hack for preliminar snapshots.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Wed, 11 Jul 2007 05:12:02 +0200
+
 kfreebsd-6 (6.2-2) unreleased; urgency=low
 
   * Fix a possible DoS using IPv6 Routing Header 0 (FreeBSD-SA-07:03.ipv6

Modified: trunk/kfreebsd-6/debian/rules
===================================================================
--- trunk/kfreebsd-6/debian/rules	2007-07-10 19:04:26 UTC (rev 1967)
+++ trunk/kfreebsd-6/debian/rules	2007-07-11 14:02:47 UTC (rev 1968)
@@ -8,13 +8,9 @@
 #export DH_VERBOSE=1
 
 full_version	:= $(shell dpkg-parsechangelog | grep ^Version: | sed -e 's/^.*: //g')
-version		:= $(shell echo $(full_version) | sed -e 's/[+-].*//g')
+version		:= $(shell echo $(full_version) | sed -e 's/[+-~].*//g')
+major           := $(shell echo $(version) | sed -e 's/\..*//g')
 revision	:= $(shell echo $(full_version) | sed -e 's/^[^+-]*//g')
-major		:= $(shell dpkg-parsechangelog | grep ^Source: | sed -e 's/^.*-//g')
-ifeq (, $(findstring :$(major)., :$(version)))
-# Preliminar snapshot (e.g. 6.99+20060217).  Pretend this is the actual release.
-version		:= $(major).0
-endif
 
 os		:= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 cpu		:= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)

Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog	2007-07-10 19:04:26 UTC (rev 1967)
+++ trunk/kfreebsd-7/debian/changelog	2007-07-11 14:02:47 UTC (rev 1968)
@@ -1,4 +1,4 @@
-kfreebsd-7 (6.99+20070703-1) UNRELEASED; urgency=low
++kfreebsd-7 (6.99+20070703-1) UNRELEASED; urgency=low
 
   [ Petr Salinger ]
   * New upstream snapshot of HEAD
@@ -10,6 +10,14 @@
 
  -- Aurelien Jarno <aurel32 at debian.org>  Tue, 03 Jul 2007 16:05:58 +0200
 
+kfreebsd-6 (6.2-3) unreleased; urgency=low
+
+  * debian/rules:
+    - add support for ~ in the version number.
+    - remove the hack for preliminar snapshots.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Wed, 11 Jul 2007 05:12:02 +0200
+
 kfreebsd-6 (6.2-2) unreleased; urgency=low
 
   * Fix a possible DoS using IPv6 Routing Header 0 (FreeBSD-SA-07:03.ipv6

Modified: trunk/kfreebsd-7/debian/rules
===================================================================
--- trunk/kfreebsd-7/debian/rules	2007-07-10 19:04:26 UTC (rev 1967)
+++ trunk/kfreebsd-7/debian/rules	2007-07-11 14:02:47 UTC (rev 1968)
@@ -8,20 +8,15 @@
 #export DH_VERBOSE=1
 
 full_version	:= $(shell dpkg-parsechangelog | grep ^Version: | sed -e 's/^.*: //g')
-version		:= $(shell echo $(full_version) | sed -e 's/[+-].*//g')
+version		:= $(shell echo $(full_version) | sed -e 's/[+-~].*//g')
+major           := $(shell echo $(version) | sed -e 's/\..*//g')
 revision	:= $(shell echo $(full_version) | sed -e 's/^[^+-]*//g')
-major		:= $(shell dpkg-parsechangelog | grep ^Source: | sed -e 's/^.*-//g')
-ifeq (, $(findstring :$(major)., :$(version)))
-# Preliminar snapshot (e.g. 6.99+20060217).  Pretend this is the actual release.
-version		:= $(major).0
-endif
-
 os		:= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 cpu		:= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 config_files	:= $(wildcard debian/arch/$(cpu)/*.config)
 flavours	:= $(config_files:debian/arch/$(cpu)/%.config=%)
 configfile	:= DEBCUSTOM
-abiname		:= 0
+abiname		:= 1
 
 SOURCE_PACKAGE	:= $(CURDIR)/debian/kfreebsd-source-$(version)
 IMAGE_PACKAGE	:= $(CURDIR)/debian/kfreebsd-image-$(version)-$(abiname)