diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-04-06 12:00:29 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-04-06 12:00:29 +0200 |
| commit | 933d2fe4cfb380f66af631a2203ec23c367e5b1a (patch) | |
| tree | f10581ed0da1911eed9b02e69d999ba481d9d3c6 /gnu-system.am | |
| parent | f8835ff4b3dd59d59bf44838d05d3d60114d15d2 (diff) | |
| parent | 998afc3608242b75051f43ece36d52474c51e285 (diff) | |
| download | patches-933d2fe4cfb380f66af631a2203ec23c367e5b1a.tar patches-933d2fe4cfb380f66af631a2203ec23c367e5b1a.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu-system.am')
| -rw-r--r-- | gnu-system.am | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gnu-system.am b/gnu-system.am index 805464f658..fc5a233ae3 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -134,6 +134,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/gl.scm \ gnu/packages/glib.scm \ gnu/packages/gnome.scm \ + gnu/packages/gnu-doc.scm \ gnu/packages/gnucash.scm \ gnu/packages/gnunet.scm \ gnu/packages/gnupg.scm \ @@ -222,7 +223,6 @@ GNU_SYSTEM_MODULES = \ gnu/packages/mcrypt.scm \ gnu/packages/messaging.scm \ gnu/packages/mg.scm \ - gnu/packages/miscfiles.scm \ gnu/packages/mit-krb5.scm \ gnu/packages/moe.scm \ gnu/packages/moreutils.scm \ @@ -579,6 +579,7 @@ dist_patch_DATA = \ gnu/packages/patches/libcmis-fix-test-onedrive.patch \ gnu/packages/patches/libdrm-symbol-check.patch \ gnu/packages/patches/libevent-dns-tests.patch \ + gnu/packages/patches/libextractor-ffmpeg-3.patch \ gnu/packages/patches/libmtp-devices.patch \ gnu/packages/patches/liboop-mips64-deplibs-fix.patch \ gnu/packages/patches/libotr-test-auth-fix.patch \ @@ -622,7 +623,6 @@ dist_patch_DATA = \ gnu/packages/patches/mars-sfml-2.3.patch \ gnu/packages/patches/matplotlib-setupext-tk.patch \ gnu/packages/patches/maxima-defsystem-mkdir.patch \ - gnu/packages/patches/mc-fix-ncurses-build.patch \ gnu/packages/patches/mcron-install.patch \ gnu/packages/patches/mdadm-gcc-4.9-fix.patch \ gnu/packages/patches/mhash-keygen-test-segfault.patch \ @@ -651,7 +651,6 @@ dist_patch_DATA = \ gnu/packages/patches/openjpeg-CVE-2015-6581.patch \ gnu/packages/patches/openjpeg-use-after-free-fix.patch \ gnu/packages/patches/openssl-runpath.patch \ - gnu/packages/patches/openssl-c-rehash.patch \ gnu/packages/patches/openssl-c-rehash-in.patch \ gnu/packages/patches/orpheus-cast-errors-and-includes.patch \ gnu/packages/patches/ots-no-include-missing-file.patch \ @@ -776,13 +775,12 @@ dist_patch_DATA = \ gnu/packages/patches/w3m-force-ssl_verify_server-on.patch \ gnu/packages/patches/w3m-disable-sslv2-and-sslv3.patch \ gnu/packages/patches/w3m-disable-weak-ciphers.patch \ - gnu/packages/patches/webkitgtk-2.4-sql-init-string.patch \ gnu/packages/patches/weechat-python.patch \ gnu/packages/patches/weex-vacopy.patch \ gnu/packages/patches/wicd-bitrate-none-fix.patch \ gnu/packages/patches/wicd-get-selected-profile-fix.patch \ - gnu/packages/patches/wicd-template-instantiation.patch \ gnu/packages/patches/wicd-urwid-1.3.patch \ + gnu/packages/patches/wicd-wpa2-ttls.patch \ gnu/packages/patches/wmctrl-64-fix.patch \ gnu/packages/patches/wpa-supplicant-CVE-2015-5310.patch \ gnu/packages/patches/wpa-supplicant-CVE-2015-5314.patch \ |