r54 - in unstable/rutilt/debian: . patches

[benh at alioth.debian.org]

Author: benh
Date: 2007-10-08 21:30:47 +0000 (Mon, 08 Oct 2007)
New Revision: 54

Added:
   unstable/rutilt/debian/patches/017_change_version.diff
Modified:
   unstable/rutilt/debian/changelog
   unstable/rutilt/debian/patches/series
   unstable/rutilt/debian/rules
Log:
Merged the rest of Cesare's changes from 0.15-0ubuntu4.


Modified: unstable/rutilt/debian/changelog
===================================================================
--- unstable/rutilt/debian/changelog	2007-10-08 21:13:10 UTC (rev 53)
+++ unstable/rutilt/debian/changelog	2007-10-08 21:30:47 UTC (rev 54)
@@ -4,8 +4,13 @@
   * Add patch 016_fix_about_comment.diff:
     - Fix about dialog comment being cut
   * Add the removal of unnecessary files in the clean target
+  
+  [Ben Hutchings]
+  * Changed 010_fix_cflags.diff to match Cesare's patch for Ubuntu
+  * Added patch 017_change_version.diff along the lines of Cesare's
+    patch for Ubuntu
 
- --
+ -- Ben Hutchings <ben at decadent.org.uk>  Mon,  8 Oct 2007 22:17:42 +0100
 
 rutilt (0.15-1) unstable; urgency=low
 

Added: unstable/rutilt/debian/patches/017_change_version.diff
===================================================================
--- unstable/rutilt/debian/patches/017_change_version.diff	                        (rev 0)
+++ unstable/rutilt/debian/patches/017_change_version.diff	2007-10-08 21:30:47 UTC (rev 54)
@@ -0,0 +1,22 @@
+--- rutilt.orig/lib/src/PrefsPage.cxx
++++ rutilt/lib/src/PrefsPage.cxx
+@@ -134,7 +134,7 @@
+     ::gtk_window_set_transient_for (GTK_WINDOW (m_pAboutDialog),
+          GTK_WINDOW (::gtk_widget_get_toplevel (GTK_WIDGET (This->m_pTable))));
+     ::gtk_about_dialog_set_name (m_pAboutDialog, "RutilT");
+-    ::gtk_about_dialog_set_version (m_pAboutDialog, "v0.15");
++    ::gtk_about_dialog_set_version (m_pAboutDialog, "v" VERSION);
+     ::gtk_about_dialog_set_copyright (m_pAboutDialog,
+                                       "Copyright © 2005-2007 Romain BONDUE");
+     ::gtk_about_dialog_set_comments (m_pAboutDialog, "Wireless devices"
+--- rutilt.orig/lib/src/RutilT.cxx
++++ rutilt/lib/src/RutilT.cxx
+@@ -118,7 +118,7 @@
+ "All Gtk+ specific options are also supported, see the Gtk+ documentation."
+                       << std::endl;
+         else if (Opt.Version())
+-            std::cout << "RutilT v0.15\nCopyright (C) 2005-2007 Romain BONDUE\n"
++            std::cout << "RutilT v" VERSION "\nCopyright (C) 2005-2007 Romain BONDUE\n"
+ "This is free software.  You may redistribute copies of it under the terms of\n"
+ "the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n"
+ "There is NO WARRANTY, to the extent permitted by law.\n\n"

Modified: unstable/rutilt/debian/patches/series
===================================================================
--- unstable/rutilt/debian/patches/series	2007-10-08 21:13:10 UTC (rev 53)
+++ unstable/rutilt/debian/patches/series	2007-10-08 21:30:47 UTC (rev 54)
@@ -13,3 +13,4 @@
 013_fix_install_failure.diff
 014_make_dialogs_transient.diff
 015_use_su-to-root.diff
+017_change_version.diff

Modified: unstable/rutilt/debian/rules
===================================================================
--- unstable/rutilt/debian/rules	2007-10-08 21:13:10 UTC (rev 53)
+++ unstable/rutilt/debian/rules	2007-10-08 21:30:47 UTC (rev 54)
@@ -15,6 +15,9 @@
 configure-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 	./configure.sh $(CONFIGURE_OPTIONS)
+	VERSION="$$(dpkg-parsechangelog | sed 's/^Version: //; t; d')" && \
+	[ -n "$$VERSION" ] && \
+	echo "OPTIONS += -DVERSION=\"\\\"$$VERSION\\\"\"" >>Makefile_cst
 
 	touch configure-stamp