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

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-07-01 22:07:02 +0000 (Mon, 01 Jul 2013)
New Revision: 4659

Modified:
   trunk/kfreebsd-downloader/debian/changelog
   trunk/kfreebsd-downloader/debian/rules
   trunk/kfreebsd-downloader/fetch.sh
Log:
Remove version redundancy and extract everything from changelog.

Modified: trunk/kfreebsd-downloader/debian/changelog
===================================================================
--- trunk/kfreebsd-downloader/debian/changelog	2013-07-01 21:58:09 UTC (rev 4658)
+++ trunk/kfreebsd-downloader/debian/changelog	2013-07-01 22:07:02 UTC (rev 4659)
@@ -2,6 +2,7 @@
 
   * postinst.in: Try all URLs until one succeeds.
   * Lower grub Breaks version due to SPU upload.
+  * Remove version redundancy and extract everything from changelog.
 
  -- Robert Millan <rmh at debian.org>  Mon, 01 Jul 2013 23:53:34 +0200
 

Modified: trunk/kfreebsd-downloader/debian/rules
===================================================================
--- trunk/kfreebsd-downloader/debian/rules	2013-07-01 21:58:09 UTC (rev 4658)
+++ trunk/kfreebsd-downloader/debian/rules	2013-07-01 22:07:02 UTC (rev 4659)
@@ -5,16 +5,23 @@
 
 DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
-MAJOR = 9
-VERSION = $(MAJOR).0
+full_version	:= $(shell dpkg-parsechangelog | grep ^Version: | sed -e 's/^.*: //g')
+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 \
+			-O MANIFEST.$$arch ; \
+	done
+
 %:
 	dh $@
 
 debian/%: debian/%.in debian/rules
 	sed \
-		-e "s/@MAJOR@/$(MAJOR)/g" \
-		-e "s/@VERSION@/$(VERSION)/g" \
+		-e "s/@MAJOR@/$(major)/g" \
+		-e "s/@VERSION@/$(version)/g" \
 		-e "s/@ARCH@/$(DEB_HOST_ARCH_CPU)/g" \
 	< $< > $@
 

Modified: trunk/kfreebsd-downloader/fetch.sh
===================================================================
--- trunk/kfreebsd-downloader/fetch.sh	2013-07-01 21:58:09 UTC (rev 4658)
+++ trunk/kfreebsd-downloader/fetch.sh	2013-07-01 22:07:02 UTC (rev 4659)
@@ -1,7 +1,2 @@
 #!/bin/bash
-
-version="9.0"
-
-for arch in i386 amd64 ; do
-	wget http://ftp.freebsd.org/pub/FreeBSD/releases/$arch/$arch/${version}-RELEASE/MANIFEST -O MANIFEST.$arch
-done
+exec make -f debian/rules fetch