[Glibc-bsd-commits] r4817 - in trunk/kfreebsd-downloader: . debian

Robert Millan rmh at alioth.debian.org
Sun Jul 28 23:03:55 UTC 2013 

Author: rmh
Date: 2013-07-28 23:03:55 +0000 (Sun, 28 Jul 2013)
New Revision: 4817

Modified:
   trunk/kfreebsd-downloader/MANIFEST.amd64
   trunk/kfreebsd-downloader/MANIFEST.i386
   trunk/kfreebsd-downloader/debian/changelog
   trunk/kfreebsd-downloader/debian/install.in
   trunk/kfreebsd-downloader/debian/postinst.in
   trunk/kfreebsd-downloader/debian/postrm.in
   trunk/kfreebsd-downloader/debian/rules
Log:
Upload to experimental

Modified: trunk/kfreebsd-downloader/MANIFEST.amd64
===================================================================
--- trunk/kfreebsd-downloader/MANIFEST.amd64	2013-07-28 22:59:29 UTC (rev 4816)
+++ trunk/kfreebsd-downloader/MANIFEST.amd64	2013-07-28 23:03:55 UTC (rev 4817)
@@ -1,7 +1,7 @@
-base.txz	13fa1fe38c2b213fb05a40a910b55b4a63db69ed9d61c59974d8dcb08f2bdc54	17254	base	"Base system (MANDATORY)"	on
-doc.txz	3b7ac8c04d3327e402e94af873c6cb428208cb49b02fd613b7b339764465ad99	123	doc	"Additional documentation"	off
-games.txz	5810ee1070c89ce4f1710bd2e262d7826173ac968a6f723a2a592f31135ec8d9	55	games	"Games (fortune, etc.)"	on
-kernel.txz	d71fe52102105f9828e006a9b0964d14d3a200cae717f8f59f171f42c0333bcd	1292	kernel	"Kernel (MANDATORY)"	on
-lib32.txz	98f721658d6603adf841a0f1e3e9a909b5efcb534b5fe977054b95ed8a35600c	636	lib32	"32-bit compatibility libraries"	on
-ports.txz	958f66e31abd27179da2e482f9d52ec80f44e89c9ec2c8e962b1d658010f5beb	268145	ports	"Ports tree"	on
-src.txz	6a9239bea016b0ccbd5da57d5bf5287a27bf701ae73529531a1211207d9ca5e0	55579	src	"System source code"	off
+base.txz	cab3e83da7ef3d2169d40e8013b090fb807caa91d72f46e717ac9f9a7159b0fc	17573	base	"Base system (MANDATORY)"	on
+doc.txz	be23fe114314379eb5fc263c4f7d421c2ef9c13d61c230cbbb55538e5129818e	123	doc	"Additional documentation"	off
+games.txz	5c088e9b76772f24d1cec93258329a38d2fe9c6e9f3920c9e0c2cad2b90fb9f7	53	games	"Games (fortune, etc.)"	on
+kernel.txz	7e4cb3b2121ea8607a731f5e3602869f9ad4792f97f2fe984c00db3d576bd992	1326	kernel	"Kernel (MANDATORY)"	on
+lib32.txz	cb4d903f51b0e19541fbcf078e14c6776186e547f535fbb75ee35dae1adef03f	582	lib32	"32-bit compatibility libraries"	on
+ports.txz	0f569e3ef0551319fdd5cd9b9c589913b3d62fbec14488dfc84fc223b71bad51	155586	ports	"Ports tree"	on
+src.txz	aa313ab9718a29252771865bb7fd4a723d40c5dbc98c2a9903fee1cde48b2d14	58007	src	"System source code"	off

Modified: trunk/kfreebsd-downloader/MANIFEST.i386
===================================================================
--- trunk/kfreebsd-downloader/MANIFEST.i386	2013-07-28 22:59:29 UTC (rev 4816)
+++ trunk/kfreebsd-downloader/MANIFEST.i386	2013-07-28 23:03:55 UTC (rev 4817)
@@ -1,6 +1,6 @@
-base.txz	e8b8e2c29bb1dd32207dd2e6a78abee51101c1b018381f9f75103c8bd769fcee	17316	base	"Base system (MANDATORY)"	on
-doc.txz	9c5ca16246c5519159c09133d7339f36f22c3598816e084e9b7f872c149c0239	123	doc	"Additional documentation"	off
-games.txz	797e7c83e0d6acb4ecee6aa8fcf78f79dfbfc72d98c99ef79feb1096fe6630d0	55	games	"Games (fortune, etc.)"	on
-kernel.txz	4313470e5ea5c5cff8bd8a9875e051e0c01bf063d355ea64669a22adeddb96b4	1370	kernel	"Kernel (MANDATORY)"	on
-ports.txz	0eca8189daabdf18fe0b3d17282b1d913b37d37caa2e2e64ab199e9698758e4d	268145	ports	"Ports tree"	on
-src.txz	cbbe6d2c5e422c8f38f8b71c89b19c38c3fc2266fe478d6b050170c1584843a5	55579	src	"System source code"	off
+base.txz	66669fd208fe32905b366f176948fe30fe61598699ea8cff44b98abecf18f851	17635	base	"Base system (MANDATORY)"	on
+doc.txz	6ee4dfd8a4e38b54a9f789a7907ecc3e97216ad9b1d067245fe0e5dcec532dc6	123	doc	"Additional documentation"	off
+games.txz	2dd64e50fe31279cac3bd4388d3c4b2a6a0425d81ca9c25c9f732c278efc7f4a	53	games	"Games (fortune, etc.)"	on
+kernel.txz	3ee3f7e3339c2d6de2d4c548c3fac0d7af21d47ab2e425bad0ce683c7a0045a8	1406	kernel	"Kernel (MANDATORY)"	on
+ports.txz	77e34a4e700523e192c4ef2a21e857f814aecb720314fb2a90b0c4d2c914ae66	155586	ports	"Ports tree"	on
+src.txz	4e751b9969dac5f1c3a74e915165ecce9477bac114badb8c1d9c9164d79cb02f	58007	src	"System source code"	off

Modified: trunk/kfreebsd-downloader/debian/changelog
===================================================================
--- trunk/kfreebsd-downloader/debian/changelog	2013-07-28 22:59:29 UTC (rev 4816)
+++ trunk/kfreebsd-downloader/debian/changelog	2013-07-28 23:03:55 UTC (rev 4817)
@@ -1,3 +1,9 @@
+kfreebsd-downloader (9.2~beta1-1) experimental; urgency=low
+
+  * New upstream BETA release.
+
+ -- Robert Millan <rmh at debian.org>  Mon, 29 Jul 2013 01:01:22 +0200
+
 kfreebsd-downloader (9.1-2) unstable; urgency=low
 
   * Reupload to unstable.

Modified: trunk/kfreebsd-downloader/debian/install.in
===================================================================
--- trunk/kfreebsd-downloader/debian/install.in	2013-07-28 22:59:29 UTC (rev 4816)
+++ trunk/kfreebsd-downloader/debian/install.in	2013-07-28 23:03:55 UTC (rev 4817)
@@ -1 +1 @@
-MANIFEST.*		usr/share/kfreebsd-downloader/@VERSION@
+MANIFEST.*		usr/share/kfreebsd-downloader/@UPSTREAM_VERSION@

Modified: trunk/kfreebsd-downloader/debian/postinst.in
===================================================================
--- trunk/kfreebsd-downloader/debian/postinst.in	2013-07-28 22:59:29 UTC (rev 4816)
+++ trunk/kfreebsd-downloader/debian/postinst.in	2013-07-28 23:03:55 UTC (rev 4817)
@@ -19,20 +19,20 @@
 
 PATH="/sbin:/bin:/usr/sbin:/usr/bin"
 KERNEL_IMG_CONF="/etc/kernel-img.conf"
-MANIFEST="/usr/share/kfreebsd-downloader/@VERSION@/MANIFEST. at ARCH@"
+MANIFEST="/usr/share/kfreebsd-downloader/@UPSTREAM_VERSION@/MANIFEST. at ARCH@"
 
 case "$1" in
     configure)
-	cachedir="/var/cache/kfreebsd-downloader/@VERSION at -RELEASE"
-	moduledir="/lib/modules/@VERSION at -RELEASE"
+	cachedir="/var/cache/kfreebsd-downloader/@UPSTREAM_VERSION@"
+	moduledir="/lib/modules/@UPSTREAM_VERSION@"
 
 	# Download
 	mkdir -p ${cachedir}
 	found=false
 	for base_url in \
-		http://ftp.freebsd.org/pub/FreeBSD/releases/@ARCH@/@ARCH@/@VERSION@-RELEASE \
-		http://ftp-archive.freebsd.org/pub/FreeBSD-Archive/old-releases/@ARCH@/@ARCH@/@VERSION@-RELEASE \
-		http://people.debian.org/~rmh/kfreebsd-downloader/@ARCH@/@VERSION@-RELEASE \
+		http://ftp.freebsd.org/pub/FreeBSD/releases/@ARCH@/@ARCH@/@UPSTREAM_VERSION@ \
+		http://ftp-archive.freebsd.org/pub/FreeBSD-Archive/old-releases/@ARCH@/@ARCH@/@UPSTREAM_VERSION@ \
+		http://people.debian.org/~rmh/kfreebsd-downloader/@ARCH@/@UPSTREAM_VERSION@ \
 	; do
 		if wget ${base_url}/kernel.txz -c -O ${cachedir}/kernel.txz ; then
 			found=true
@@ -47,12 +47,12 @@
 	# Unpack
 	rm -rf ${moduledir}
 	mkdir -p ${moduledir}
-	echo "Unpacking kFreeBSD @VERSION at -RELEASE ..." >&2
+	echo "Unpacking kFreeBSD @UPSTREAM_VERSION@ ..." >&2
 	tar --strip-components=3 -C ${moduledir} -xJf ${cachedir}/kernel.txz
 
 	# Install kernel image
-	gzip -9 < ${moduledir}/kernel > /boot/kfreebsd- at VERSION@-RELEASE.gz
-	rm -f ${moduledir}/@VERSION at -RELEASE/kernel
+	gzip -9 < ${moduledir}/kernel > /boot/kfreebsd- at UPSTREAM_VERSION@.gz
+	rm -f ${moduledir}/@UPSTREAM_VERSION@/kernel
 
 	########################################################################
 

Modified: trunk/kfreebsd-downloader/debian/postrm.in
===================================================================
--- trunk/kfreebsd-downloader/debian/postrm.in	2013-07-28 22:59:29 UTC (rev 4816)
+++ trunk/kfreebsd-downloader/debian/postrm.in	2013-07-28 23:03:55 UTC (rev 4817)
@@ -23,7 +23,7 @@
 
 case "$1" in
     remove|purge|upgrade)
-	rm -rf /lib/modules/@VERSION at -RELEASE /boot/kfreebsd- at VERSION@-RELEASE.gz
+	rm -rf /lib/modules/@UPSTREAM_VERSION@ /boot/kfreebsd- at UPSTREAM_VERSION@.gz
 
 	case "$1" in purge)
 		rm -rf /var/cache/kfreebsd-downloader ;;

Modified: trunk/kfreebsd-downloader/debian/rules
===================================================================
--- trunk/kfreebsd-downloader/debian/rules	2013-07-28 22:59:29 UTC (rev 4816)
+++ trunk/kfreebsd-downloader/debian/rules	2013-07-28 23:03:55 UTC (rev 4817)
@@ -6,12 +6,13 @@
 DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
 full_version	:= $(shell dpkg-parsechangelog | grep ^Version: | sed -e 's/^.*: //g')
+upstream_version	:= $(shell echo $(full_version) | sed -e 's/~beta/-BETA/' -e 's/-[^-]*$$//g' -e 's/^[^-]*$$/&-RELEASE/')
 version		:= $(shell echo $(full_version) | sed -e 's/[~+-].*//g')
 major           := $(shell echo $(version) | sed -e 's/\..*//g')
 
 fetch:
 	for arch in i386 amd64 ; do \
-		wget http://ftp.freebsd.org/pub/FreeBSD/releases/$$arch/$$arch/$(version)-RELEASE/MANIFEST \
+		wget http://ftp.freebsd.org/pub/FreeBSD/releases/$$arch/$$arch/$(upstream_version)/MANIFEST \
 			-O MANIFEST.$$arch ; \
 	done
 
@@ -22,6 +23,7 @@
 	sed \
 		-e "s/@MAJOR@/$(major)/g" \
 		-e "s/@VERSION@/$(version)/g" \
+		-e "s/@UPSTREAM_VERSION@/$(upstream_version)/g" \
 		-e "s/@ARCH@/$(DEB_HOST_ARCH_CPU)/g" \
 	< $< > $@

More information about the Glibc-bsd-commits mailing list