[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] Debian GNU Mach packaging branch, master, updated. debian/1.3.99.d
|
From: |
Samuel Thibault |
|
Subject: |
[SCM] Debian GNU Mach packaging branch, master, updated. debian/1.3.99.dfsg.git20100732-1-6-gc1aa85d |
|
Date: |
Sun, 22 Aug 2010 21:54:55 +0000 |
The following commit has been merged in the master branch:
commit c1aa85d2c946d887d986aad64d3fa4540982fea5
Merge: 68884d2f16797b21bf3fb7bcb4e91ef56b21244d
e84674071df3e8ae9ffa0f2279d7615527ba5202
Author: Samuel Thibault <address@hidden>
Date: Sun Aug 22 23:54:50 2010 +0200
Merge branch 'master' of alioth.debian.org:/git/pkg-hurd/gnumach
Conflicts:
debian/changelog
diff --combined debian/changelog
index ad0a279,84dbf8f..892867c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -6,7 -6,7 +6,8 @@@ gnumach (2:1.3.99.dfsg.git20100732-2) u
shared by gnumach and gnumach-xen, which now depend on it.
* debian/rules: Add rules to build Xen variants of gnumach.
* debian/control: Build gnumach-udeb on hurd-i386 only.
+ * debian/control: Use Package-Type instead of XC-Package-Type.
+ * debian/source/options: Enable bz2 compression.
-- Samuel Thibault <address@hidden> Sat, 31 Jul 2010 17:35:20 +0200
--
Debian GNU Mach packaging