[Debian-NP-Commits] r101 - trunk/packages/debian-np-install/debian

[Otavio Salvador]

Author: otavio
Date: Wed Jun 23 20:23:37 2004
New Revision: 101

Modified:
   trunk/packages/debian-np-install/debian/changelog
   trunk/packages/debian-np-install/debian/control
   trunk/packages/debian-np-install/debian/rules
Log:
* Updated to use the new udeb debhelper support.


Modified: trunk/packages/debian-np-install/debian/changelog
==============================================================================
--- trunk/packages/debian-np-install/debian/changelog	(original)
+++ trunk/packages/debian-np-install/debian/changelog	Wed Jun 23 20:23:37 2004
@@ -5,6 +5,7 @@
     - Updated to use the new base-installer hook.
     - Changed to use the configured hostname instead to force it to
     'debian-np'.
+    - Updated to use the new udeb debhelper support.
   * guillaume pernot
     - Inital NP release, based on debian-edu-install 0.629
 

Modified: trunk/packages/debian-np-install/debian/control
==============================================================================
--- trunk/packages/debian-np-install/debian/control	(original)
+++ trunk/packages/debian-np-install/debian/control	Wed Jun 23 20:23:37 2004
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian NP Team <debian-np-devel@lists.alioth.debian.org>
 Uploaders: Marco Presi (Zufus) <zufus@debian.org>, Enrico Zini <enrico@debian.org>, Mako Hill <mako@debian.org>, guillaume pernot <gpernot@praksys.org>, Otavio Salvador <otavio@debian.org>
-Build-Depends-Indep: debhelper (>= 4.1.13), po-debconf (>= 0.5.0), dpkg-dev (>= 1.9), ash
+Build-Depends-Indep: debhelper (>= 4.2), po-debconf (>= 0.5.0), dpkg-dev (>= 1.9), ash
 Standards-Version: 3.6.1
 
 Package: debian-np-install
@@ -21,6 +21,7 @@
 Architecture: all
 Section: debian-installer
 Depends: debconf, languagechooser, kbd-chooser
+XC-Package-Type: udeb
 XB-Installer-Menu-Item: 17
 Description: Choose Debian-NP profile
  This package provides a profile chooser for the Debian installer.
@@ -29,6 +30,7 @@
 Architecture: all
 Section: debian-installer
 Depends: debian-np-profile-udeb, autopartkit, bootable-system, prebaseconfig, debconf, base-installer (>> 0.086)
+XC-Package-Type: udeb
 XB-Installer-Menu-Item: 10
 Description: Execute Debian-NP debian-installer profile
  Force the installer to choose the menu items we want to use in

Modified: trunk/packages/debian-np-install/debian/rules
==============================================================================
--- trunk/packages/debian-np-install/debian/rules	(original)
+++ trunk/packages/debian-np-install/debian/rules	Wed Jun 23 20:23:37 2004
@@ -22,9 +22,6 @@
 PROFILEUDEB=debian-np-profile-udeb
 VERSION=$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
 ARCH=all
-INSTALLUDEBFILENAME=$(INSTALLUDEB)_$(VERSION)_$(ARCH).udeb
-REPORTBUGUDEBFILENAME=$(REPORTBUGUDEB)_$(VERSION)_$(ARCH).udeb
-PROFILEUDEBFILENAME=$(PROFILEUDEB)_$(VERSION)_$(ARCH).udeb
 
 build:
 # Nothing to do.
@@ -70,8 +67,8 @@
 	dh_compress -p$@
 	dh_fixperms -p$@
 	dh_installdeb -p$@
-	dh_gencontrol -p$@ -- -n$(INSTALLUDEBFILENAME)
-	dh_builddeb -p$@ --filename=$(INSTALLUDEBFILENAME)
+	dh_gencontrol -p$@
+	dh_builddeb -p$@
 
 .PHONY: debian-np-profile-udeb
 debian-np-profile-udeb: install-debian-np-profile-udeb
@@ -84,9 +81,9 @@
 	dh_installdeb -p$@
 	# Make sure the autopartkit.d templates are normal files.  udpkg do
 	# not understand conffiles at the moment.
-	rm debian/$(PROFILEUDEB)/DEBIAN/conffiles
-	dh_gencontrol -p$@ -- -n$(PROFILEUDEBFILENAME)
-	dh_builddeb -p$@ --filename=$(PROFILEUDEBFILENAME)
+	#rm debian/$(PROFILEUDEB)/DEBIAN/conffiles
+	dh_gencontrol -p$@
+	dh_builddeb -p$@
 
 debian-np-install: install-debian-np-install
 	dh_testdir -p$@