r112 - in unstable/rutilt/debian: . patches

[benh at alioth.debian.org]

Author: benh
Date: 2008-02-02 13:47:42 +0000 (Sat, 02 Feb 2008)
New Revision: 112

Added:
   unstable/rutilt/debian/NEWS
   unstable/rutilt/debian/patches/022_fix_icon.diff
Modified:
   unstable/rutilt/debian/changelog
   unstable/rutilt/debian/patches/series
   unstable/rutilt/debian/rules
Log:
Merged changes by Cesare Tirabassi in Ubuntu.


Added: unstable/rutilt/debian/NEWS
===================================================================
--- unstable/rutilt/debian/NEWS	                        (rev 0)
+++ unstable/rutilt/debian/NEWS	2008-02-02 13:47:42 UTC (rev 112)
@@ -0,0 +1,6 @@
+rutilt (0.16-1) unstable; urgency=low
+
+  The way to store profiles has been changed with this release. As a
+  consequence old profiles are not loaded and need to be redefined.
+
+ -- Cesare Tirabassi <norsetto at ubuntu.com>  Tue, 04 Dec 2007 09:20:02 +0100

Modified: unstable/rutilt/debian/changelog
===================================================================
--- unstable/rutilt/debian/changelog	2007-12-07 20:33:42 UTC (rev 111)
+++ unstable/rutilt/debian/changelog	2008-02-02 13:47:42 UTC (rev 112)
@@ -1,15 +1,25 @@
 rutilt (0.16-1) unstable; urgency=low
 
-  * New upstream version
-  * Removed patches applied upstream
-  * Removed the remaining changes in 018_up_and_down.diff.  Bringing the
-    interface down before setting ESSID is not necessary and does not work
-    with all drivers.  (LP #164058)
-  * Removed rutilt_helper manual page, included upstream
-  * Implemented debug build option separately from noopt
+  [Cesare Tirabassi]
+  * New upstream release
+  * Add entry in debian/NEWS about this update breaking existing
+    profiles
+  * debian/rules:
+    - add dh_icons call
+    - change optimization level from -O to -O3
+    - use new configure.sh --version option instead of patching Makefile_cst
+    - use new configure.sh --cflags option instead of patching configure.sh
+  * Remove debian/manpages and debian/rutilt_helper.1 (provided upstream)
+  * Remove all patches, now applied upstream or obsolete
+  * Add patch 022_fix_icon.diff: remove icon extension in accordance with
+    freedesktop Icon Theme Specification
+  * Add debian/menu and debian/rutilt.xpm menu icon
 
- -- Ben Hutchings <ben at decadent.org.uk>  Sun, 02 Dec 2007 18:39:05 +0000
+  [Ben Hutchings]
+  * Added patch 021_fix_configure_arg_parsing.diff
 
+ -- Ben Hutchings <ben at decadent.org.uk>  Sat, 02 Feb 2008 13:34:44 +0000
+
 rutilt (0.15-3) unstable; urgency=low
 
   * Added patch 018_up_and_down.diff to improve reliability with

Added: unstable/rutilt/debian/patches/022_fix_icon.diff
===================================================================
--- unstable/rutilt/debian/patches/022_fix_icon.diff	                        (rev 0)
+++ unstable/rutilt/debian/patches/022_fix_icon.diff	2008-02-02 13:47:42 UTC (rev 112)
@@ -0,0 +1,13 @@
+Index: rutilt-0.16/configure.sh
+===================================================================
+--- rutilt-0.16.orig/configure.sh	2007-11-26 18:15:30.000000000 +0100
++++ rutilt-0.16/configure.sh	2007-11-26 18:17:56.000000000 +0100
+@@ -298,7 +298,7 @@
+ Categories=GTK;System;Settings;Network;
+ Version=1.0
+ StartupNotify=false
+-Icon=$icon_final_name
++Icon=`echo $icon_final_name | cut -f1 -d.`
+ Exec=$rutilt_name" > $desktop_launcher_name
+ echo done
+ #

Modified: unstable/rutilt/debian/patches/series
===================================================================
--- unstable/rutilt/debian/patches/series	2007-12-07 20:33:42 UTC (rev 111)
+++ unstable/rutilt/debian/patches/series	2008-02-02 13:47:42 UTC (rev 112)
@@ -1,2 +1,3 @@
 021_fix_configure_arg_parsing.diff
 015_use_su-to-root.diff
+022_fix_icon.diff

Modified: unstable/rutilt/debian/rules
===================================================================
--- unstable/rutilt/debian/rules	2007-12-07 20:33:42 UTC (rev 111)
+++ unstable/rutilt/debian/rules	2008-02-02 13:47:42 UTC (rev 112)
@@ -5,22 +5,24 @@
 
 include /usr/share/quilt/quilt.make
 
-CFLAGS := -pipe -Wall
+CFLAGS := -pipe -Wall -g
+
 ifeq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -DNDEBUG
-else
-	CFLAGS += -g
 endif
 ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O3
 endif
+
 VERSION := $(shell dpkg-parsechangelog | sed 's/^Version: //; t; d')
+
 CONFIGURE_OPTIONS := --launcher=external --prefix=/usr --kernel_sources=/usr \
 	--cflags="$(CFLAGS)" --version="$(VERSION)"
 
 configure: configure-stamp
 configure-stamp: $(QUILT_STAMPFN)
 	dh_testdir
+
 	./configure.sh $(CONFIGURE_OPTIONS)
 
 	touch configure-stamp