tags 556332 + patch
tags 556332 + pending
tags 651763 + pending
thanks

Dear maintainer,

I've prepared an NMU for rutilt (versioned as 0.16-2.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
 .''`.  Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
 : :' : Debian GNU/Linux user, admin, and developer  -  http://www.debian.org/
 `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
   `-   NP: Paco de Lucia: Rio De La Miel [Buleria]
diff -u rutilt-0.16/debian/changelog rutilt-0.16/debian/changelog
--- rutilt-0.16/debian/changelog
+++ rutilt-0.16/debian/changelog
@@ -1,3 +1,18 @@
+rutilt (0.16-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add 2 patches from Ubuntu:
+
+  [ Colin Watson ]
+  * debian/patches/003_remove_mutable: Remove 'mutable' specifier from
+    reference, which is non-standard-conformant (LP: #832763, Closes: #651763).
+
+  [ Mahyuddin Susanto ]
+  * debian/patches/002_fix_ftbfs_binutils-gold: Fix FTBFS binutils-gold
+    by adding X11 library in Makefile. (LP: #706785, Closes: #556332)
+
+ -- gregor herrmann <gre...@debian.org>  Mon, 09 Jan 2012 18:13:59 +0100
+
 rutilt (0.16-2) unstable; urgency=low
 
   * Changed build-dependency on debhelper to minimum version of 5.0.51,
diff -u rutilt-0.16/debian/patches/series rutilt-0.16/debian/patches/series
--- rutilt-0.16/debian/patches/series
+++ rutilt-0.16/debian/patches/series
@@ -4,0 +5,2 @@
+003_remove_mutable
+002_fix_ftbfs_binutils-gold
only in patch2:
unchanged:
--- rutilt-0.16.orig/debian/patches/002_fix_ftbfs_binutils-gold
+++ rutilt-0.16/debian/patches/002_fix_ftbfs_binutils-gold
@@ -0,0 +1,17 @@
+Description: Fix FTBFS binutils-gold with ld --no-add-needed
+ by adding X11 library to Makefile
+Author: Mahyuddin Susanto <udi...@ubuntu.com>
+Bug-Ubuntu: https://launchpad.net/bugs/706785
+Bug-Debian: http://bugs.debian.org/556332
+
+--- rutilt-0.18/Makefile	2007-11-27 17:46:46.000000000 +0700
++++ rutilt-0.18.ubuntu/Makefile	2011-01-24 12:21:43.194674551 +0700
+@@ -131,7 +131,7 @@ default_target : $(BUILD)
+ #
+ # Linking :
+ $(RUTILT_NAME) : $(OBJECTS)
+-	$(LINKER) $(OBJECTS) `pkg-config gtk+-2.0 --libs`
++	$(LINKER) $(OBJECTS) -L/usr/X11R6/lib -lX11 `pkg-config gtk+-2.0 --libs`
+ #
+ $(HELPER_NAME) : $(HELPER_OBJECTS)
+ 	$(LINKER) $(HELPER_OBJECTS) -lcrypt
only in patch2:
unchanged:
--- rutilt-0.16.orig/debian/patches/003_remove_mutable
+++ rutilt-0.16/debian/patches/003_remove_mutable
@@ -0,0 +1,23 @@
+Description: Remove unnecessary mutable specifier, disallowed on reference
+ As far as I can see, this is unnecessary since no instances of this class
+ are ever declared const, and using 'mutable' on a reference is
+ non-standard-conformant and disallowed by default by G++ 4.6.
+Author: Colin Watson <cjwat...@ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/832763
+Bug-Debian: http://bugs.debian.org/651763
+Forwarded: no
+Last-Update: 2011-09-10
+
+Index: b/include/WE17Driver.h
+===================================================================
+--- a/include/WE17Driver.h
++++ b/include/WE17Driver.h
+@@ -104,7 +104,7 @@
+                                                 throw (nsErrors::CSystemExc);
+         CFreq GetMatchingFreq (unsigned, double = 0) const throw();
+ 
+-        mutable ::iwreq_data& m_Data;
++        ::iwreq_data& m_Data;
+ 
+ 
+       private :

Attachment: signature.asc
Description: Digital signature

Reply via email to