[Glibc-bsd-commits] r2002 - in trunk/kfreebsd-7/debian: . patches

[ps-guest at alioth.debian.org]

Author: ps-guest
Date: 2007-10-18 19:18:49 +0000 (Thu, 18 Oct 2007)
New Revision: 2002

Modified:
   trunk/kfreebsd-7/debian/changelog
   trunk/kfreebsd-7/debian/patches/913_uudecode.diff
   trunk/kfreebsd-7/debian/rules
Log:
* another RELENG_7 fixes



Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog	2007-10-18 18:32:33 UTC (rev 2001)
+++ trunk/kfreebsd-7/debian/changelog	2007-10-18 19:18:49 UTC (rev 2002)
@@ -1,3 +1,11 @@
+kfreebsd-7 (7.0~cvs20071018-1) UNRELEASED; urgency=low
+
+  [ Petr Salinger ]
+  * New upstream snapshot of RELENG_7
+     - refresh of some patches
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Thr, 18 Oct 2007 07:22:03 +0200
+
 kfreebsd-7 (7.0~cvs20070710-1) unreleased; urgency=low
 
   [ Petr Salinger ]

Modified: trunk/kfreebsd-7/debian/patches/913_uudecode.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/913_uudecode.diff	2007-10-18 18:32:33 UTC (rev 2001)
+++ trunk/kfreebsd-7/debian/patches/913_uudecode.diff	2007-10-18 19:18:49 UTC (rev 2002)
@@ -1,7 +1,7 @@
 diff -ur sys.orig/modules/cxgb/Makefile sys/modules/cxgb/Makefile
 --- sys.orig/modules/cxgb/Makefile	2007-05-30 18:42:07.000000000 +0200
 +++ sys/modules/cxgb/Makefile	2007-05-30 20:02:23.000000000 +0200
-@@ -16,7 +16,7 @@
+@@ -18,21 +18,21 @@
  .if ${MACHINE_ARCH} != "ia64"
  # ld is broken on ia64
  t3fw-4.7.0.bin: ${CXGB}/t3fw-4.7.0.bin.gz.uu
@@ -9,7 +9,23 @@
 +	uudecode -o- < ${CXGB}/t3fw-4.7.0.bin.gz.uu \
  	| gzip -dc > ${.TARGET}
  
- FIRMWS= t3fw-4.7.0.bin:t3fw400
+ FIRMWS= t3fw-4.7.0.bin:t3fw470
+ CLEANFILES+= t3fw-4.7.0.bin
+ 
+ t3b_protocol_sram-1.1.0.bin: ${CXGB}/t3b_protocol_sram-1.1.0.bin.gz.uu
+-	uudecode -p < ${CXGB}/t3b_protocol_sram-1.1.0.bin.gz.uu \
++	uudecode -o- < ${CXGB}/t3b_protocol_sram-1.1.0.bin.gz.uu \
+ 	| gzip -dc > ${.TARGET}
+ 
+ FIRMWS+= t3b_protocol_sram-1.1.0.bin:t3bps110
+ CLEANFILES+= t3b_protocol_sram-1.1.0.bin
+ 
+ t3b_tp_eeprom-1.1.0.bin: ${CXGB}/t3b_tp_eeprom-1.1.0.bin.gz.uu
+-	uudecode -p < ${CXGB}/t3b_tp_eeprom-1.1.0.bin.gz.uu \
++	uudecode -o- < ${CXGB}/t3b_tp_eeprom-1.1.0.bin.gz.uu \
+ 	| gzip -dc > ${.TARGET}
+ 
+ FIRMWS+= t3b_tp_eeprom-1.1.0.bin:t3btpe110
 diff -ur sys.orig/modules/ipwfw/ipw_bss/Makefile sys/modules/ipwfw/ipw_bss/Makefile
 --- sys.orig/modules/ipwfw/ipw_bss/Makefile	2007-05-30 18:15:13.000000000 +0200
 +++ sys/modules/ipwfw/ipw_bss/Makefile	2007-05-30 20:03:15.000000000 +0200

Modified: trunk/kfreebsd-7/debian/rules
===================================================================
--- trunk/kfreebsd-7/debian/rules	2007-10-18 18:32:33 UTC (rev 2001)
+++ trunk/kfreebsd-7/debian/rules	2007-10-18 19:18:49 UTC (rev 2002)
@@ -8,7 +8,7 @@
 #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')
 os		:= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)