[Python-apps-commits] r5241 - in packages/nagstamon/trunk/debian (9 files)

Wed May 19 19:49:50 UTC 2010

Date: Wednesday, May 19, 2010 @ 19:49:33
  Author: chaica-guest
Revision: 5241

  * New upstream release
  * debian/rules
    - added quilt support
  * debian/patches
    - added setup_patch to remove an absolute link for the upstream
      manpage
  * debian/control
    - added quilt in Build-Depends
    - added the support of Opsview servers in the long description
  * debian/nagstamon.manpages
    - switched to the file provided by the upstream

Added:
  packages/nagstamon/trunk/debian/README.source
  packages/nagstamon/trunk/debian/patches/
  packages/nagstamon/trunk/debian/patches/series
  packages/nagstamon/trunk/debian/patches/setup_patch
Modified:
  packages/nagstamon/trunk/debian/changelog
  packages/nagstamon/trunk/debian/control
  packages/nagstamon/trunk/debian/nagstamon.manpages
  packages/nagstamon/trunk/debian/rules
Deleted:
  packages/nagstamon/trunk/debian/nagstamon.1

Added: packages/nagstamon/trunk/debian/README.source
===================================================================

--- packages/nagstamon/trunk/debian/README.source	                        (rev 0)
+++ packages/nagstamon/trunk/debian/README.source	2010-05-19 19:49:33 UTC (rev 5241)
@@ -0,0 +1,57 @@
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+                export QUILT_PATCHES=debian/patches
+        fi
+    done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+    quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+    quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches.  Then, for every file that will be modified by this patch,
+run:
+
+    quilt add <file>
+
+before editing those files.  You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly.  After editing the files, run:
+
+    quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+    quilt import -P <patch> /path/to/patch
+    quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches.  The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+    quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.

Modified: packages/nagstamon/trunk/debian/changelog
===================================================================
--- packages/nagstamon/trunk/debian/changelog	2010-05-19 18:31:14 UTC (rev 5240)
+++ packages/nagstamon/trunk/debian/changelog	2010-05-19 19:49:33 UTC (rev 5241)
@@ -1,3 +1,19 @@
+nagstamon (0.9.3-1) unstable; urgency=low
+
+  * New upstream release 
+  * debian/rules
+    - added quilt support
+  * debian/patches
+    - added setup_patch to remove an absolute link for the upstream
+      manpage
+  * debian/control
+    - added quilt in Build-Depends
+    - added the support of Opsview servers in the long description 
+  * debian/nagstamon.manpages
+    - switched to the file provided by the upstream
+
+ -- Carl Chenet <chaica at ohmytux.com>  Wed, 19 May 2010 21:20:31 +0200
+
 nagstamon (0.9.2-2) unstable; urgency=low
 
   * debian/control

Modified: packages/nagstamon/trunk/debian/control
===================================================================
--- packages/nagstamon/trunk/debian/control	2010-05-19 18:31:14 UTC (rev 5240)
+++ packages/nagstamon/trunk/debian/control	2010-05-19 19:49:33 UTC (rev 5241)
@@ -4,7 +4,7 @@
 Priority: optional
 Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Uploaders: Carl Chenet <chaica at ohmytux.com>
-Build-Depends: debhelper (>= 7.0.50~), python (>= 2.5)
+Build-Depends: debhelper (>= 7.0.50~), python (>= 2.5), quilt (>= 0.46-7~)
 Build-Depends-Indep: python-support
 Standards-Version: 3.8.4
 Homepage: http://nagstamon.sourceforge.net
@@ -18,4 +18,5 @@
  Nagstamon is a Nagios status monitor which takes place in systray or 
  on desktop (GNOME, KDE), as floating statusbar to inform you in 
  realtime about the status of your Nagios monitored network. 
- It allows to connect to multiple Nagios servers.
+ It allows to connect to multiple Nagios servers and supports Opsview
+ servers.

Deleted: packages/nagstamon/trunk/debian/nagstamon.1
===================================================================
--- packages/nagstamon/trunk/debian/nagstamon.1	2010-05-19 18:31:14 UTC (rev 5240)
+++ packages/nagstamon/trunk/debian/nagstamon.1	2010-05-19 19:49:33 UTC (rev 5241)
@@ -1,40 +0,0 @@
-'\" t
-.\"     Title: nagstamon
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.1 <http://docbook.sf.net/>
-.\"      Date: 03/20/2010
-.\"  Language: English
-.\"
-.TH "NAGSTAMON" "1" "03/20/2010"
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-nagstamon \- Nagios status monitor which takes place in systray or on desktop
-.SH "SYNOPSIS"
-.sp
-nagstamon [alternate\-config]
-.SH "DESCRIPTION"
-.sp
-Nagstamon is a Nagios status monitor which takes place in systray or on desktop (GNOME, KDE) as floating statusbar to inform you in realtime about the status of your Nagios monitored network\&. It allows to connect to multiple Nagios servers\&.
-.sp
-The command can optionally take one argument giving the path to an alternate configuration file\&.
-.SH "OPTIONS"
-.sp
-No options\&.
-.SH "AUTHOR"
-.sp
-This manual page has been written by Carl Chenet <chaica at ohmytux\&.com>\&.
-.SH "RESSOURCES"
-.sp
-http://sourceforge\&.net/projects/nagstamon/
-.SH "LICENSE"
-.sp
-This manual page is licensed under the GPL\-2 license\&.

Modified: packages/nagstamon/trunk/debian/nagstamon.manpages
===================================================================
--- packages/nagstamon/trunk/debian/nagstamon.manpages	2010-05-19 18:31:14 UTC (rev 5240)
+++ packages/nagstamon/trunk/debian/nagstamon.manpages	2010-05-19 19:49:33 UTC (rev 5241)
@@ -1 +1 @@
-debian/nagstamon.1
+Nagstamon/resources/nagstamon.1

Added: packages/nagstamon/trunk/debian/patches/series
===================================================================
--- packages/nagstamon/trunk/debian/patches/series	                        (rev 0)
+++ packages/nagstamon/trunk/debian/patches/series	2010-05-19 19:49:33 UTC (rev 5241)
@@ -0,0 +1 @@
+setup_patch

Added: packages/nagstamon/trunk/debian/patches/setup_patch
===================================================================
--- packages/nagstamon/trunk/debian/patches/setup_patch	                        (rev 0)
+++ packages/nagstamon/trunk/debian/patches/setup_patch	2010-05-19 19:49:33 UTC (rev 5241)
@@ -0,0 +1,17 @@
+# Description: Remove an absolute path
+# Author: Carl Chenet <chaica at ohmytux.com>
+
+Index: nagstamon_0.9.3/setup.py
+===================================================================
+--- nagstamon_0.9.3.orig/setup.py	2010-05-19 21:12:13.000000000 +0200
++++ nagstamon_0.9.3/setup.py	2010-05-19 21:12:21.000000000 +0200
+@@ -48,7 +48,7 @@
+     download_url = 'http://sourceforge.net/projects/nagstamon/',
+     scripts = ['Nagstamon/nagstamon'],
+     packages = ['Nagstamon'],
+-    package_data = {'': ['resources/*']},
+-    data_files = [('/usr/local/share/man/man1', ['Nagstamon/resources/nagstamon.1'])]
++    package_data = {'': ['resources/*']}
++#    data_files = [('/usr/local/share/man/man1', ['Nagstamon/resources/nagstamon.1'])]
+ )
+ 

Modified: packages/nagstamon/trunk/debian/rules
===================================================================
--- packages/nagstamon/trunk/debian/rules	2010-05-19 18:31:14 UTC (rev 5240)
+++ packages/nagstamon/trunk/debian/rules	2010-05-19 19:49:33 UTC (rev 5241)
@@ -3,7 +3,7 @@
 export DH_ALWAYS_EXCLUDE=LICENSE
 
 %:
-	dh $@
+	dh --with quilt $@
 
 override_dh_link:
 	dh_link usr/share/nagstamon/nagstamon usr/bin/nagstamon


