[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] Debian GNU Mach packaging branch, master, updated. debian/2%1.3.99
From: |
Samuel Thibault |
Subject: |
[SCM] Debian GNU Mach packaging branch, master, updated. debian/2%1.3.99.dfsg.git20120610-1-11-g73e3320 |
Date: |
Sat, 14 Jul 2012 14:01:29 +0000 |
The following commit has been merged in the master branch:
commit 73e3320c2da8e96021855a76ae610328aab77509
Merge: a8dfe5b46bc0f65c68212cd106fcbde4d820957c
53565cd7be7600ad1c3d09d407c7744740ce9bac
Author: Samuel Thibault <address@hidden>
Date: Sat Jul 14 16:01:08 2012 +0200
Merge branch 'master' of git.debian.org:/git/pkg-hurd/gnumach
Conflicts:
debian/changelog
diff --combined debian/changelog
index 0428415,44bad3b..2d42901
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,16 +1,22 @@@
- gnumach (2:1.3.99.dfsg.git20120610-2) UNRELEASED; urgency=low
++gnumach (2:1.3.99.dfsg.git20120710-2) UNRELEASED; urgency=low
+
+ * patches/60_bigmem.patch: Also set Xen to 2/2 memory model.
+
+ -- Samuel Thibault <address@hidden> Sat, 14 Jul 2012 15:59:33 +0200
+
+ gnumach (2:1.3.99.dfsg.git20120710-1) unstable; urgency=low
+
+ * New upstream snaphsot
+
+ -- Samuel Thibault <address@hidden> Tue, 10 Jul 2012 01:59:41 +0000
+
gnumach (2:1.3.99.dfsg.git20120610-1) unstable; urgency=low
* New upstream snapshot.
- * rules: Disable net, pcmcia and wireless groups
+ * patches/12_version_suffix.patch: New patch to append suffix to Mach
version.
+ * rules:
+ - Disable net, pcmcia and wireless groups
+ - Add version suffixes.
* control:
- Do not provide nic-modules, nic-pcmcia-modules, nic-wireless-modules
and pcmcia-modules any more.
--
Debian GNU Mach packaging
- [SCM] Debian GNU Mach packaging branch, master, updated. debian/2%1.3.99.dfsg.git20120610-1-11-g73e3320,
Samuel Thibault <=