[Pkg-cli-apps-commits] r4778 - in /packages/smuxi/trunk/debian: changelog patches/ubuntu_default_settings.dpatch rules

[meebey at users.alioth.debian.org]

Author: meebey
Date: Sun Mar 29 16:10:32 2009
New Revision: 4778

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4778
Log:
  * debian/rules
    debian/patches/ubuntu_default_settings.dpatch
    debian/patches/00list:
    + Only apply debian_default_settings on debian systems and
      ubuntu_default_settings on ubuntu systems, as the defaults doesn't make
      sense otherwise.


Added:
    packages/smuxi/trunk/debian/patches/ubuntu_default_settings.dpatch   (with props)
Modified:
    packages/smuxi/trunk/debian/changelog
    packages/smuxi/trunk/debian/rules

Modified: packages/smuxi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/smuxi/trunk/debian/changelog?rev=4778&op=diff
==============================================================================
--- packages/smuxi/trunk/debian/changelog (original)
+++ packages/smuxi/trunk/debian/changelog Sun Mar 29 16:10:32 2009
@@ -1,4 +1,4 @@
-smuxi (0.6.3-4) UNRELEASED; urgency=low
+smuxi (0.6.3-4~pre1) UNRELEASED; urgency=low
 
   [ Jo Shields ]
   * debian/control:
@@ -9,10 +9,14 @@
   * Bump Standards version to 3.8.1 
 
   [ Mirco Bauer ]
-  * debian/patches/00list:
-    + Really apply debian_default_settings patch.
+  * debian/rules
+    debian/patches/ubuntu_default_settings.dpatch
+    debian/patches/00list:
+    + Only apply debian_default_settings on debian systems and
+      ubuntu_default_settings on ubuntu systems, as the defaults doesn't make
+      sense otherwise.
 
- -- Stefan Ebner <sebner at ubuntu.com>  Sun, 22 Mar 2009 15:00:58 +0100
+ -- Mirco Bauer <meebey at debian.org>  Sun, 29 Mar 2009 18:10:13 +0200
 
 smuxi (0.6.3-3) unstable; urgency=low
 

Added: packages/smuxi/trunk/debian/patches/ubuntu_default_settings.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/smuxi/trunk/debian/patches/ubuntu_default_settings.dpatch?rev=4778&op=file
==============================================================================
--- packages/smuxi/trunk/debian/patches/ubuntu_default_settings.dpatch (added)
+++ packages/smuxi/trunk/debian/patches/ubuntu_default_settings.dpatch Sun Mar 29 16:10:32 2009
@@ -1,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ubuntu_default_settings.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad smuxi-0.6.3~/src/Engine/Config/Config.cs smuxi-0.6.3/src/Engine/Config/Config.cs
+--- smuxi-0.6.3~/src/Engine/Config/Config.cs	2008-12-28 23:01:43.000000000 +0100
++++ smuxi-0.6.3/src/Engine/Config/Config.cs	2009-03-29 18:08:03.000000000 +0200
+@@ -279,6 +279,12 @@
+             Get(prefix + "Hostname", "irc.freenode.net");
+             Get(prefix + "Port", 6667);
+             Get(prefix + "Network", "freenode");
++            Get(prefix + "OnStartupConnect", true);
++            Get(prefix + "OnConnectCommands",
++                new string[] {
++                    "/join #ubuntu",
++                }
++            );
+             
+             prefix = "Engine/Users/";
+             Get(prefix+"Users", new string[] { "local" });

Propchange: packages/smuxi/trunk/debian/patches/ubuntu_default_settings.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/smuxi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/smuxi/trunk/debian/rules?rev=4778&op=diff
==============================================================================
--- packages/smuxi/trunk/debian/rules (original)
+++ packages/smuxi/trunk/debian/rules Sun Mar 29 16:10:32 2009
@@ -3,6 +3,15 @@
 
 include /usr/share/cli-common/cli.make
 include /usr/share/dpatch/dpatch.make
+
+DISTRO = "$(shell lsb_release -si)"
+PATCH_LIST_FILE = $(CURDIR)/debian/patches/00list
+$(shell egrep -v '(ubuntu|debian)_default_settings' $(PATCH_LIST_FILE) > $(PATCH_LIST_FILE))
+ifeq ($(DISTRO),"Ubuntu")
+$(shell echo ubuntu_default_settings >> $(PATCH_LIST_FILE))
+else
+$(shell echo debian_default_settings >> $(PATCH_LIST_FILE))
+endif
 
 build: patch-stamp
 	dh $@ --before configure