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.0 +0200
+++ bogl-0.1.18/debian/changelog 2010-01-10 11:43:59.0 +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 f...@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.0 +0200
+++ bogl-0.1.18/debian/control 2010-01-10 11:33:50.0 +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.0 +0200
+++ bogl-0.1.18/debian/rules 2010-01-10 11:23:59.0 +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
Bug#539775: bogl has executable stack
NMU'ed to 3-day delayed together with fix for 564488; patch for this BR
(based on Fedora's patch) attached.
diff -Nru bogl-0.1.18/bowl.c bogl-0.1.18/bowl.c
--- bogl-0.1.18/bowl.c 2001-12-01 18:04:42.0 +0100
+++ bogl-0.1.18/bowl.c 2010-01-10 11:27:10.0 +0100
@@ -324,6 +324,14 @@
}
}
+static struct widget *callback_widget;
+
+static void
+callback (int percent)
+{
+ bowl_set_scale (callback_widget, percent);
+}
+
/* Start up BOWL. */
void
bowl_init (void)
@@ -342,13 +350,6 @@
if (!inited)
{
- struct widget *w;
-
- void callback (int percent)
- {
- bowl_set_scale (w, percent);
- }
-
bowl_init_palette(pixmap_tux75);
bowl_flush ();
@@ -356,7 +357,7 @@
{
bowl_title (_(Please wait));
bowl_new_text (_(Detecting mice...));
- w = bowl_new_scale (100);
+ callback_widget = bowl_new_scale (100);
bowl_layout ();
boml_init (callback);
}
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.0 +0200
+++ bogl-0.1.18/debian/changelog 2010-01-10 11:43:59.0 +0100
@@ -5,6 +5,7 @@
Ensures correct versioned dependency on libc. Closes: #564488.
* Drop the 'Provides: editor' for bogl-bterm-udeb. It's unused and most
likely incorrect.
+ * Avoid executable stack. Patch taken from Fedora. Closes: #539775.
-- Frans Pop f...@debian.org Sun, 10 Jan 2010 11:33:52 +0100
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.0 +0200
+++ bogl-0.1.18/debian/changelog 2010-01-09 20:01:26.0 +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 f...@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.0 +0200
+++ bogl-0.1.18/debian/control 2010-01-09 19:58:05.0 +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.0 +0200
+++ bogl-0.1.18/debian/rules 2010-01-09 19:59:43.0 +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
Bug#560315: htdig: Use db_settitle instead of deprecated db_title
Package: htdig Version: 1:3.2.0b6-9 Severity: minor Tags: patch The debconf command db_title is deprecated and causes warnings when used. Please apply the attached (untested but trivial) patch to use the command db_settitle instead. Note that I've not marked the new title template as translatable. diff -ur htdig-3.2.0b6.orig/debian/htdig.config htdig-3.2.0b6/debian/htdig.config --- htdig-3.2.0b6.orig/debian/htdig.config 2009-12-10 13:10:21.0 +0100 +++ htdig-3.2.0b6/debian/htdig.config 2009-12-10 13:31:00.0 +0100 @@ -4,7 +4,7 @@ . /usr/share/debconf/confmodule -db_title ht://Dig +db_settitle htdig/title if [ ! -d /etc/default ]; then mkdir /etc/default diff -ur htdig-3.2.0b6.orig/debian/templates htdig-3.2.0b6/debian/templates --- htdig-3.2.0b6.orig/debian/templates 2009-12-10 13:10:21.0 +0100 +++ htdig-3.2.0b6/debian/templates 2009-12-10 13:30:33.0 +0100 @@ -7,6 +7,10 @@ # Even minor modifications require translation updates and such # changes should be coordinated with translators and reviewers. +Template: htdig/title +Type: title +Description: ht://Dig + Template: htdig/generate-databases Type: boolean Default: true
Bug#560315: htdig: Use db_settitle instead of deprecated db_title
Correction. During a discussion with Joey Hess [1] it's been decided to undeprecate the TITLE command. Note that it is likely a Lintian warning will be added to warn that dialog titles should normally be translatable. So you may still want to apply the patch to avoid that warning. Feel free to close the BR if you prefer to leave things as they are. Cheers, FJP [1] http://bugs.debian.org/560323 -- To UNSUBSCRIBE, email to debian-qa-packages-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#545428: PTS: bugs count is incorrect English
Package: qa.debian.org Severity: minor The caption bugs count on PTS pages is incorrect English. It is to count bugs and a count of bugs, but a bug count. Please replace it with bug count. Cheers, FJP -- To UNSUBSCRIBE, email to debian-qa-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Re: Non-related 'Recommends' dependencies - bug or not?
(d-qa CCed because of the status of esound; please CC me on replies) On Friday 13 June 2008, you wrote: There are plenty of other examples. Here's a few of my favorites (look up what packages depend on these libs yourself): - libadns1 - libadns1-bin (test tools/utils) - libdjvulibre21 - djvulibre-desktop (WTF?) - libesd0 - esound-clients - libgpod3 - libgpod-common (I don't have an iPod, but do want amarok) - libpcsclite1 - pcscd (a daemon even) - libsane - sane-utils (OK, I do have a scanner; but how many don't?) No, I did not file bugs for these yet, but now that I've assembled the list I probably will. Bugs filed now for these (or info added to existing bugs). BTW, it looks as esound is in desperate need of a new maintainer. Last upload in 2006, new upstream versions available and loads of open (some trivial packaging) bugs. Also, the package has had uploads of new upstream versions to Ubuntu without getting similar uploads in Debian, but even there not by its Debian maintainer who AFAIK is an Canonical employee. Go figure... Cheers, FJP signature.asc Description: This is a digitally signed message part.
Re: Rebuilding all etch packages inside etch, round 2
(Dropping d-release; please CC d-boot as I'm not subscribed to d-qa.) On Wednesday 18 October 2006 11:16, Lucas Nussbaum wrote: I built packages from main which where supposed to build on AMD64 according to their Architecture: field in a etch AMD64 chroot. Using sbuild improved the situation a lot compared to my first attempt[1]. However, 548 packages still fail to build. Sorted using dd-list: http://ox.blop.info/bazaar/buildlogs/20061017/000FailedBuilds-ddlist.txt All build logs from failed builds: http://ox.blop.info/bazaar/buildlogs/20061017/ Thanks for your efforts on this. I've taken a look at the failures for the debian-boot team (Debian Installer): choose-mirror localechooser Both fail with the following error: The following packages have unmet dependencies: python-xml: Depends: python-central (= 0.4.15) but it is not going to be installed I expect this is either a transient error or a bug in the python packaging. I would probably be good if someone could check for this globally. installation-guide BR already reassigned to w3m (#393641; reduced to normal); the segfault has possibly been resolved for the installation guide by setting an alternative PATH in the build script. As this is an Arch:all package, I'm not particularly bothered by the failure anyway. linux-kernel-di-amd64-2.6 linux-modules-di-amd64-2.6 Both of these are not really meant to be built on buildds... The log of the first does not really give any indication of what goes wrong. The second is a relatively new package that currently depends on an old kernel for transition purposes. This should be fixed with the next migration of the package. Anyway, I'm inclined to ignore both of these. Cheers, FJP pgp9khj9FDhIQ.pgp Description: PGP signature
Re: Bug#381463: www.debian.org: packages in need of help - also bugs tagged help
reassign 381463 qa.debian.org thanks On Friday 04 August 2006 18:39, Bart Martens wrote: I would add a link to http://bugs.debian.org/cgi-bin/pkgreport.cgi?tag=help on http://www.debian.org/devel/wnpp/ near packages in need of help which currently points to http://www.debian.org/devel/wnpp/help_requested . I don't think that is a good idea. WNPP is a very specific page. Packages in need of help is a section where the maintainer ask for help with the package _as a whole_. This is something completely different from requesting help with a specific bug. IMO the wnpp page should remain package oriented and restricted to real wnpp bugs. I think your suggestion to add that link somewhere is good. IMO it would be more appropriate for the qa.debian.org page, so reassigning your request there. Cheers, FJP pgpnXCG6UYRqV.pgp Description: PGP signature
