[Glibc-bsd-commits] r4982 - in trunk: . kfreebsd-downloader-10/debian
Robert Millan
rmh at alioth.debian.org
Mon Sep 30 14:05:55 UTC 2013
Author: rmh
Date: 2013-09-30 14:05:55 +0000 (Mon, 30 Sep 2013)
New Revision: 4982
Added:
trunk/kfreebsd-downloader-10/
trunk/kfreebsd-downloader-10/debian/changelog
trunk/kfreebsd-downloader-10/debian/postinst.in
Removed:
trunk/kfreebsd-downloader-10/debian/changelog
trunk/kfreebsd-downloader-10/debian/postinst.in
Modified:
trunk/kfreebsd-downloader-10/debian/control.in
trunk/kfreebsd-downloader-10/debian/rules
Log:
New upstream ALPHA release
Deleted: trunk/kfreebsd-downloader-10/debian/changelog
===================================================================
--- trunk/kfreebsd-downloader/debian/changelog 2013-09-25 11:00:52 UTC (rev 4960)
+++ trunk/kfreebsd-downloader-10/debian/changelog 2013-09-30 14:05:55 UTC (rev 4982)
@@ -1,99 +0,0 @@
-kfreebsd-downloader (9.2~rc2-1) unstable; urgency=high
-
- * New upstream release.
-
- -- Robert Millan <rmh at debian.org> Mon, 19 Aug 2013 00:24:02 +0200
-
-kfreebsd-downloader (9.2~rc1-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Robert Millan <rmh at debian.org> Tue, 06 Aug 2013 21:24:34 +0200
-
-kfreebsd-downloader (9.2~beta2-1) experimental; urgency=low
-
- * New upstream BETA release.
-
- [ Guillem Jover ]
- * Switch to canonical Vcs URLs.
-
- [ Robert Millan ]
- * Switch to non-native package.
-
- -- Robert Millan <rmh at debian.org> Fri, 02 Aug 2013 21:55:11 +0200
-
-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.
-
- -- Robert Millan <rmh at debian.org> Mon, 29 Jul 2013 00:51:07 +0200
-
-kfreebsd-downloader (9.1-1) unstable; urgency=low
-
- * New upstream release.
- - Bump grub Breaks due to #699002.
-
- * 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> Sun, 28 Jul 2013 18:36:33 +0200
-
-kfreebsd-downloader (9.0-4) unstable; urgency=high
-
- * Make it easier to upgrade by removing version number redundancy.
- * Switch to people.debian.org URL for kernel.txz download.
- (Closes: #712816)
-
- -- Robert Millan <rmh at debian.org> Wed, 19 Jun 2013 22:57:59 +0200
-
-kfreebsd-downloader (9.0-3) unstable; urgency=high
-
- * Split versioned packages to make it possible to install multiple
- versions after Wheezy is released.
-
- -- Robert Millan <rmh at debian.org> Sun, 10 Jun 2012 21:11:24 +0200
-
-kfreebsd-downloader (9.0-2) unstable; urgency=low
-
- * Remove old kernel on upgrade.
- * Generate postinst and postrm dynamically.
-
- -- Robert Millan <rmh at debian.org> Fri, 03 Feb 2012 20:53:16 +0100
-
-kfreebsd-downloader (9.0-1) unstable; urgency=high
-
- * New upstream release.
-
- -- Robert Millan <rmh at debian.org> Fri, 06 Jan 2012 11:17:46 +0100
-
-kfreebsd-downloader (9.0~rc3-2) unstable; urgency=low
-
- * Change Architecture to "kfreebsd-i386 kfreebsd-amd64" to make
- migration scripts happy.
-
- -- Robert Millan <rmh at debian.org> Thu, 15 Dec 2011 19:14:28 +0100
-
-kfreebsd-downloader (9.0~rc3-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Robert Millan <rmh at debian.org> Sat, 10 Dec 2011 20:51:46 +0100
-
-kfreebsd-downloader (9.0~rc2-1) unstable; urgency=low
-
- * Require suitable version of kldutils.
-
- -- Robert Millan <rmh at debian.org> Sun, 04 Dec 2011 11:44:33 +0100
-
-kfreebsd-downloader (9.0~rc2) unstable; urgency=low
-
- * Initial release.
-
- -- Robert Millan <rmh at debian.org> Sat, 03 Dec 2011 18:54:09 +0100
Copied: trunk/kfreebsd-downloader-10/debian/changelog (from rev 4981, trunk/kfreebsd-downloader/debian/changelog)
===================================================================
--- trunk/kfreebsd-downloader-10/debian/changelog (rev 0)
+++ trunk/kfreebsd-downloader-10/debian/changelog 2013-09-30 14:05:55 UTC (rev 4982)
@@ -0,0 +1,111 @@
+kfreebsd-downloader-10 (10.0~alpha4-1) experimental; urgency=low
+
+ * New upstream ALPHA release.
+
+ -- Robert Millan <rmh at debian.org> Mon, 30 Sep 2013 15:57:56 +0200
+
+kfreebsd-downloader (9.2-1) unstable; urgency=high
+
+ * New upstream release.
+
+ -- Robert Millan <rmh at debian.org> Mon, 30 Sep 2013 15:47:11 +0200
+
+kfreebsd-downloader (9.2~rc2-1) unstable; urgency=high
+
+ * New upstream release.
+
+ -- Robert Millan <rmh at debian.org> Mon, 19 Aug 2013 00:24:02 +0200
+
+kfreebsd-downloader (9.2~rc1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Robert Millan <rmh at debian.org> Tue, 06 Aug 2013 21:24:34 +0200
+
+kfreebsd-downloader (9.2~beta2-1) experimental; urgency=low
+
+ * New upstream BETA release.
+
+ [ Guillem Jover ]
+ * Switch to canonical Vcs URLs.
+
+ [ Robert Millan ]
+ * Switch to non-native package.
+
+ -- Robert Millan <rmh at debian.org> Fri, 02 Aug 2013 21:55:11 +0200
+
+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.
+
+ -- Robert Millan <rmh at debian.org> Mon, 29 Jul 2013 00:51:07 +0200
+
+kfreebsd-downloader (9.1-1) unstable; urgency=low
+
+ * New upstream release.
+ - Bump grub Breaks due to #699002.
+
+ * 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> Sun, 28 Jul 2013 18:36:33 +0200
+
+kfreebsd-downloader (9.0-4) unstable; urgency=high
+
+ * Make it easier to upgrade by removing version number redundancy.
+ * Switch to people.debian.org URL for kernel.txz download.
+ (Closes: #712816)
+
+ -- Robert Millan <rmh at debian.org> Wed, 19 Jun 2013 22:57:59 +0200
+
+kfreebsd-downloader (9.0-3) unstable; urgency=high
+
+ * Split versioned packages to make it possible to install multiple
+ versions after Wheezy is released.
+
+ -- Robert Millan <rmh at debian.org> Sun, 10 Jun 2012 21:11:24 +0200
+
+kfreebsd-downloader (9.0-2) unstable; urgency=low
+
+ * Remove old kernel on upgrade.
+ * Generate postinst and postrm dynamically.
+
+ -- Robert Millan <rmh at debian.org> Fri, 03 Feb 2012 20:53:16 +0100
+
+kfreebsd-downloader (9.0-1) unstable; urgency=high
+
+ * New upstream release.
+
+ -- Robert Millan <rmh at debian.org> Fri, 06 Jan 2012 11:17:46 +0100
+
+kfreebsd-downloader (9.0~rc3-2) unstable; urgency=low
+
+ * Change Architecture to "kfreebsd-i386 kfreebsd-amd64" to make
+ migration scripts happy.
+
+ -- Robert Millan <rmh at debian.org> Thu, 15 Dec 2011 19:14:28 +0100
+
+kfreebsd-downloader (9.0~rc3-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Robert Millan <rmh at debian.org> Sat, 10 Dec 2011 20:51:46 +0100
+
+kfreebsd-downloader (9.0~rc2-1) unstable; urgency=low
+
+ * Require suitable version of kldutils.
+
+ -- Robert Millan <rmh at debian.org> Sun, 04 Dec 2011 11:44:33 +0100
+
+kfreebsd-downloader (9.0~rc2) unstable; urgency=low
+
+ * Initial release.
+
+ -- Robert Millan <rmh at debian.org> Sat, 03 Dec 2011 18:54:09 +0100
Modified: trunk/kfreebsd-downloader-10/debian/control.in
===================================================================
--- trunk/kfreebsd-downloader/debian/control.in 2013-09-25 11:00:52 UTC (rev 4960)
+++ trunk/kfreebsd-downloader-10/debian/control.in 2013-09-30 14:05:55 UTC (rev 4982)
@@ -1,11 +1,11 @@
-Source: kfreebsd-downloader
+Source: kfreebsd-downloader- at MAJOR@
Section: contrib/kernel
Priority: extra
Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
Uploaders: Robert Millan <rmh at debian.org>
Build-Depends: debhelper (>= 8.0)
-Vcs-Browser: http://anonscm.debian.org/viewvc/glibc-bsd/trunk/kfreebsd-downloader/
-Vcs-Svn: svn://anonscm.debian.org/glibc-bsd/trunk/kfreebsd-downloader/
+Vcs-Browser: http://anonscm.debian.org/viewvc/glibc-bsd/trunk/kfreebsd-downloader-@MAJOR@/
+Vcs-Svn: svn://anonscm.debian.org/glibc-bsd/trunk/kfreebsd-downloader-@MAJOR@/
Standards-Version: 3.9.2
Package: kfreebsd-downloader- at VERSION@
@@ -35,9 +35,3 @@
Depends: ${misc:Depends}, kfreebsd-downloader- at VERSION@
Description: kernel of FreeBSD (upstream version)
This package depends on the latest downloader for kernel of FreeBSD @MAJOR at .
-
-Package: kfreebsd-downloader
-Architecture: kfreebsd-i386 kfreebsd-amd64
-Depends: ${misc:Depends}, kfreebsd-downloader- at MAJOR@
-Description: kernel of FreeBSD (upstream version)
- This package depends on the latest downloader for kernel of FreeBSD.
Deleted: trunk/kfreebsd-downloader-10/debian/postinst.in
===================================================================
--- trunk/kfreebsd-downloader/debian/postinst.in 2013-09-25 11:00:52 UTC (rev 4960)
+++ trunk/kfreebsd-downloader-10/debian/postinst.in 2013-09-30 14:05:55 UTC (rev 4982)
@@ -1,96 +0,0 @@
-#! /bin/bash
-# postinst script
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <postinst> `configure' <most-recently-configured-version>
-# * <old-postinst> `abort-upgrade' <new version>
-# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-# <new-version>
-# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-# <failed-install-package> <version> `removing'
-# <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
-
-PATH="/sbin:/bin:/usr/sbin:/usr/bin"
-KERNEL_IMG_CONF="/etc/kernel-img.conf"
-MANIFEST="/usr/share/kfreebsd-downloader/@UPSTREAM_VERSION@/MANIFEST. at ARCH@"
-
-case "$1" in
- configure)
- 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@/@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
- break
- fi
- done
- ${found}
-
- # Verify
- grep "^kernel\.txz\s" ${MANIFEST} | (read file sum dummy; sha256sum ${cachedir}/kernel.txz | grep "^${sum}\s")
-
- # Unpack
- rm -rf ${moduledir}
- mkdir -p ${moduledir}
- 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 UPSTREAM_VERSION@.gz
- rm -f ${moduledir}/@UPSTREAM_VERSION@/kernel
-
- ########################################################################
-
- # Sanitize and quote maintainer script parameters
- for p in "$@"; do
- q="$(echo "$p" | sed -e "s/'/'\\''/g")"
- DEB_MAINT_PARAMS="$DEB_MAINT_PARAMS '$q'"
- done
- export DEB_MAINT_PARAMS
-
- # Run /etc/kernel-img.conf postinst hook if defined
- postinst_hook=$(sed '/^\s*postinst_hook/!d;s/.*=\s*//' $KERNEL_IMG_CONF 2>/dev/null || true)
- if [ -n "$postinst_hook" ] ; then
- echo "Running postinst hook script $postinst_hook." 1>&2
- $postinst_hook "$RELEASE" "/boot/kfreebsd-$RELEASE.gz"
- fi
-
- # Run /etc/kernel/postinst.d/ hooks if they exist
- if [ -d "/etc/kernel/postinst.d" ] ; then
- run-parts --verbose --exit-on-error \
- --arg=$RELEASE \
- --arg=/boot/kfreebsd-$RELEASE.gz \
- /etc/kernel/postinst.d
- fi
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
Copied: trunk/kfreebsd-downloader-10/debian/postinst.in (from rev 4980, trunk/kfreebsd-downloader/debian/postinst.in)
===================================================================
--- trunk/kfreebsd-downloader-10/debian/postinst.in (rev 0)
+++ trunk/kfreebsd-downloader-10/debian/postinst.in 2013-09-30 14:05:55 UTC (rev 4982)
@@ -0,0 +1,96 @@
+#! /bin/bash
+# postinst script
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+
+PATH="/sbin:/bin:/usr/sbin:/usr/bin"
+KERNEL_IMG_CONF="/etc/kernel-img.conf"
+MANIFEST="/usr/share/kfreebsd-downloader/@UPSTREAM_VERSION@/MANIFEST. at ARCH@"
+
+case "$1" in
+ configure)
+ 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@/@UPSTREAM_VERSION@ \
+ http://ftp-archive.freebsd.org/pub/FreeBSD-Archive/old-releases/@ARCH@/@ARCH@/@UPSTREAM_VERSION@ \
+ http://people.debian.org/~rmh/kfreebsd-downloader/ftp.freebsd.org/pub/FreeBSD/releases/@ARCH@/@ARCH@/@UPSTREAM_VERSION@ \
+ ; do
+ if wget ${base_url}/kernel.txz -c -O ${cachedir}/kernel.txz ; then
+ found=true
+ break
+ fi
+ done
+ ${found}
+
+ # Verify
+ grep "^kernel\.txz\s" ${MANIFEST} | (read file sum dummy; sha256sum ${cachedir}/kernel.txz | grep "^${sum}\s")
+
+ # Unpack
+ rm -rf ${moduledir}
+ mkdir -p ${moduledir}
+ 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 UPSTREAM_VERSION@.gz
+ rm -f ${moduledir}/@UPSTREAM_VERSION@/kernel
+
+ ########################################################################
+
+ # Sanitize and quote maintainer script parameters
+ for p in "$@"; do
+ q="$(echo "$p" | sed -e "s/'/'\\''/g")"
+ DEB_MAINT_PARAMS="$DEB_MAINT_PARAMS '$q'"
+ done
+ export DEB_MAINT_PARAMS
+
+ # Run /etc/kernel-img.conf postinst hook if defined
+ postinst_hook=$(sed '/^\s*postinst_hook/!d;s/.*=\s*//' $KERNEL_IMG_CONF 2>/dev/null || true)
+ if [ -n "$postinst_hook" ] ; then
+ echo "Running postinst hook script $postinst_hook." 1>&2
+ $postinst_hook "$RELEASE" "/boot/kfreebsd-$RELEASE.gz"
+ fi
+
+ # Run /etc/kernel/postinst.d/ hooks if they exist
+ if [ -d "/etc/kernel/postinst.d" ] ; then
+ run-parts --verbose --exit-on-error \
+ --arg=$RELEASE \
+ --arg=/boot/kfreebsd-$RELEASE.gz \
+ /etc/kernel/postinst.d
+ fi
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
Modified: trunk/kfreebsd-downloader-10/debian/rules
===================================================================
--- trunk/kfreebsd-downloader/debian/rules 2013-09-25 11:00:52 UTC (rev 4960)
+++ trunk/kfreebsd-downloader-10/debian/rules 2013-09-30 14:05:55 UTC (rev 4982)
@@ -6,13 +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/~rc/-RC/' -e 's/-[^-]*$$//g' -e 's/^[^-]*$$/&-RELEASE/')
+upstream_version := $(shell echo $(full_version) | sed -e 's/~alpha/-ALPHA/' -e 's/~beta/-BETA/' -e 's/~rc/-RC/' -e 's/-[^-]*$$//g' -e 's/^[^-]*$$/&-RELEASE/')
tar_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')
-ORIG_DIR := kfreebsd-downloader-$(tar_version)
-ORIG_TAR := kfreebsd-downloader_$(tar_version).orig.tar.gz
+ORIG_DIR := kfreebsd-downloader-$(major)-$(tar_version)
+ORIG_TAR := kfreebsd-downloader-$(major)_$(tar_version).orig.tar.gz
get-orig-source:
rm -rf $(ORIG_DIR)
More information about the Glibc-bsd-commits
mailing list