[Glibc-bsd-commits] r3336 - in trunk/freebsd-utils/debian: . local

[Guillem Jover]

Author: guillem
Date: 2011-05-28 07:08:08 +0000 (Sat, 28 May 2011)
New Revision: 3336

Added:
   trunk/freebsd-utils/debian/local/
   trunk/freebsd-utils/debian/local/devfs.d/
   trunk/freebsd-utils/debian/local/include/
   trunk/freebsd-utils/debian/local/scripts/
Removed:
   trunk/freebsd-utils/debian/devfs.d/
   trunk/freebsd-utils/debian/include/
   trunk/freebsd-utils/debian/scripts/
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/freebsd-net-tools-udeb.install
   trunk/freebsd-utils/debian/freebsd-net-tools.install
   trunk/freebsd-utils/debian/freebsd-utils.install
   trunk/freebsd-utils/debian/rules
Log:
Move local scripts, includes and devfs.d files to debian/local/


Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2011-05-28 06:35:04 UTC (rev 3335)
+++ trunk/freebsd-utils/debian/changelog	2011-05-28 07:08:08 UTC (rev 3336)
@@ -19,7 +19,8 @@
   [ Guillem Jover ]
   * Translate mount -f (--fake) to -d in the wrapper.
   * Now using Standards-Version 3.9.2 (no changes needed).
-  * Move local headers to debian/include/.
+  * Move local headers to debian/local/include/.
+  * Move local scripts and devfs.d directories to debian/local/.
   * Switch to source format “3.0 (quilt)”.
     - Remove quilt from Build-Depends.
     - Remove patch target in debian/rules.

Modified: trunk/freebsd-utils/debian/freebsd-net-tools-udeb.install
===================================================================
--- trunk/freebsd-utils/debian/freebsd-net-tools-udeb.install	2011-05-28 06:35:04 UTC (rev 3335)
+++ trunk/freebsd-utils/debian/freebsd-net-tools-udeb.install	2011-05-28 07:08:08 UTC (rev 3336)
@@ -1,3 +1,3 @@
 sbin/ifconfig/ifconfig		/sbin
 sbin/route/route		/lib/freebsd
-debian/scripts/sbin/route	/sbin
+debian/local/scripts/sbin/route	/sbin

Modified: trunk/freebsd-utils/debian/freebsd-net-tools.install
===================================================================
--- trunk/freebsd-utils/debian/freebsd-net-tools.install	2011-05-28 06:35:04 UTC (rev 3335)
+++ trunk/freebsd-utils/debian/freebsd-net-tools.install	2011-05-28 07:08:08 UTC (rev 3336)
@@ -1,7 +1,7 @@
 etc/pf.os			/etc
 sbin/ifconfig/ifconfig		/sbin
 sbin/route/route		/lib/freebsd
-debian/scripts/sbin/route	/sbin
+debian/local/scripts/sbin/route	/sbin
 sbin/pfctl/pfctl		/sbin
 usr.sbin/authpf/authpf		/usr/sbin/
 usr.bin/netstat/netstat		/usr/bin/

Modified: trunk/freebsd-utils/debian/freebsd-utils.install
===================================================================
--- trunk/freebsd-utils/debian/freebsd-utils.install	2011-05-28 06:35:04 UTC (rev 3335)
+++ trunk/freebsd-utils/debian/freebsd-utils.install	2011-05-28 07:08:08 UTC (rev 3336)
@@ -8,10 +8,10 @@
 usr.bin/ktrace/ktrace    		/usr/bin
 usr.bin/mkuzip/mkuzip			/usr/bin
 
-debian/devfs.d				/etc
-debian/scripts/bin/mount		/bin
-debian/scripts/bin/sysctl		/bin
-debian/scripts/sbin/umount		/sbin
+debian/local/devfs.d			/etc
+debian/local/scripts/bin/mount		/bin
+debian/local/scripts/bin/sysctl		/bin
+debian/local/scripts/sbin/umount	/sbin
 
 sbin/dmesg/dmesg			/bin
 sbin/dumpon/dumpon			/sbin

Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules	2011-05-28 06:35:04 UTC (rev 3335)
+++ trunk/freebsd-utils/debian/rules	2011-05-28 07:08:08 UTC (rev 3336)
@@ -22,7 +22,7 @@
 ORIGDIR = freebsd-utils-$(VERSION)
 PATH := /usr/lib/freebsd:$(PATH)
 DESTDIR = $(CURDIR)/debian/tmp
-PMAKE = COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS) -I$(CURDIR)/debian/include" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
+PMAKE = COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS) -I$(CURDIR)/debian/local/include" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
 
 build: build-arch build-indep