[Glibc-bsd-commits] r5206 - in trunk/freebsd-glue: debian include src

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-12-01 12:06:52 +0000 (Sun, 01 Dec 2013)
New Revision: 5206

Removed:
   trunk/freebsd-glue/include/libutil.h
   trunk/freebsd-glue/src/util/
Modified:
   trunk/freebsd-glue/debian/changelog
   trunk/freebsd-glue/debian/control
   trunk/freebsd-glue/debian/copyright
   trunk/freebsd-glue/src/Makefile
Log:
Remove libutil glue code, depend on the real thing instead.

Modified: trunk/freebsd-glue/debian/changelog
===================================================================
--- trunk/freebsd-glue/debian/changelog	2013-12-01 12:00:56 UTC (rev 5205)
+++ trunk/freebsd-glue/debian/changelog	2013-12-01 12:06:52 UTC (rev 5206)
@@ -1,3 +1,9 @@
+freebsd-glue (0.2.4) unstable; urgency=low
+
+  * Remove libutil glue code, depend on the real thing instead.
+
+ -- Robert Millan <rmh at debian.org>  Sun, 01 Dec 2013 12:58:10 +0100
+
 freebsd-glue (0.2.3) unstable; urgency=low
 
   * Only install *.so symlink for libfreebsd-glue.

Modified: trunk/freebsd-glue/debian/control
===================================================================
--- trunk/freebsd-glue/debian/control	2013-12-01 12:00:56 UTC (rev 5205)
+++ trunk/freebsd-glue/debian/control	2013-12-01 12:06:52 UTC (rev 5206)
@@ -24,6 +24,7 @@
  zlib1g-dev,
  libexpat-dev,
  libgdbm-dev,
+ libutil-freebsd-dev,
  byacc,
 Recommends:
 # Can't put this in Depends because it would introduce a circular dependency

Modified: trunk/freebsd-glue/debian/copyright
===================================================================
--- trunk/freebsd-glue/debian/copyright	2013-12-01 12:00:56 UTC (rev 5205)
+++ trunk/freebsd-glue/debian/copyright	2013-12-01 12:06:52 UTC (rev 5206)
@@ -21,11 +21,6 @@
 Copyright: 1996-1998, John D. Polstra
 License: BSD (2 clause)
 
-Files: src/util/trimdomain.c
-Copyright: 2001, Brian Somers <brian at Awfulhak.org>
-           Based on original work by Atsushi Murai <amurai at FreeBSD.org>
-License: BSD (2 clause)
-
 Files: src/freebsd-glue/mac.c
  src/freebsd-glue/mac_set.c
 Copyright: 1999-2002, Robert N. M. Watson

Deleted: trunk/freebsd-glue/include/libutil.h
===================================================================
--- trunk/freebsd-glue/include/libutil.h	2013-12-01 12:00:56 UTC (rev 5205)
+++ trunk/freebsd-glue/include/libutil.h	2013-12-01 12:06:52 UTC (rev 5206)
@@ -1,14 +0,0 @@
-#ifndef _FREEBSD_GLUE_LIBUTIL_H_
-#define _FREEBSD_GLUE_LIBUTIL_H_
-
-#include <bsd/libutil.h>
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-#include <sys/_stdint.h>
-
-__BEGIN_DECLS
-void trimdomain(char *_fullhost, int _hostsize);
-__END_DECLS
-
-#endif

Modified: trunk/freebsd-glue/src/Makefile
===================================================================
--- trunk/freebsd-glue/src/Makefile	2013-12-01 12:00:56 UTC (rev 5205)
+++ trunk/freebsd-glue/src/Makefile	2013-12-01 12:06:52 UTC (rev 5206)
@@ -1,6 +1,5 @@
 SUBDIR=	\
 	freebsd-glue \
-	util \
 	crypt \
 	z \
 	${NULL}