[BusyBox-cvs] busybox/debian busybox-cvs-static.dirs,1.1,1.2 config-deb,1.2,1.3 config-static,1.3,1.4 config-udeb,1.4,1.5 control,1.13,1.14 copyright,1.2,1.3 rules,1.19,1.20

Glenn McGrath bug1 at busybox.net
Sun Dec 8 20:45:52 UTC 2002 

Update of /var/cvs/busybox/debian
In directory winder:/tmp/cvs-serv32297

Modified Files:
	busybox-cvs-static.dirs config-deb config-static config-udeb 
	control copyright rules 
Log Message:
Updates for the new build system from Bastian Blank (waldi)


Index: busybox-cvs-static.dirs
===================================================================
RCS file: /var/cvs/busybox/debian/busybox-cvs-static.dirs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- busybox-cvs-static.dirs	1 Dec 2002 11:38:56 -0000	1.1
+++ busybox-cvs-static.dirs	8 Dec 2002 20:45:47 -0000	1.2
@@ -1 +1,2 @@
 bin
+usr/share/lintian/overrides

Index: config-deb
===================================================================
RCS file: /var/cvs/busybox/debian/config-deb,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- config-deb	1 Dec 2002 02:09:19 -0000	1.2
+++ config-deb	8 Dec 2002 20:45:47 -0000	1.3
@@ -1,9 +1,9 @@
 #
-# Automatically generated by make menuconfig: don't edit
+# Automatically generated make config: don't edit
 #
 
 #
-# BusyBox general settings
+# General Configuration
 #
 # CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
 CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
[...85 lines suppressed...]
+#
 # CONFIG_PIVOT_ROOT is not set
 # CONFIG_RDATE is not set
 CONFIG_SWAPONOFF=y
 CONFIG_MOUNT=y
 CONFIG_NFSMOUNT=y
-# CONFIG_FEATURE_USE_DEVPS_PATCH is not set
 CONFIG_UMOUNT=y
 CONFIG_FEATURE_MOUNT_FORCE=y
+
+#
+# Common options for mount/umount
+#
 CONFIG_FEATURE_MOUNT_LOOP=y
 # CONFIG_FEATURE_MTAB_SUPPORT is not set
+
+#
+# Debugging Options
+#
+# DODEBUG is not set

Index: config-static
===================================================================
RCS file: /var/cvs/busybox/debian/config-static,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- config-static	1 Dec 2002 02:09:19 -0000	1.3
+++ config-static	8 Dec 2002 20:45:47 -0000	1.4
@@ -1,9 +1,9 @@
 #
-# Automatically generated by make menuconfig: don't edit
+# Automatically generated make config: don't edit
 #
 
 #
-# BusyBox general settings
+# General Configuration
 #
 # CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
 CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
[...152 lines suppressed...]
+#
 CONFIG_PIVOT_ROOT=y
 CONFIG_RDATE=y
 CONFIG_SWAPONOFF=y
 CONFIG_MOUNT=y
 CONFIG_NFSMOUNT=y
-# CONFIG_FEATURE_USE_DEVPS_PATCH is not set
 CONFIG_UMOUNT=y
 CONFIG_FEATURE_MOUNT_FORCE=y
+
+#
+# Common options for mount/umount
+#
 CONFIG_FEATURE_MOUNT_LOOP=y
 CONFIG_FEATURE_MTAB_SUPPORT=y
+
+#
+# Debugging Options
+#
+# DODEBUG is not set

Index: config-udeb
===================================================================
RCS file: /var/cvs/busybox/debian/config-udeb,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- config-udeb	1 Dec 2002 02:09:19 -0000	1.4
+++ config-udeb	8 Dec 2002 20:45:47 -0000	1.5
@@ -1,9 +1,9 @@
 #
-# Automatically generated by make menuconfig: don't edit
+# Automatically generated make config: don't edit
 #
 
 #
-# BusyBox general settings
+# General Configuration
 #
 # CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
 CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
[...90 lines suppressed...]
+#
 CONFIG_PIVOT_ROOT=y
 # CONFIG_RDATE is not set
 CONFIG_SWAPONOFF=y
 CONFIG_MOUNT=y
 CONFIG_NFSMOUNT=y
-# CONFIG_FEATURE_USE_DEVPS_PATCH is not set
 CONFIG_UMOUNT=y
 CONFIG_FEATURE_MOUNT_FORCE=y
+
+#
+# Common options for mount/umount
+#
 CONFIG_FEATURE_MOUNT_LOOP=y
 # CONFIG_FEATURE_MTAB_SUPPORT is not set
+
+#
+# Debugging Options
+#
+# DODEBUG is not set

Index: control
===================================================================
RCS file: /var/cvs/busybox/debian/control,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- control	1 Dec 2002 02:09:19 -0000	1.13
+++ control	8 Dec 2002 20:45:47 -0000	1.14
@@ -1,15 +1,9 @@
 Source: busybox-cvs
 Priority: optional
-Maintainer: Erik Andersen <andersee at debian.org>
-Build-Depends: debhelper (>= 2.1.18), dpkg-dev (>= 1.7.0)
-Build-Depends-Indep: sgmltools-lite, w3m
-Standards-Version: 3.2.1.0
-
-Package: busybox-cvs-doc
-Architecture: all
-Section: doc
-Description: Documentation for busybox
- Documentation in various formats on busybox commands and their options.
+Maintainer: Debian Install System Team <debian-boot at lists.debian.org>
+Uploaders: Erik Andersen <andersee at debian.org>, Bastian Blank <waldi at debian.org>, Tollef Fog Heen <tfheen at debian.org>
+Build-Depends: debhelper (>= 2.1.18)
+Standards-Version: 3.5.7.0
 
 Package: busybox-cvs
 Architecture: any
@@ -17,7 +11,7 @@
 Conflicts: busybox-cvs-static, busybox, busybox-static
 Replaces: busybox-cvs-static, busybox, busybox-static
 Section: utils
-Description: Tiny utilities for small and embedded systems. 
+Description: Tiny utilities for small and embedded systems
  BusyBox combines tiny versions of many common UNIX utilities into a single
  small executable. It provides minimalist replacements for the most common
  utilities you would usually find on your desktop system (i.e., ls, cp, mv,
@@ -37,7 +31,7 @@
 Conflicts: busybox-cvs, busybox-static, busybox
 Replaces: busybox-cvs, busybox-static, busybox
 Section: shells
-Description: Standalone rescue shell with tons of builtin utilities. 
+Description: Standalone rescue shell with tons of builtin utilities
  BusyBox combines tiny versions of many common UNIX utilities into a single
  small executable. It provides minimalist replacements for the most common
  utilities you would usually find on your desktop system (i.e., ls, cp, mv,

Index: copyright
===================================================================
RCS file: /var/cvs/busybox/debian/copyright,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- copyright	8 Dec 2001 01:56:06 -0000	1.2
+++ copyright	8 Dec 2002 20:45:47 -0000	1.3
@@ -2,6 +2,23 @@
 Sun, 18 Jun 2000 23:31:02 -0600
 
 It was downloaded from ftp://ftp.busybox.net/busybox
-HomePage is at: http://busybox.net/
 
-Copyright: GPL
+Copyright:
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 dated June, 1991.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+

Index: rules
===================================================================
RCS file: /var/cvs/busybox/debian/rules,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- rules	1 Dec 2002 20:16:01 -0000	1.19
+++ rules	8 Dec 2002 20:45:47 -0000	1.20
@@ -26,7 +26,7 @@
 	$(MAKE) clean
 	cp ./debian/config-static .config
 	$(MAKE) dep
-	$(MAKE) DOSTATIC=true DODEBUG=$(DODEBUG)
+	$(MAKE) DODEBUG=$(DODEBUG)
 	install busybox busybox-static
 
 	$(MAKE) clean
@@ -34,23 +34,19 @@
 	$(MAKE) dep
 	$(MAKE) DODEBUG=$(DODEBUG)
[...70 lines suppressed...]
 #	dh_installinfo -a
 #	dh_undocumented -a
 	dh_installchangelogs Changelog -a -Nbusybox-cvs-udeb
@@ -118,11 +90,13 @@
 	dh_installdeb -a
 #	dh_perl -a
 	dh_shlibdeps -a
-	dh_gencontrol -a
+	dh_gencontrol -a -Nbusybox-cvs-udeb
 	dh_md5sums -a -Nbusybox-cvs-udeb
 	dh_builddeb -a -Nbusybox-cvs-udeb
-	dpkg-distaddfile busybox-cvs-udeb_$(VERSION)_$(ARCH).udeb debian-installer optional
+
+	dh_gencontrol -pbusybox-cvs-udeb -- -fdebian/files~
+	dpkg-distaddfile busybox-cvs-udeb_$(VERSION)_$(ARCH).udeb debian-installer standard
 	dh_builddeb -pbusybox-cvs-udeb --filename=busybox-cvs-udeb_$(VERSION)_$(ARCH).udeb
 
-binary: binary-indep binary-arch
+binary: binary-arch
 .PHONY: build clean binary-indep binary-arch binary install

More information about the busybox-cvs mailing list