[arch-commits] Commit in man-db/repos (11 files)

Stéphane Gaudreault stephane at archlinux.org
Tue Nov 29 08:32:56 EST 2011


    Date: Tuesday, November 29, 2011 @ 08:32:56
  Author: stephane
Revision: 143802

db-move: moved man-db from [testing] to [core] (x86_64)

Added:
  man-db/repos/core-x86_64/1361_1360.diff
    (from rev 143798, man-db/repos/testing-x86_64/1361_1360.diff)
  man-db/repos/core-x86_64/PKGBUILD
    (from rev 143798, man-db/repos/testing-x86_64/PKGBUILD)
  man-db/repos/core-x86_64/convert-mans
    (from rev 143798, man-db/repos/testing-x86_64/convert-mans)
  man-db/repos/core-x86_64/man-db.cron.daily
    (from rev 143798, man-db/repos/testing-x86_64/man-db.cron.daily)
  man-db/repos/core-x86_64/man-db.install
    (from rev 143798, man-db/repos/testing-x86_64/man-db.install)
Deleted:
  man-db/repos/core-x86_64/1361_1360.diff
  man-db/repos/core-x86_64/PKGBUILD
  man-db/repos/core-x86_64/convert-mans
  man-db/repos/core-x86_64/man-db.cron.daily
  man-db/repos/core-x86_64/man-db.install
  man-db/repos/testing-x86_64/

-------------------+
 1361_1360.diff    |   50 ++++++++++-----------
 PKGBUILD          |  120 ++++++++++++++++++++++++++--------------------------
 convert-mans      |   22 ++++-----
 man-db.cron.daily |   78 ++++++++++++++++-----------------
 man-db.install    |   44 +++++++++----------
 5 files changed, 157 insertions(+), 157 deletions(-)

Deleted: core-x86_64/1361_1360.diff
===================================================================
--- core-x86_64/1361_1360.diff	2011-11-29 13:32:54 UTC (rev 143801)
+++ core-x86_64/1361_1360.diff	2011-11-29 13:32:56 UTC (rev 143802)
@@ -1,25 +0,0 @@
-=== modified file 'src/straycats.c'
---- src/straycats.c	2011-01-10 20:08:22 +0000
-+++ src/straycats.c	2011-06-04 06:34:51 +0000
-@@ -177,6 +177,7 @@
- 			char *lang, *page_encoding;
- 			char *mandir_base;
- 			pipecmd *col_cmd;
-+			char *col_locale;
- 			char *fullpath;
- 
- 			/* we have a straycat. Need to filter it and get
-@@ -226,6 +227,12 @@
- 			col_cmd = pipecmd_new_argstr
- 				(get_def_user ("col", COL));
- 			pipecmd_arg (col_cmd, "-bx");
-+			col_locale = find_charset_locale ("UTF-8");
-+			if (col_locale) {
-+				pipecmd_setenv (col_cmd, "LC_CTYPE",
-+						col_locale);
-+				free (col_locale);
-+			}
- 			pipeline_command (decomp, col_cmd);
- 
- 			fullpath = canonicalize_file_name (catdir);
-

Copied: man-db/repos/core-x86_64/1361_1360.diff (from rev 143798, man-db/repos/testing-x86_64/1361_1360.diff)
===================================================================
--- core-x86_64/1361_1360.diff	                        (rev 0)
+++ core-x86_64/1361_1360.diff	2011-11-29 13:32:56 UTC (rev 143802)
@@ -0,0 +1,25 @@
+=== modified file 'src/straycats.c'
+--- src/straycats.c	2011-01-10 20:08:22 +0000
++++ src/straycats.c	2011-06-04 06:34:51 +0000
+@@ -177,6 +177,7 @@
+ 			char *lang, *page_encoding;
+ 			char *mandir_base;
+ 			pipecmd *col_cmd;
++			char *col_locale;
+ 			char *fullpath;
+ 
+ 			/* we have a straycat. Need to filter it and get
+@@ -226,6 +227,12 @@
+ 			col_cmd = pipecmd_new_argstr
+ 				(get_def_user ("col", COL));
+ 			pipecmd_arg (col_cmd, "-bx");
++			col_locale = find_charset_locale ("UTF-8");
++			if (col_locale) {
++				pipecmd_setenv (col_cmd, "LC_CTYPE",
++						col_locale);
++				free (col_locale);
++			}
+ 			pipeline_command (decomp, col_cmd);
+ 
+ 			fullpath = canonicalize_file_name (catdir);
+

Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD	2011-11-29 13:32:54 UTC (rev 143801)
+++ core-x86_64/PKGBUILD	2011-11-29 13:32:56 UTC (rev 143802)
@@ -1,60 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-# Contributor: Sergej Pupykin <sergej at aur.archlinux.org>
-
-pkgname=man-db
-pkgver=2.6.0.2
-pkgrel=2
-pkgdesc="A utility for reading man pages"
-arch=('i686' 'x86_64')
-url="http://www.nongnu.org/man-db/"
-license=('GPL' 'LGPL')
-groups=('base')
-depends=( 'bash' 'gdbm' 'zlib' 'groff' 'libpipeline')
-optdepends=('less' 'gzip')
-backup=('etc/man_db.conf'
-	'etc/cron.daily/man-db')
-conflicts=('man')
-provides=('man')
-replaces=('man')
-install=${pkgname}.install
-source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.gz
-	1361_1360.diff
-	#http://launchpad.net/man-db/main/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz
-        convert-mans man-db.cron.daily)
-options=('!libtool')
-md5sums=('2b41c96efec032d2b74ccbf2e401f93e'
-         '08b76b1f924c5493a280b79fc0aebde4'
-         '2b7662a7d5b33fe91f9f3e034361a2f6'
-         'd30c39ae47560304471b5461719e0f03')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  # https://bugs.archlinux.org/task/18722
-  patch -Np0 -i $srcdir/1361_1360.diff
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-	--with-db=gdbm --disable-setuid --enable-mandirs=GNU \
-	--with-sections="1 n l 8 3 0 2 5 4 9 6 7"
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make check
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  # part of groff pkg
-  rm -f ${pkgdir}/usr/bin/zsoelim
-
-  # script from LFS to convert manpages, see
-  # http://www.linuxfromscratch.org/lfs/view/6.4/chapter06/man-db.html
-  install -D -m755 ${srcdir}/convert-mans  ${pkgdir}/usr/bin/convert-mans 
-
-  #install whatis cron script
-  install -D -m744 ${srcdir}/man-db.cron.daily ${pkgdir}/etc/cron.daily/man-db
-}
-

Copied: man-db/repos/core-x86_64/PKGBUILD (from rev 143798, man-db/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD	                        (rev 0)
+++ core-x86_64/PKGBUILD	2011-11-29 13:32:56 UTC (rev 143802)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Contributor: Sergej Pupykin <sergej at aur.archlinux.org>
+
+pkgname=man-db
+pkgver=2.6.0.2
+pkgrel=3
+pkgdesc="A utility for reading man pages"
+arch=('i686' 'x86_64')
+url="http://www.nongnu.org/man-db/"
+license=('GPL' 'LGPL')
+groups=('base')
+depends=( 'bash' 'gdbm' 'zlib' 'groff' 'libpipeline')
+optdepends=('less' 'gzip')
+backup=('etc/man_db.conf'
+	'etc/cron.daily/man-db')
+conflicts=('man')
+provides=('man')
+replaces=('man')
+install=${pkgname}.install
+source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.gz
+	1361_1360.diff
+	#http://launchpad.net/man-db/main/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz
+        convert-mans man-db.cron.daily)
+options=('!libtool')
+md5sums=('2b41c96efec032d2b74ccbf2e401f93e'
+         '08b76b1f924c5493a280b79fc0aebde4'
+         '2b7662a7d5b33fe91f9f3e034361a2f6'
+         'd30c39ae47560304471b5461719e0f03')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  # https://bugs.archlinux.org/task/18722
+  patch -Np0 -i $srcdir/1361_1360.diff
+  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
+	--with-db=gdbm --disable-setuid --enable-mandirs=GNU \
+	--with-sections="1 n l 8 3 0 2 5 4 9 6 7"
+  make
+}
+
+check() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make check
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  # part of groff pkg
+  rm -f ${pkgdir}/usr/bin/zsoelim
+
+  # script from LFS to convert manpages, see
+  # http://www.linuxfromscratch.org/lfs/view/6.4/chapter06/man-db.html
+  install -D -m755 ${srcdir}/convert-mans  ${pkgdir}/usr/bin/convert-mans 
+
+  #install whatis cron script
+  install -D -m744 ${srcdir}/man-db.cron.daily ${pkgdir}/etc/cron.daily/man-db
+}
+

Deleted: core-x86_64/convert-mans
===================================================================
--- core-x86_64/convert-mans	2011-11-29 13:32:54 UTC (rev 143801)
+++ core-x86_64/convert-mans	2011-11-29 13:32:56 UTC (rev 143802)
@@ -1,11 +0,0 @@
-#!/bin/sh -e
-FROM="$1"
-TO="$2"
-shift ; shift
-while [ $# -gt 0 ]
-do
-        FILE="$1"
-        shift
-        iconv -f "$FROM" -t "$TO" "$FILE" >.tmp.iconv
-        mv .tmp.iconv "$FILE"
-done

Copied: man-db/repos/core-x86_64/convert-mans (from rev 143798, man-db/repos/testing-x86_64/convert-mans)
===================================================================
--- core-x86_64/convert-mans	                        (rev 0)
+++ core-x86_64/convert-mans	2011-11-29 13:32:56 UTC (rev 143802)
@@ -0,0 +1,11 @@
+#!/bin/sh -e
+FROM="$1"
+TO="$2"
+shift ; shift
+while [ $# -gt 0 ]
+do
+        FILE="$1"
+        shift
+        iconv -f "$FROM" -t "$TO" "$FILE" >.tmp.iconv
+        mv .tmp.iconv "$FILE"
+done

Deleted: core-x86_64/man-db.cron.daily
===================================================================
--- core-x86_64/man-db.cron.daily	2011-11-29 13:32:54 UTC (rev 143801)
+++ core-x86_64/man-db.cron.daily	2011-11-29 13:32:56 UTC (rev 143802)
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-# nicenesses range from -20 (most favorable scheduling) to 19 (least favorable)
-NICE=19
-
-# 0 for none, 1 for real time, 2 for best-effort, 3 for idle
-IONICE_CLASS=2
-
-# 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest
-IONICE_PRIORITY=7
-
-UPDATEMANDB="/usr/bin/mandb --quiet"
-
-# Update the "whatis" database
-#/usr/sbin/makewhatis -u -w
-
-# taken from Debian
-# man-db cron daily
-set -e
-
-if ! [ -d /var/cache/man ]; then
-    # Recover from deletion, per FHS.
-    mkdir -p /var/cache/man
-    chmod 755 /var/cache/man
-fi
-
-# regenerate man database
-
-if [ -x /usr/bin/nice ]; then
-  UPDATEMANDB="/usr/bin/nice -n ${NICE:-19} ${UPDATEMANDB}"
-fi
-
-if [ -x /usr/bin/ionice ]; then
-  UPDATEMANDB="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${UPDATEMANDB}"
-fi
-
-${UPDATEMANDB}
-
-exit 0

Copied: man-db/repos/core-x86_64/man-db.cron.daily (from rev 143798, man-db/repos/testing-x86_64/man-db.cron.daily)
===================================================================
--- core-x86_64/man-db.cron.daily	                        (rev 0)
+++ core-x86_64/man-db.cron.daily	2011-11-29 13:32:56 UTC (rev 143802)
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# nicenesses range from -20 (most favorable scheduling) to 19 (least favorable)
+NICE=19
+
+# 0 for none, 1 for real time, 2 for best-effort, 3 for idle
+IONICE_CLASS=2
+
+# 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest
+IONICE_PRIORITY=7
+
+UPDATEMANDB="/usr/bin/mandb --quiet"
+
+# Update the "whatis" database
+#/usr/sbin/makewhatis -u -w
+
+# taken from Debian
+# man-db cron daily
+set -e
+
+if ! [ -d /var/cache/man ]; then
+    # Recover from deletion, per FHS.
+    mkdir -p /var/cache/man
+    chmod 755 /var/cache/man
+fi
+
+# regenerate man database
+
+if [ -x /usr/bin/nice ]; then
+  UPDATEMANDB="/usr/bin/nice -n ${NICE:-19} ${UPDATEMANDB}"
+fi
+
+if [ -x /usr/bin/ionice ]; then
+  UPDATEMANDB="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${UPDATEMANDB}"
+fi
+
+${UPDATEMANDB}
+
+exit 0

Deleted: core-x86_64/man-db.install
===================================================================
--- core-x86_64/man-db.install	2011-11-29 13:32:54 UTC (rev 143801)
+++ core-x86_64/man-db.install	2011-11-29 13:32:56 UTC (rev 143802)
@@ -1,22 +0,0 @@
-post_install() {
-  echo "it's recommended to create an initial"
-  echo "database running as root:"
-  echo "\"/usr/bin/mandb --quiet\""
-}
-
-post_upgrade() {
-  if [ "`vercmp $2 2.5.3-2`" -lt 0 ]; then
-     echo "systemuser \"man\" is no more required"
-     echo "run \"userdel man\". please also"
-     echo "chown root:root /var/cache/man"
-  fi
-  # force database rebuild to get rid off badly imported pages
-  if [ "`vercmp $2 2.6.0.2`" -lt 0 ]; then
-     echo "(re)building database..."
-     mandb -c --quiet
-  fi
-}
-
-post_remove() {
-  rm -rf /var/cache/man
-}

Copied: man-db/repos/core-x86_64/man-db.install (from rev 143798, man-db/repos/testing-x86_64/man-db.install)
===================================================================
--- core-x86_64/man-db.install	                        (rev 0)
+++ core-x86_64/man-db.install	2011-11-29 13:32:56 UTC (rev 143802)
@@ -0,0 +1,22 @@
+post_install() {
+  echo "it's recommended to create an initial"
+  echo "database running as root:"
+  echo "\"/usr/bin/mandb --quiet\""
+}
+
+post_upgrade() {
+  if [ "`vercmp $2 2.5.3-2`" -lt 0 ]; then
+     echo "systemuser \"man\" is no more required"
+     echo "run \"userdel man\". please also"
+     echo "chown root:root /var/cache/man"
+  fi
+  # force database rebuild to get rid off badly imported pages
+  if [ "`vercmp $2 2.6.0.2`" -lt 0 ]; then
+     echo "(re)building database..."
+     mandb -c --quiet
+  fi
+}
+
+post_remove() {
+  rm -rf /var/cache/man
+}



More information about the arch-commits mailing list