[Pkg-nagios-changes] [SCM] Debian packaging of icinga-web branch, debmon-wheezy, updated. debian/1.9.0+dfsg1-1-10-g342b224

[Markus Frosch]

The following commit has been merged in the debmon-wheezy branch:
commit 7beb4331d05718c31dece714f31518c5cc92f535
Merge: a599476991f724745eb831afe29b942049350fc7 cf90138cc70ca407c48bdedc7158527325e69633
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Wed May 8 18:32:09 2013 +0200

    Merge branch 'master' into debmon-wheezy
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index d4906e0,49455dd..f06dacc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,21 @@@
+ icinga-web (1.9.0+dfsg1-1) unstable; urgency=low
+ 
+   * [e8ce6b5] Imported Upstream version 1.9.0
+   * [3535d71] added database schema for 1.9.0
+   * [435cae2] switched to Apache2 configuration coming from upstream
+   * [020f7f4] Switched to new build prefix and updated paths in install
+   * Merged back wheezy related changes into unstable
+     and reintegrated them with the latest changes
+   * [f5f36b2] Updated patch 21_yui_chartsswf for 1.9.0
+ 
+  -- Markus Frosch <markus at lazyfrosch.de>  Wed, 08 May 2013 16:50:31 +0200
+ 
 +icinga-web (1.8.3-1~debmon70+1) debmon-wheezy; urgency=low
 +
 +  * Rebuild for debmon-wheezy
 +
 + -- Markus Frosch <markus at lazyfrosch.de>  Mon, 25 Mar 2013 16:55:28 +0100
 +
  icinga-web (1.8.3-1) experimental; urgency=low
  
    * [bba67b0] Removing own symlinks to nagios-images.
@@@ -13,12 -19,6 +25,12 @@@
  
   -- Markus Frosch <markus at lazyfrosch.de>  Mon, 25 Mar 2013 16:41:30 +0100
  
 +icinga-web (1.8.2-1~debmon70+1) debmon-wheezy; urgency=low
 +
 +  * Rebuild for debmon-wheezy
 +
 + -- Markus Frosch <markus at lazyfrosch.de>  Tue, 12 Feb 2013 17:55:48 +0100
 +
  icinga-web (1.8.2-1) experimental; urgency=low
  
    * [5a03f8a] bump standards version
@@@ -28,12 -28,6 +40,12 @@@
  
   -- Markus Frosch <markus at lazyfrosch.de>  Tue, 12 Feb 2013 17:48:09 +0100
  
 +icinga-web (1.8.1-1~debmon70+1) debmon-wheezy; urgency=low
 +
 +  * Rebuild for debmon-wheezy.
 +
 + -- Markus Frosch <markus at lazyfrosch.de>  Thu, 06 Dec 2012 19:23:59 +0100
 +
  icinga-web (1.8.1-1) experimental; urgency=low
  
    * [5f0e216] Debconf language update for ja (Japanese)
@@@ -49,12 -43,6 +61,12 @@@
  
   -- Markus Frosch <markus at lazyfrosch.de>  Mon, 6 Dec 2012 19:07:11 +0100
  
 +icinga-web (1.8.0-1~debmon70+1) debmon-wheezy; urgency=low
 +
 +  * Rebuild for wheezy on debmon.org
 +
 + -- Markus Frosch <markus at lazyfrosch.de>  Thu, 18 Oct 2012 22:14:50 +0200
 +
  icinga-web (1.8.0-1) experimental; urgency=low
  
    * [265f0d7] Imported Upstream version 1.8.0~beta
@@@ -92,6 -80,37 +104,37 @@@ icinga-web (1.7.2-1) experimental; urge
  
   -- Markus Frosch <markus at lazyfrosch.de>  Mon, 14 Sep 2012 17:56:05 +0200
  
+ icinga-web (1.7.1+dfsg2-6) unstable; urgency=high
+ 
+   * [bb01a46] Security fix for a YUI library issue
+ 
+     Two .swf files has been removed from the Debian package
+     and the Flash supported chart feature is disable for now.
+ 
+     In addition a upstream patch was applied to allow the user
+     to use the feature with a newer .swf resource if he wants
+     to.
+ 
+     Please see README.Debian for instructions
+ 
+     Closes: #694262
+     Closes: #694641
+ 
+   * [4ec39a9] DFSG cleaned upstream 1.7.1+dfsg2
+     SWF binary files has been removed from tarball
+ 
+  -- Markus Frosch <markus at lazyfrosch.de>  Wed, 29 Nov 2012 00:17:41 +0100
+ 
+ icinga-web (1.7.1+dfsg1-5) unstable; urgency=high
+ 
+   * [4cc829d] DFSG cleaned upstream 1.7.1+dfsg1
+               Removed JSmin from upstream tarball
+               due to non-free license  Closes: #689764
+   * [795fde4] added gbp.conf for wheezy branch
+   * [bca5fb8] updated watch file for dfsg tarballs
+ 
+  -- Markus Frosch <markus at lazyfrosch.de>  Mon, 08 Oct 2012 14:52:10 +0200
+ 
  icinga-web (1.7.1-4) unstable; urgency=low
  
    * [3b184da] fixed postrm to avoid breaking on
diff --combined debian/gbp.conf
index bf7936c,82852c0..7cb7855
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,4 -1,8 +1,8 @@@
  [DEFAULT]
 -;debian-branch = master
 +debian-branch = debmon-wheezy
  ;upstream-branch = upstream
+ upstream-branch = upstream_dfsg
+ 
+ [git-import-orig]
  pristine-tar = True
+ upstream-branch = upstream

-- 
Debian packaging of icinga-web