On Thu, Jan 29, 2009 at 09:56:09PM +0000, Antonio Radici wrote: > Gonéri Le Bouder wrote: >> Since battery-stats 0.3.3-2 is in testing you shouldn't upload a new >> upstream release in unstable[1]. experimental is still an option. >> You can prepare a 0.3.3-3 package with just the fix for #512701, after >> the upload you'll have to ask the release team to accept this package in >> testing[1]. >> For your current 0.3.4-1 package, the best is to upload it in experimental >> but >> for the moment it still has some issue: >> - It FTBFS is gnuplot-nox is not installed >> - /usr/lib/battery-stats/graph-setup should be in >> /usr/share/battery-stats since it's an arch indep file >> - /usr/share/common-licenses/GPL is now a symlink to GPL-3, you need to >> adjust the debian/copyright >> - since you provide a menu file, can you please also add a .desktop and an >> icon >> > > Hi, > I've fixed all these things, and added the icon into the upstream. Hi Antonio.
Hum, I can't see the .desktop file. Can you please add I and I'll upload the
package.
I attached some changes I did to fix two remaining errors. Please apply the
patch:
E: battery-stats: bad-test-in-menu-item /usr/share/menu/battery-stats:3
E: battery-stats: menu-icon-not-in-xpm-format
/usr/share/battery-stats/pixmaps/battery-stats.png
Best regards,
Gonéri Le Bouder
diff --git a/debian/changelog b/debian/changelog
index f622df9..1aeeefe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,6 @@
battery-stats (0.3.4-1) experimental; urgency=low
+
+ [ Antonio Radici ]
* debianizing new upstream release which includes:
+ all debian patches
+ autotools packaging and optinal ACPI support
@@ -14,6 +16,10 @@ battery-stats (0.3.4-1) experimental; urgency=low
* debian/changelog
+ uploading on experimental
+ [ Gonéri Le Bouder ]
+ * debian menu want xpm icon, adjust the debian/rules to generate it
+ from the .png and add a builddeps on imagemagick
+
-- Antonio Radici <[email protected]> Sun, 25 Jan 2009 12:36:18 +0000
battery-stats (0.3.3-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index a00f692..1644d47 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: battery-stats
Section: admin
Priority: extra
Maintainer: Antonio Radici <[email protected]>
-Build-Depends: debhelper (>= 7), libapm-dev, libacpi-dev [i386 amd64 ia64], cdbs, autotools-dev, gnuplot-nox (>= 4)
+Build-Depends: debhelper (>= 7), libapm-dev, libacpi-dev [i386 amd64 ia64], cdbs, autotools-dev, gnuplot-nox (>= 4), imagemagick
Standards-Version: 3.8.0
Homepage: http://karl.jorgensen.com/battery-stats/
diff --git a/debian/rules b/debian/rules
index fd5774c..c514a7a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,4 +3,12 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
-# Add here any variable or target overrides you need.
+build/battery-stats::
+ mogrify -format xpm -geometry 32x32 pixmaps/battery-stats.png
+
+clean::
+ rm -f ./pixmaps/battery-stats.xpm
+
+install/battery-stats::
+ cp pixmaps/battery-stats.xpm debian/battery-stats/usr/share/battery-stats/pixmaps/battery-stats.xpm
+
signature.asc
Description: Digital signature
