* Change debhelper compatibility level to 5.

* Update Standards version to 3.7.2.
* Create tasksel-data so will be easier to CDDs to override the Debian
  default without need to use diversion or other ugly hacks.

Makefile

@@ -30,32 +30,45 @@ updatetaskspo:
 	$(MAKE) -C $(DESCPO) update LANGS="$(LANGS_DESC)"
 
 install:
-	install -d $(DESTDIR)/usr/bin $(DESTDIR)$(TASKDIR) \
+	install -d $(DESTDIR)/usr/bin \
 		$(DESTDIR)/usr/lib/tasksel/tests \
-		$(DESTDIR)/usr/lib/tasksel/info \
 		$(DESTDIR)/usr/lib/tasksel/packages \
 		$(DESTDIR)/usr/share/man/man8
 	install -m 755 tasksel.pl $(DESTDIR)/usr/bin/tasksel
 	install -m 755 tasksel-debconf $(DESTDIR)/usr/lib/tasksel/
-	install -m 0644 $(TASKDESC) $(DESTDIR)$(TASKDIR)
+	install -m 755 tests/new-install $(DESTDIR)/usr/lib/tasksel/tests/
+	install -m 755 tests/debconf $(DESTDIR)/usr/lib/tasksel/tests/
+	install -m 755 tests/lang $(DESTDIR)/usr/lib/tasksel/tests/
+	install -m 755 packages/list $(DESTDIR)/usr/lib/tasksel/packages/
 	pod2man --section=8 --center "Debian specific manpage" --release $(VERSION) tasksel.pod | gzip -9c > $(DESTDIR)/usr/share/man/man8/tasksel.8.gz
 	for lang in $(LANGS); do \
 		[ ! -d $(LOCALEDIR)/$$lang/LC_MESSAGES/ ] && mkdir -p $(LOCALEDIR)/$$lang/LC_MESSAGES/; \
 		install -m 644 po/$$lang.mo $(LOCALEDIR)/$$lang/LC_MESSAGES/tasksel.mo; \
 	done
-	for lang in $(LANGS_DESC); do \
-		[ ! -d $(LOCALEDIR)/$$lang/LC_MESSAGES/ ] && mkdir -p $(LOCALEDIR)/$$lang/LC_MESSAGES/; \
-		install -m 644 tasks/po/$$lang.mo $(LOCALEDIR)/$$lang/LC_MESSAGES/$(DOMAIN).mo; \
-	done
+
+install-data:
+	install -d $(DESTDIR)$(TASKDIR) \
+		$(DESTDIR)/usr/lib/tasksel/tests \
+		$(DESTDIR)/usr/lib/tasksel/info \
+		$(DESTDIR)/usr/lib/tasksel/packages
+	install -m 0644 $(TASKDESC) $(DESTDIR)$(TASKDIR)
 	for test in tests/*; do \
+		[ "$$test" = "tests/new-install" ] && continue; \
+		[ "$$test" = "tests/debconf" ] && continue; \
+		[ "$$test" = "tests/lang" ] && continue; \
 		install -m 755 $$test $(DESTDIR)/usr/lib/tasksel/tests/; \
 	done
 	for script in info/*; do \
 		install -m 755 $$script $(DESTDIR)/usr/lib/tasksel/info/; \
 	done
 	for package in packages/*; do \
+		[ "$$package" = "packages/list" ] && continue; \
 		install -m 755 $$package $(DESTDIR)/usr/lib/tasksel/packages/; \
 	done
+	for lang in $(LANGS_DESC); do \
+		[ ! -d $(LOCALEDIR)/$$lang/LC_MESSAGES/ ] && mkdir -p $(LOCALEDIR)/$$lang/LC_MESSAGES/; \
+		install -m 644 tasks/po/$$lang.mo $(LOCALEDIR)/$$lang/LC_MESSAGES/$(DOMAIN).mo; \
+	done
 
 clean:
 	rm -f $(TASKDESC) *~

debian/changelog

@@ -1,3 +1,12 @@
+tasksel (2.45) UNRELEASED; urgency=low
+
+  * Change debhelper compatibility level to 5.
+  * Update Standards version to 3.7.2.
+  * Create tasksel-data so will be easier to CDDs to override the Debian
+    default without need to use diversion or other ugly hacks.
+
+ -- Otavio Salvador <otavio@debian.org>  Fri, 12 May 2006 17:19:13 -0300
+
 tasksel (2.44) unstable; urgency=low
 
   * [ Translations of tasks ]

debian/compat

@@ -1 +1 @@
-4
+5

debian/control

@@ -3,15 +3,24 @@ Section: admin
 Priority: important
 Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
 Uploaders: Randolph Chung <tausq@debian.org>, Joey Hess <joeyh@debian.org>
-Standards-Version: 3.6.2
-Build-Depends: po-debconf, debhelper (>= 4), gettext, dpkg-dev (>= 1.9.0)
+Standards-Version: 3.7.2
+Build-Depends: po-debconf, debhelper (>= 5), gettext, dpkg-dev (>= 1.9.0)
 
 Package: tasksel
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, liblocale-gettext-perl, aptitude (>= 0.2.15-1), laptop-detect
+Depends: ${shlibs:Depends}, ${misc:Depends}, liblocale-gettext-perl, aptitude (>= 0.2.15-1), laptop-detect, tasksel-data
 Conflicts: debconf (<< 1.4.27), base-config (<< 2.32)
 Description: Tool for selecting tasks for installation on Debian system
  This package provides 'tasksel', a simple interface for users who
  want to pick general tasks for installation on their Debian GNU/Linux
  system. This program is used during the installation process, but
  users can also use tasksel at any point.
+
+Package: tasksel-data
+Architecture: all
+Depends: tasksel (= ${source:Version})
+Conflicts: tasksel-data
+Description: Official tasks used for installation on Debian systems
+ This package provides the tasks for 'tasksel' to use to provide a
+ simple interface for users who want to pick general tasks for
+ installation on their Debian GNU/Linux system.

debian/rules

@@ -26,6 +26,7 @@ install-stamp: build-stamp
 	dh_clean -k
 	dh_installdirs
 	$(MAKE) install DESTDIR=`pwd`/debian/tasksel
+	$(MAKE) install-data DESTDIR=`pwd`/debian/tasksel-data
 	touch install-stamp
 
 binary-arch: build install