summary refs log tree commit diff
path: root/gnu-system.am
diff options
context:
space:
mode:
authorAndreas Enge <andreas@enge.fr>2013-08-05 14:59:46 +0200
committerAndreas Enge <andreas@enge.fr>2013-08-05 15:12:50 +0200
commit2b24faa295972e839d0ec540375eb74955264feb (patch)
treef3a793081821054c87d52c7281ba807322cc963d /gnu-system.am
parent75c6fd43ed7d6658aa4a04e92250a88e2bddda47 (diff)
downloadguix-2b24faa295972e839d0ec540375eb74955264feb.tar.gz
gnu: Rename "libapr" to "apr" and "libaprutil" to "apr-util".
* gnu/packages/apr.scm: Rename file from libapr.scm.
* gnu/packages/patches/apr-skip-getservbyname-test.patch: Rename file
    from libapr-skip-getservbyname-test.patch.
* gnu-system.am (GNU_SYSTEM_MODULES): Rename module libapr to apr.
* gnu-system.am (dist_patch_DATA): Rename patch file.
* gnu/packages/apr.scm (apr): Rename from libapr.
* gnu/packages/apr.scm (apr-util): Rename from libaprutil, change
    input name.
* gnu/packages/version-control.scm (subversion): Change input name.
Diffstat (limited to 'gnu-system.am')
-rw-r--r--gnu-system.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu-system.am b/gnu-system.am
index bfead6efb9..6b10c8508d 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -24,6 +24,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages.scm				\
   gnu/packages/acl.scm				\
   gnu/packages/algebra.scm			\
+  gnu/packages/apr.scm           \
   gnu/packages/aspell.scm			\
   gnu/packages/attr.scm				\
   gnu/packages/autotools.scm			\
@@ -87,7 +88,6 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/ld-wrapper.scm			\
   gnu/packages/less.scm				\
   gnu/packages/lesstif.scm			\
-  gnu/packages/libapr.scm			\
   gnu/packages/libdaemon.scm			\
   gnu/packages/libevent.scm			\
   gnu/packages/libffi.scm			\
@@ -173,6 +173,7 @@ GNU_SYSTEM_MODULES =				\
 
 patchdir = $(guilemoduledir)/gnu/packages/patches
 dist_patch_DATA =						\
+  gnu/packages/patches/apr-skip-getservbyname-test.patch \
   gnu/packages/patches/automake-skip-amhello-tests.patch	\
   gnu/packages/patches/bigloo-gc-shebangs.patch			\
   gnu/packages/patches/binutils-ld-new-dtags.patch		\
@@ -196,7 +197,6 @@ dist_patch_DATA =						\
   gnu/packages/patches/guile-default-utf8.patch			\
   gnu/packages/patches/guile-linux-syscalls.patch		\
   gnu/packages/patches/guile-relocatable.patch			\
-  gnu/packages/patches/libapr-skip-getservbyname-test.patch	\
   gnu/packages/patches/libevent-dns-tests.patch			\
   gnu/packages/patches/libtool-skip-tests.patch			\
   gnu/packages/patches/m4-gets-undeclared.patch			\