Hi Alexander,

I've just uploaded an NMU to the DELAYED/2 queue as xneur is currently blocking
the libnotify 0.7 transition [1]. The debdiff for the NMU is attached.

Cheers,
Michael


[1] http://release.debian.org/transitions/html/libnotify.html
-- 
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?
diff -Nru xneur-0.12.0/debian/changelog xneur-0.12.0/debian/changelog
--- xneur-0.12.0/debian/changelog       2011-02-04 00:30:16.000000000 +0100
+++ xneur-0.12.0/debian/changelog       2011-08-05 02:02:42.000000000 +0200
@@ -1,3 +1,18 @@
+xneur (0.12.0-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Port to libnotify 0.7. (Closes: #630311)
+    - Add debian/patches/11_libnotify_0.7.patch.
+    - Bump Build-Depends on libnotify-dev to (>= 0.7.0).
+  * Remove unused nbytes variable from get_win_prop(). This fixes a FTBFS due
+    to GCC 4.6 triggering new warnings for unused variables and the package
+    using -Werror. (Closes: #625440)
+    - Add debian/patches/12_remove_unused_vars.patch.
+  * Clear dependency_libs in the libtool .la files.
+    http://wiki.debian.org/ReleaseGoals/LAFileRemoval
+
+ -- Michael Biebl <[email protected]>  Fri, 05 Aug 2011 01:45:05 +0200
+
 xneur (0.12.0-1) unstable; urgency=low
 
   * Imported Upstream version 0.12.0
diff -Nru xneur-0.12.0/debian/control xneur-0.12.0/debian/control
--- xneur-0.12.0/debian/control 2011-02-03 23:19:57.000000000 +0100
+++ xneur-0.12.0/debian/control 2011-08-05 01:47:29.000000000 +0200
@@ -2,7 +2,7 @@
 Section: x11
 Priority: optional
 Maintainer: Alexander GQ Gerasiov <[email protected]>
-Build-Depends: debhelper (>= 6.0.7), cdbs, libx11-dev, libxmu-headers, 
libxt-dev, libpcre3-dev, pkg-config, libenchant-dev, libgstreamer0.10-dev, 
libxosd-dev, libnotify-dev
+Build-Depends: debhelper (>= 6.0.7), cdbs, libx11-dev, libxmu-headers, 
libxt-dev, libpcre3-dev, pkg-config, libenchant-dev, libgstreamer0.10-dev, 
libxosd-dev, libnotify-dev (>= 0.7.0)
 Standards-Version: 3.9.1
 Homepage: http://xneur.ru
 Vcs-Git: git://git.gq.net.ru/xneur.git
diff -Nru xneur-0.12.0/debian/patches/11_libnotify_0.7.patch 
xneur-0.12.0/debian/patches/11_libnotify_0.7.patch
--- xneur-0.12.0/debian/patches/11_libnotify_0.7.patch  1970-01-01 
01:00:00.000000000 +0100
+++ xneur-0.12.0/debian/patches/11_libnotify_0.7.patch  2011-08-05 
01:40:59.000000000 +0200
@@ -0,0 +1,13 @@
+Index: xneur-0.12.0/lib/notify/popup.c
+===================================================================
+--- xneur-0.12.0.orig/lib/notify/popup.c       2011-08-05 01:40:21.148877752 
+0200
++++ xneur-0.12.0/lib/notify/popup.c    2011-08-05 01:40:37.556671478 +0200
+@@ -74,7 +74,7 @@
+               popup_body->content = NULL;
+       }
+       
+-      NotifyNotification *notify = 
notify_notification_new(popup_body->header, popup_body->content, icon, NULL);
++      NotifyNotification *notify = 
notify_notification_new(popup_body->header, popup_body->content, icon);
+ 
+       notify_notification_set_category(notify, type);
+       notify_notification_set_urgency(notify, urgency);
diff -Nru xneur-0.12.0/debian/patches/12_remove_unused_vars.patch 
xneur-0.12.0/debian/patches/12_remove_unused_vars.patch
--- xneur-0.12.0/debian/patches/12_remove_unused_vars.patch     1970-01-01 
01:00:00.000000000 +0100
+++ xneur-0.12.0/debian/patches/12_remove_unused_vars.patch     2011-08-05 
01:44:48.000000000 +0200
@@ -0,0 +1,28 @@
+Index: xneur-0.12.0/lib/main/utils.c
+===================================================================
+--- xneur-0.12.0.orig/lib/main/utils.c 2011-08-05 01:41:24.792077649 +0200
++++ xneur-0.12.0/lib/main/utils.c      2011-08-05 01:44:25.509805718 +0200
+@@ -226,7 +226,6 @@
+       Atom actual_type;
+       int actual_format;
+       unsigned long _nitems;
+-      unsigned long nbytes;
+       unsigned long bytes_after; /* unused */
+       unsigned char *prop;
+       int status;
+@@ -238,15 +237,6 @@
+       if ((status == BadWindow) || (status != Success)) 
+               return NULL;
+ 
+-      if (actual_format == 32)
+-              nbytes = sizeof(long);
+-      else if (actual_format == 16)
+-              nbytes = sizeof(short);
+-      else if (actual_format == 8)
+-              nbytes = 1;
+-      else if (actual_format == 0)
+-              nbytes = 0;
+-
+       *nitems = _nitems;
+       *type = actual_type;
+       *size = actual_format;
diff -Nru xneur-0.12.0/debian/patches/series xneur-0.12.0/debian/patches/series
--- xneur-0.12.0/debian/patches/series  2010-05-22 12:53:39.000000000 +0200
+++ xneur-0.12.0/debian/patches/series  2011-08-05 01:55:11.000000000 +0200
@@ -1 +1,3 @@
 10_shmem_incorrect_usage.patch
+11_libnotify_0.7.patch
+12_remove_unused_vars.patch
diff -Nru xneur-0.12.0/debian/rules xneur-0.12.0/debian/rules
--- xneur-0.12.0/debian/rules   2010-12-23 14:58:14.000000000 +0100
+++ xneur-0.12.0/debian/rules   2011-08-05 02:00:04.000000000 +0200
@@ -22,3 +22,6 @@
 binary-install/xneur::
        sed -f debian/xneurrc.sed -i debian/xneur/etc/xneur/xneurrc
 
+binary-install/libxneur-dev::
+       sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`
+

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to