forcemerge 533966 532580
thanks

Lucas Nussbaum <lu...@lucas-nussbaum.net> (21/06/2009):
> Package: bum
> Version: 2.5.0-1
> Severity: serious
> User: debian...@lists.debian.org
> Usertags: qa-ftbfs-20090620 qa-ftbfs
> Justification: FTBFS on amd64

Here's the diff for my NMU.

Mraw,
KiBi.
diff -u bum-2.5.0/debian/changelog bum-2.5.0/debian/changelog
--- bum-2.5.0/debian/changelog
+++ bum-2.5.0/debian/changelog
@@ -1,3 +1,15 @@
+bum (2.5.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS by adding intltool to Build-Depends-Indep (Closes: #533966).
+  * Set urgency to “medium” as this bug affects testing too.
+  * Fix desktop file as suggested by Alessio Treglia (Closes: #532577):
+    Tweak data/bum.desktop.in.in by removing the obsolete Encoding key; by
+    only keeping the basename for the Icon key; and by adjusting the
+    Categories key.
+
+ -- Cyril Brulebois <k...@debian.org>  Sun, 19 Jul 2009 17:26:15 +0200
+
 bum (2.5.0-1) unstable; urgency=low
 
   * dopped Glade and migrate to Gtk2::Builder
diff -u bum-2.5.0/debian/control bum-2.5.0/debian/control
--- bum-2.5.0/debian/control
+++ bum-2.5.0/debian/control
@@ -2,7 +2,7 @@
 Section: admin
 Priority: optional
 Build-Depends: debhelper (>= 4.0.0) 
-Build-Depends-Indep: libxml-parser-perl, libgtk2-perl (>=1:1.100)
+Build-Depends-Indep: libxml-parser-perl, libgtk2-perl (>=1:1.100), intltool
 Standards-Version: 3.8.0
 Maintainer: Fabio Marzocca <thesalty...@gmail.com>
 
only in patch2:
unchanged:
--- bum-2.5.0.orig/data/bum.desktop.in.in
+++ bum-2.5.0/data/bum.desktop.in.in
@@ -1,10 +1,9 @@
 [Desktop Entry]
-Encoding=UTF-8
 _Name=BootUp-Manager
 _Comment=Graphical runlevel configuration tool
 Exec=su-to-root -X -c bum
-ic...@datadir@/pixmaps/bum.png
+Icon=bum.png
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=Application;System;Settings;
+Categories=System;Settings;

Attachment: signature.asc
Description: Digital signature

Reply via email to