← Back to branch summary

~ubuntu-branches/ubuntu/karmic/gkrellm/karmic

« back to all changes in this revision

Viewing changes to debian/patches/01_gkrellmd.conf.patch

  • Committer: Bazaar Package Importer
  • Author(s): Bhavani Shankar
  • Date: 2009-06-16 12:22:20 UTC
  • mfrom: (3.3.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090616122220-ujzs3gfho7nxizfj
Tags: 2.3.2-4ubuntu1
https://launchpad.net/bugs/387674
* Merge from debian unstable, remaining changes: LP: #387674
  + debian/control:
    - Adjust Conflicts/Replaces versions for Ubuntu.
  + debian/rules:
    - Add --no start option to DEB_DH_INSTALLINIT_ARGS to avoid errors
      during upgrade and removal phases.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01_gkrellmd.conf.patch
 
1
Author: Jose Luis Rivas <ghostbar38@gmail.com> 
 
2
Description: setup default configuration for gkrellmd
1
3
Index: gkrellm/server/gkrellmd.conf
2
4
===================================================================
3
 
--- gkrellm.orig/server/gkrellmd.conf   2008-10-19 23:31:54.152539820 +0200
4
 
+++ gkrellm/server/gkrellmd.conf        2008-10-20 00:41:19.960539387 +0200
 
5
--- gkrellm.orig/server/gkrellmd.conf   2009-06-13 08:44:59.400168280 +0200
 
6
+++ gkrellm/server/gkrellmd.conf        2009-06-13 09:17:38.071169558 +0200
5
7
@@ -10,11 +10,6 @@
6
8
 #
7
9
 max-clients 2