[Glibc-bsd-commits] r5387 - in trunk/freebsd-libs/debian: . patches

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-01-25 22:51:17 +0000 (Sat, 25 Jan 2014)
New Revision: 5387

Added:
   trunk/freebsd-libs/debian/patches/svn_HEAD_Makefile.inc.diff
Removed:
   trunk/freebsd-libs/debian/patches/makefile_inc.diff
Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/patches/series
   trunk/freebsd-libs/debian/rules
Log:
Prepare Makefile.inc to be moved into orig tarball.

Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2014-01-25 22:09:22 UTC (rev 5386)
+++ trunk/freebsd-libs/debian/changelog	2014-01-25 22:51:17 UTC (rev 5387)
@@ -1,6 +1,7 @@
 freebsd-libs (10.0-3) UNRELEASED; urgency=low
 
   * Add missing B-D on m4.
+  * Prepare Makefile.inc to be moved into orig tarball.
 
  -- Robert Millan <rmh at debian.org>  Sat, 25 Jan 2014 23:09:11 +0100
 

Deleted: trunk/freebsd-libs/debian/patches/makefile_inc.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/makefile_inc.diff	2014-01-25 22:09:22 UTC (rev 5386)
+++ trunk/freebsd-libs/debian/patches/makefile_inc.diff	2014-01-25 22:51:17 UTC (rev 5387)
@@ -1,7 +0,0 @@
---- /dev/null
-+++ b/lib/Makefile.inc
-@@ -0,0 +1,4 @@
-+# Default version for system libs (override in <lib>/Makefile if necessary)
-+SHLIB_MAJOR?= 0
-+
-+WARNS?=	6

Modified: trunk/freebsd-libs/debian/patches/series
===================================================================
--- trunk/freebsd-libs/debian/patches/series	2014-01-25 22:09:22 UTC (rev 5386)
+++ trunk/freebsd-libs/debian/patches/series	2014-01-25 22:51:17 UTC (rev 5387)
@@ -1,4 +1,5 @@
 # Patches from (or merged in) upstream
+svn_HEAD_Makefile.inc.diff
 
 # Patches that are in good shape for merging upstream
 
@@ -15,7 +16,6 @@
 12_usb.diff
 13_jail.diff
 14_alias.diff
-makefile_inc.diff
 sysconf_cpuset_size.diff
 libusb_backward.diff
 kvm_size_t_kludge.diff

Added: trunk/freebsd-libs/debian/patches/svn_HEAD_Makefile.inc.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/svn_HEAD_Makefile.inc.diff	                        (rev 0)
+++ trunk/freebsd-libs/debian/patches/svn_HEAD_Makefile.inc.diff	2014-01-25 22:51:17 UTC (rev 5387)
@@ -0,0 +1,8 @@
+--- /dev/null
++++ b/lib/Makefile.inc
+@@ -0,0 +1,5 @@
++# $FreeBSD$
++# Default version for system libs (override in <lib>/Makefile if necessary)
++SHLIB_MAJOR?= 5
++
++WARNS?=	6

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2014-01-25 22:09:22 UTC (rev 5386)
+++ trunk/freebsd-libs/debian/rules	2014-01-25 22:51:17 UTC (rev 5387)
@@ -49,7 +49,10 @@
 PMAKE_COMMON = \
 	MAKEFLAGS=$(BSD_MAKEFLAGS) \
 	NO_WERROR=1 NOGCCERROR=1 \
-        NOSHARED=NO NO_SHARED=NO NO_PROFILE=1 DESTDIR=$(DESTDIR) bmake
+        NOSHARED=NO NO_SHARED=NO NO_PROFILE=1 DESTDIR=$(DESTDIR) \
+	bmake \
+	SHLIB_MAJOR=0 \
+	$(NULL)
 PMAKE = \
 	CFLAGS="$(CFLAGS)" \
 	$(PMAKE_COMMON)
@@ -73,6 +76,7 @@
 	         lib/libusbhid sys/cam \
 		lib/libutil \
 		lib/libalias sys/netinet/libalias sys/modules/libalias \
+		lib/Makefile.inc \
 	         sys/kern/subr_sbuf.c \
 	         sys/sys/sbuf.h \
 		sys/netipx/ipx.h \