diff options
| -rw-r--r-- | debian/changelog | 13 | ||||
| -rw-r--r-- | debian/patches/12_version_suffix.patch | 20 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/rules | 8 |
4 files changed, 36 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 0428415..2d42901 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +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 <sthibault@debian.org> Sat, 14 Jul 2012 15:59:33 +0200 +gnumach (2:1.3.99.dfsg.git20120710-1) unstable; urgency=low + + * New upstream snaphsot + + -- Samuel Thibault <sthibault@debian.org> 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. diff --git a/debian/patches/12_version_suffix.patch b/debian/patches/12_version_suffix.patch new file mode 100644 index 0000000..acbdf9f --- /dev/null +++ b/debian/patches/12_version_suffix.patch @@ -0,0 +1,20 @@ +Index: gnumach/configure.ac +=================================================================== +--- gnumach.orig/configure.ac 2012-06-11 00:49:00.000000000 +0000 ++++ gnumach/configure.ac 2012-06-11 00:54:31.000000000 +0000 +@@ -19,6 +19,7 @@ + m4_include([version.m4]) + AC_INIT([AC_PACKAGE_NAME], [AC_PACKAGE_VERSION], [AC_PACKAGE_BUGREPORT], + [AC_PACKAGE_TARNAME]) ++AC_SUBST([PACKAGE_VERSION_SUFFIX]) + AC_CONFIG_SRCDIR([kern/ipc_kobject.c]) + + AC_CONFIG_AUX_DIR([build-aux]) +Index: gnumach/version.c.in +=================================================================== +--- gnumach.orig/version.c.in 2012-06-11 00:49:00.000000000 +0000 ++++ gnumach/version.c.in 2012-06-11 00:49:22.000000000 +0000 +@@ -1,2 +1,2 @@ + /* @configure_input@ */ +-const char version[] = "@PACKAGE_NAME@ @PACKAGE_VERSION@"; ++const char version[] = "@PACKAGE_NAME@ @PACKAGE_VERSION@@PACKAGE_VERSION_SUFFIX@"; diff --git a/debian/patches/series b/debian/patches/series index a1dfc66..4c7a3d0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,7 @@ 00_clean_gfdl.patch 10_cdromlock.patch 11_ignore_CSIn.patch +12_version_suffix.patch 13_ide_dma.patch 24_pci_irq_fix.patch 40_iopl_mem.patch diff --git a/debian/rules b/debian/rules index 8be4b35..2ecba4b 100755 --- a/debian/rules +++ b/debian/rules @@ -66,7 +66,7 @@ build/config.status: configure dh_testdir -mkdir build - cd build && ../configure $(drivers) \ + cd build && PACKAGE_VERSION_SUFFIX=-486 ../configure $(drivers) \ CFLAGS="$(CFLAGS)" \ $(common_configure) @@ -74,7 +74,7 @@ build-xen/config.status: configure dh_testdir -mkdir build-xen - cd build-xen && ../configure \ + cd build-xen && PACKAGE_VERSION_SUFFIX=-xen-486 ../configure \ CFLAGS="$(CFLAGS)" \ $(common_configure) \ --enable-platform=xen @@ -83,7 +83,7 @@ build-dbg/config.status: configure dh_testdir -mkdir build-dbg - cd build-dbg && ../configure --enable-kdb $(drivers) \ + cd build-dbg && PACKAGE_VERSION_SUFFIX=-486-dbg ../configure --enable-kdb $(drivers) \ CFLAGS="$(CFLAGS) -fno-omit-frame-pointer" \ $(common_configure) \ @@ -91,7 +91,7 @@ build-xen-dbg/config.status: configure dh_testdir -mkdir build-xen-dbg - cd build-xen-dbg && ../configure --enable-kdb \ + cd build-xen-dbg && PACKAGE_VERSION_SUFFIX=-xen-486-dbg ../configure --enable-kdb \ CFLAGS="$(CFLAGS) -fno-omit-frame-pointer" \ $(common_configure) \ --enable-platform=xen |