[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#564488: bogl: improve packaging for the bogl-bterm-udeb



Package: bogl
Version: 0.1.18-3
Severity: important
Tags: patch, d-i

Please apply the attached patch which updates the packaging to use current 
functionality provided by packaging tools for building udebs.

This simplifies debian/rules and, more importantly, ensures a correct 
versioned dependency on libc6 for the udeb.

I've checked the result with debdiff, and that was correct.

As the package is maintained by QA I will probably NMU the package in a few 
days, unless there is a response from a QA team member.

diff -Nru bogl-0.1.18/debian/changelog bogl-0.1.18/debian/changelog
--- bogl-0.1.18/debian/changelog	2009-04-23 18:02:03.000000000 +0200
+++ bogl-0.1.18/debian/changelog	2010-01-09 20:01:26.000000000 +0100
@@ -1,3 +1,10 @@
+bogl (0.1.18-3.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Improve packaging of the udeb by using current debhelper functionality.
+
+ -- Frans Pop <fjp@debian.org>  Sat, 09 Jan 2010 19:59:45 +0100
+
 bogl (0.1.18-3) unstable; urgency=low
 
   * QA upload.
diff -Nru bogl-0.1.18/debian/control bogl-0.1.18/debian/control
--- bogl-0.1.18/debian/control	2009-04-23 17:58:40.000000000 +0200
+++ bogl-0.1.18/debian/control	2010-01-09 19:58:05.000000000 +0100
@@ -40,10 +40,11 @@
  This package contains bterm, a UTF-enabled framebuffer terminal.
 
 Package: bogl-bterm-udeb
+XC-Package-Type: udeb
 Section: debian-installer
 Architecture: any
 Priority: extra
-Depends: libc-udeb
+Depends: ${shlibs:Depends}
 Provides: editor
 Description: Ben's Own Graphics Library - graphical terminal
  Ben's Own Graphics Library is a small framebuffer library,
diff -Nru bogl-0.1.18/debian/rules bogl-0.1.18/debian/rules
--- bogl-0.1.18/debian/rules	2009-04-23 17:57:01.000000000 +0200
+++ bogl-0.1.18/debian/rules	2010-01-09 19:59:43.000000000 +0100
@@ -37,9 +37,6 @@
 binary-indep:
 	@echo No architecture-independent packages.
 
-VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
-ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-
 # Build architecture-dependent files here.
 binary-arch: build
 	dh_testdir
@@ -54,11 +51,11 @@
 	install -d debian/bogl-bterm-udeb/usr/share/terminfo/b
 	install -m 644 debian/bogl-bterm/usr/share/terminfo/b/bterm debian/bogl-bterm-udeb/usr/share/terminfo/b/bterm
 
-	dh_installdocs -Nbogl-bterm-udeb
-	dh_installexamples -Nbogl-bterm-udeb
-	dh_installman -Nbogl-bterm-udeb
-	dh_installinfo -Nbogl-bterm-udeb
-	dh_installchangelogs -Nbogl-bterm-udeb
+	dh_installdocs
+	dh_installexamples
+	dh_installman
+	dh_installinfo
+	dh_installchangelogs
 	dh_link
 	dh_strip
 	dh_compress
@@ -68,12 +65,9 @@
 	dh_installdeb
 	dh_shlibdeps
 
-	dh_gencontrol -Nbogl-bterm-udeb
-	dh_gencontrol -pbogl-bterm-udeb -- -fdebian/files~
-	dpkg-distaddfile bogl-bterm-udeb_$(VERSION)_$(ARCH).udeb debian-installer extra
-	dh_md5sums -Nbogl-bterm-udeb
-	dh_builddeb -Nbogl-bterm-udeb
-	dh_builddeb -pbogl-bterm-udeb --filename=bogl-bterm-udeb_$(VERSION)_$(ARCH).udeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary configure

Reply to: