r53 - in unstable/rutilt/debian: . patches

[benh at alioth.debian.org]

Author: benh
Date: 2007-10-08 21:13:10 +0000 (Mon, 08 Oct 2007)
New Revision: 53

Added:
   unstable/rutilt/debian/patches/016_fix_about_comment.diff
Modified:
   unstable/rutilt/debian/changelog
   unstable/rutilt/debian/control
   unstable/rutilt/debian/patches/010_fix_cflags.diff
   unstable/rutilt/debian/patches/series
   unstable/rutilt/debian/rules
Log:
Merged some of Cesare's fixes from 0.15-0ubuntu4.


Modified: unstable/rutilt/debian/changelog
===================================================================
--- unstable/rutilt/debian/changelog	2007-10-08 01:00:42 UTC (rev 52)
+++ unstable/rutilt/debian/changelog	2007-10-08 21:13:10 UTC (rev 53)
@@ -1,3 +1,12 @@
+rutilt (0.15-2) unstable; urgency=low
+
+  [Cesare Tirabassi]
+  * Add patch 016_fix_about_comment.diff:
+    - Fix about dialog comment being cut
+  * Add the removal of unnecessary files in the clean target
+
+ --
+
 rutilt (0.15-1) unstable; urgency=low
 
   [Cesare Tirabassi]

Modified: unstable/rutilt/debian/control
===================================================================
--- unstable/rutilt/debian/control	2007-10-08 01:00:42 UTC (rev 52)
+++ unstable/rutilt/debian/control	2007-10-08 21:13:10 UTC (rev 53)
@@ -2,7 +2,7 @@
 Section: net
 Priority: extra
 Maintainer: Debian Ralink packages maintainers <pkg-ralink-maintainers at lists.alioth.debian.org>
-Uploaders: Aurelien Jarno <aurel32 at debian.org>, Ben Hutchings <ben at decadent.org.uk>, Romain Beauxis <toots at rastageeks.org>, Cesare Tirabassi <cesare.tirabassi at gmail.com>
+Uploaders: Aurelien Jarno <aurel32 at debian.org>, Ben Hutchings <ben at decadent.org.uk>, Romain Beauxis <toots at rastageeks.org>, Cesare Tirabassi <norsetto at ubuntu.com>
 Build-Depends: debhelper (>= 5), pkg-config, libgtk2.0-dev (>= 2.6), linux-libc-dev (>= 2.6.22), quilt
 Standards-Version: 3.7.2
 Homepage: http://cbbk.free.fr/bonrom/

Modified: unstable/rutilt/debian/patches/010_fix_cflags.diff
===================================================================
--- unstable/rutilt/debian/patches/010_fix_cflags.diff	2007-10-08 01:00:42 UTC (rev 52)
+++ unstable/rutilt/debian/patches/010_fix_cflags.diff	2007-10-08 21:13:10 UTC (rev 53)
@@ -1,23 +1,13 @@
 --- rutilt.orig/configure.sh
 +++ rutilt/configure.sh
-@@ -23,8 +23,9 @@
+@@ -23,8 +23,8 @@
  helper_mode=4755
  makefile_target='$(RUTILT_NAME) $(HELPER_NAME)'
  kernel_sources_path='/lib/modules/'`uname -r`'/build/include/'
 -options_base='-pipe -Wall -s'
 -options="$options_base -O3 -DNDEBUG"
-+options_base='-pipe -Wall'
-+options_debug="$options_base -g"
-+options="$options_base -s -O3 -DNDEBUG"
++options_base='-pipe -Wall -g'
++options="$options_base -O -DNDEBUG"
  # Generated variables :
  rutilt_name=rutilt
  rutilt_prefix=bin/
-@@ -120,7 +121,7 @@
- 
-          --debug)
-             echo 'Enabling debugging output, turning optimizations off.'
--            options=$options_base
-+            options=$options_debug
-             make clean_rutilt_secure_target_name;;
- 
-         *)

Added: unstable/rutilt/debian/patches/016_fix_about_comment.diff
===================================================================
--- unstable/rutilt/debian/patches/016_fix_about_comment.diff	                        (rev 0)
+++ unstable/rutilt/debian/patches/016_fix_about_comment.diff	2007-10-08 21:13:10 UTC (rev 53)
@@ -0,0 +1,11 @@
+--- rutilt-0.15~/lib/src/PrefsPage.cxx
++++ rutilt-0.15/lib/src/PrefsPage.cxx
+@@ -135,7 +135,7 @@
+     ::gtk_about_dialog_set_copyright (m_pAboutDialog,
+                                       "Copyright © 2005-2007 Romain BONDUE");
+     ::gtk_about_dialog_set_comments (m_pAboutDialog, "Wireless devices"
+-            " configuration tool, with extra support for Ralink devices.");
++            " configuration tool\n with extra support for Ralink devices.");
+     ::gtk_about_dialog_set_license (m_pAboutDialog,
+ "This program is free software; you can redistribute it and/or modify\n"
+ "it under the terms of the GNU General Public License as published by\n"

Modified: unstable/rutilt/debian/patches/series
===================================================================
--- unstable/rutilt/debian/patches/series	2007-10-08 01:00:42 UTC (rev 52)
+++ unstable/rutilt/debian/patches/series	2007-10-08 21:13:10 UTC (rev 53)
@@ -6,6 +6,7 @@
 010_fix_cflags.diff
 011_fix_trayicon_toggle.diff
 012_fix_set_ip.diff
+016_fix_about_comment.diff
 001_fix_desktop.diff
 002_fix_install.diff
 003_fix_ELF_location.diff

Modified: unstable/rutilt/debian/rules
===================================================================
--- unstable/rutilt/debian/rules	2007-10-08 01:00:42 UTC (rev 52)
+++ unstable/rutilt/debian/rules	2007-10-08 21:13:10 UTC (rev 53)
@@ -34,6 +34,10 @@
 
 	[ ! -f Makefile -o ! -f Makefile_cst ] || $(MAKE) clean
 
+#clean-up files left by upstream installer
+	rm -f helper_launcher.sh rutilt.desktop Makefile_cst \
+		include/StaticSettings.h
+
 	dh_clean 
 
 install: build