Import Debian changes 1.9-3ubuntu1

vlan (1.9-3ubuntu1) lucid; urgency=low

  * debian/control, debian/vlan-udeb.install: Create vlan-udeb package to
    be able to install the vconfig command line in the installer. 
    (LP: #530468)

vlan (1.9-3build1) karmic; urgency=low

  * No-change rebuild to gain FORTIFY defaults.

7 files changed, 36 insertions, 7 deletions

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 7543c93..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-debian/files
-debian/vlan.substvars
-debian/vlan
-vconfig
-vconfig.h
-vconfig.o
diff --git a/debian/changelog b/debian/changelog
index 8927805..7429f29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+vlan (1.9-3ubuntu1) lucid; urgency=low
+
+  * debian/control, debian/vlan-udeb.install: Create vlan-udeb package to
+    be able to install the vconfig command line in the installer. 
+    (LP: #530468)
+
+ -- Mathias Gug <mathiaz@ubuntu.com>  Mon, 01 Mar 2010 18:20:18 -0500
+
+vlan (1.9-3build1) karmic; urgency=low
+
+  * No-change rebuild to gain FORTIFY defaults.
+
+ -- Kees Cook <kees@ubuntu.com>  Mon, 11 May 2009 12:07:56 -0700
+
 vlan (1.9-3) unstable; urgency=low
 
   * Add XS-Vcs-Git and XS-Vcs-Browser fields to control.
diff --git a/debian/control b/debian/control
index 41fcbce..470636b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: vlan
 Section: misc
 Priority: extra
-Maintainer: Ard van Breemen <ard@kwaak.net>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Ard van Breemen <ard@kwaak.net>
 Uploaders: Loic Minier <lool@dooz.org>
 Build-Depends: debhelper (>= 5)
 Standards-Version: 3.7.2
@@ -22,3 +23,22 @@ Description: user mode programs to enable VLANs on your ethernet devices
  You need a VLAN Linux kernel for this.  Linux kernel versions >= 2.4.14
  have VLAN support.
 
+Package: vlan-udeb
+XC-Package-Type: udeb
+Section: debian-installer
+Priority: optional
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+XB-Installer-Menu-Item: 99999
+Description: user mode programs to enable VLANs on your ethernet devices
+ This package contains the user mode programs you need to add and remove
+ VLAN devices from your ethernet devices.
+ .
+ A typical application for a VLAN enabled box is a single wire firewall,
+ router or load balancer.
+ .
+ You need a VLAN Linux kernel for this.  Linux kernel versions >= 2.4.14
+ have VLAN support.
+ .
+ This package provides the vconfig client for use in debian-installer.
+
diff --git a/debian/vlan-udeb.install b/debian/vlan-udeb.install
new file mode 100644
index 0000000..12642f7
--- /dev/null
+++ b/debian/vlan-udeb.install
@@ -0,0 +1 @@
+vconfig         sbin
diff --git a/vconfig b/vconfig
new file mode 100755
index 0000000..8cfcbcd
--- /dev/null
+++ b/vconfig
diff --git a/vconfig.h b/vconfig.h
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/vconfig.h
diff --git a/vconfig.o b/vconfig.o
new file mode 100644
index 0000000..8e8da0e
--- /dev/null
+++ b/vconfig.o