Package: qtdmm
Version: 0.8.12-2.1
I working on Ubuntu and while doing the merge from Debian I discovered several
mistakes.
I'm attaching a debdiff (including a patch and other fixes). So we can sync
next time from Debian.
Furthermore it would be nice if you can include a debian/watch file. Thanks
Kind regards,
Stefan Ebner
diff -u qtdmm-0.8.12/debian/control qtdmm-0.8.12/debian/control
--- qtdmm-0.8.12/debian/control
+++ qtdmm-0.8.12/debian/control
@@ -12,7 +12,7 @@
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: GUI for digital multimeter
A digital multimeter (DMM) attached to the serial port
- is presented under a QT surface. The tool plots values
+ is presented under a Qt surface. The tool plots values
over time, has a simple scheduler for delayed starts
and logging after a threshold was reached. It supports
spawning external applications, too.
diff -u qtdmm-0.8.12/debian/changelog qtdmm-0.8.12/debian/changelog
--- qtdmm-0.8.12/debian/changelog
+++ qtdmm-0.8.12/debian/changelog
@@ -1,3 +1,14 @@
+qtdmm (0.8.12-2.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Change QT to Qt in the long description in debian/control.
+ * Install desktop file and icon in correct path.
+ * Added patch ubuntu_901_fix_desktop_file.patch to fix the .desktop file.
+ * fixing a lintian warning about a bad use of distclean by using
+ [ ! -f Makefile ] || $(MAKE) instead of -$(MAKE) distclean.
+
+ -- Stefan Ebner <[EMAIL PROTECTED]> Thu, 20 Mar 2008 15:33:38 +0100
+
qtdmm (0.8.12-2.1) unstable; urgency=low
* Non-maintainer upload.
diff -u qtdmm-0.8.12/debian/rules qtdmm-0.8.12/debian/rules
--- qtdmm-0.8.12/debian/rules
+++ qtdmm-0.8.12/debian/rules
@@ -30,7 +30,7 @@
dh_testroot
rm -f build-stamp
# Add here commands to clean up after the build process.
- -$(MAKE) distclean
+ [ ! -f Makefile ] || $(MAKE) distclean
dh_clean Makefile
install: build
@@ -56,6 +56,8 @@
dh_installexamples
dh_installmenu
dh_installman
+ dh_install qtdmm.png usr/share/pixmaps
+ dh_install QtDMM.desktop usr/share/applications
dh_link
dh_strip
dh_compress
diff -u qtdmm-0.8.12/debian/patches/series qtdmm-0.8.12/debian/patches/series
--- qtdmm-0.8.12/debian/patches/series
+++ qtdmm-0.8.12/debian/patches/series
@@ -1,0 +2 @@
+02_fix_desktop_file.diff
only in patch2:
unchanged:
--- qtdmm-0.8.12.orig/debian/patches/02_fix_desktop_file.diff
+++ qtdmm-0.8.12/debian/patches/02_fix_desktop_file.diff
@@ -0,0 +1,18 @@
+Index: qtdmm-0.8.12/QtDMM.desktop
+===================================================================
+--- qtdmm-0.8.12.orig/QtDMM.desktop 2008-04-02 16:45:23.000000000 +0200
++++ qtdmm-0.8.12/QtDMM.desktop 2008-04-02 16:46:25.000000000 +0200
+@@ -1,8 +1,10 @@
+ [Desktop Entry]
+-Encoding=UTF-8
++Version=1.0
+ Name=QtDMM
++GenericName=Digital Multimeter GUI
++Comment=Use a digital multimeter
+ Exec=qtdmm
+-Icon=/usr/share/pixmaps/qtdmm.png
++Icon=qtdmm
+ Terminal=false
+ Type=Application
+-Categories=GNOME;KDE;Application;Utility;
++Categories=Utility;
