[Glibc-bsd-commits] r5723 - trunk/kfreebsd-11/debian

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2015-07-07 20:25:41 +0000 (Tue, 07 Jul 2015)
New Revision: 5723

Modified:
   trunk/kfreebsd-11/debian/changelog
   trunk/kfreebsd-11/debian/control.flavor.in
   trunk/kfreebsd-11/debian/control.in
Log:
Merge changes from kfreebsd-10:
  * Build kernel images only on kfreebsd-any arches.
  * Add myself to Uploaders.


Modified: trunk/kfreebsd-11/debian/changelog
===================================================================
--- trunk/kfreebsd-11/debian/changelog	2015-07-07 20:14:31 UTC (rev 5722)
+++ trunk/kfreebsd-11/debian/changelog	2015-07-07 20:25:41 UTC (rev 5723)
@@ -22,6 +22,8 @@
     and directories in the tarball are not writable by the src
     group, but readable by all, regardless of the umask setting
     when the package is built. (Closes: #791584)
+  * Build kernel images only on kfreebsd-any arches.
+  * Add myself to Uploaders.
 
  -- Steven Chamberlain <steven at pyro.eu.org>  Tue, 07 Jul 2015 21:00:25 +0100
 

Modified: trunk/kfreebsd-11/debian/control.flavor.in
===================================================================
--- trunk/kfreebsd-11/debian/control.flavor.in	2015-07-07 20:14:31 UTC (rev 5722)
+++ trunk/kfreebsd-11/debian/control.flavor.in	2015-07-07 20:25:41 UTC (rev 5723)
@@ -1,5 +1,5 @@
 Package: kfreebsd-image- at version@- at abiname@- at flavor@
-Architecture: any- at arch@
+Architecture: kfreebsd- at arch@
 Depends: ${misc:Depends},
  freebsd-utils (>= 8.1-5) [kfreebsd-any], kldutils (>= 7.1) [kfreebsd-any],
  devd [kfreebsd-any] | freebsd-utils (<< 8.2+ds2-9) [kfreebsd-any],
@@ -28,7 +28,7 @@
  This package is compiled for a @flavor at -class machine.
 
 Package: kfreebsd-image- at major@- at flavor@
-Architecture: any- at arch@
+Architecture: kfreebsd- at arch@
 Depends: kfreebsd-image- at version@- at abiname@- at flavor@, ${misc:Depends}
 Description: kernel of FreeBSD @major@ image (meta-package)
  This package depends on the latest binary image for kernel of FreeBSD @major@ on

Modified: trunk/kfreebsd-11/debian/control.in
===================================================================
--- trunk/kfreebsd-11/debian/control.in	2015-07-07 20:14:31 UTC (rev 5722)
+++ trunk/kfreebsd-11/debian/control.in	2015-07-07 20:25:41 UTC (rev 5723)
@@ -2,7 +2,10 @@
 Section: kernel
 Priority: optional
 Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
-Uploaders: Aurelien Jarno <aurel32 at debian.org>, Robert Millan <rmh at debian.org>
+Uploaders:
+ Aurelien Jarno <aurel32 at debian.org>,
+ Robert Millan <rmh at debian.org>,
+ Steven Chamberlain <steven at pyro.eu.org>,
 Vcs-Browser: http://anonscm.debian.org/viewvc/glibc-bsd/trunk/kfreebsd-@major@/
 Vcs-Svn: svn://anonscm.debian.org/glibc-bsd/trunk/kfreebsd-@major@/
 Build-Depends: debhelper (>= 5.0.0), bzip2, sharutils, flex-old | flex,