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

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



tag 564488 pending
tag 539775 pending
thanks

NMU'ed to 3-day delayed. Final patch attached.
Upload also includes patch for #539775.

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-10 11:43:59.000000000 +0100
@@ -1,3 +1,13 @@
+bogl (0.1.18-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Improve packaging of the udeb by using current debhelper functionality.
+    Ensures correct versioned dependency on libc. Closes: #564488.
+  * Drop the 'Provides: editor' for bogl-bterm-udeb. It's unused and most
+    likely incorrect.
+
+ -- Frans Pop <fjp@debian.org>  Sun, 10 Jan 2010 11:33:52 +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-10 11:33:50.000000000 +0100
@@ -40,11 +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
-Provides: editor
+Depends: ${shlibs:Depends}
 Description: Ben's Own Graphics Library - graphical terminal
  Ben's Own Graphics Library is a small framebuffer library,
  including basic widgets, support for text in multiple
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-10 11:23:59.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: