diff -pruN 1.8.9-4/collection.xml 1.8.9-4ubuntu1/collection.xml
--- 1.8.9-4/collection.xml 2014-12-24 18:36:27.000000000 +0000
+++ 1.8.9-4ubuntu1/collection.xml 2014-12-24 18:36:27.000000000 +0000
@@ -13,4 +13,6 @@
+
+
diff -pruN 1.8.9-4/debian/changelog 1.8.9-4ubuntu1/debian/changelog
--- 1.8.9-4/debian/changelog 2014-10-14 17:14:26.000000000 +0000
+++ 1.8.9-4ubuntu1/debian/changelog 2014-12-24 16:49:15.000000000 +0000
@@ -1,3 +1,11 @@
+blam (1.8.9-4ubuntu1) vivid; urgency=low
+
+ * Merge from Debian unstable. Remaining changes:
+ - debian/patches/PlanetUbuntu.patch, debian/gbp.conf:
+ + Add Ubuntu branding.
+
+ -- Artur Rona Wed, 24 Dec 2014 17:44:42 +0100
+
blam (1.8.9-4) unstable; urgency=medium
[ Carlos Martín Nieto ]
@@ -10,12 +18,28 @@ blam (1.8.9-4) unstable; urgency=medium
-- Carlos Martín Nieto Tue, 14 Oct 2014 18:14:23 +0100
+blam (1.8.9-3ubuntu1) raring; urgency=low
+
+ * Merge from Debian testing. Remaining changes:
+ - [9715c77] Add Planet Ubuntu feed.
+ * [ad90995] Add gbp.conf for ubuntu branch.
+
+ -- Mahyuddin Susanto Wed, 21 Nov 2012 10:34:19 +0700
+
blam (1.8.9-3) unstable; urgency=low
* No-change upload for Mono 2.10 transition.
-- Jo Shields Wed, 18 Jan 2012 23:23:18 +0000
+blam (1.8.9-2ubuntu1) precise; urgency=low
+
+ * Merge with Debian, remaining changes
+ + [9715c77] Add Planet Ubuntu feed
+ * [ad90995] Add gbp.conf for ubuntu branch
+
+ -- Iain Lane Sun, 13 Nov 2011 21:48:34 +0000
+
blam (1.8.9-2) unstable; urgency=low
* [28db500] Use #elif instead of #elseif. Fixed FTBFS with Mono 2.10
@@ -39,6 +63,19 @@ blam (1.8.9-1) unstable; urgency=low
-- Carlos Martín Nieto Sun, 31 Jul 2011 16:45:15 +0200
+blam (1.8.8-1ubuntu2) oneiric; urgency=low
+
+ * No change rebuild against Mono's CLR 4.0 class library
+
+ -- Jo Shields Sun, 19 Jun 2011 11:51:07 +0100
+
+blam (1.8.8-1ubuntu1) oneiric; urgency=low
+
+ * Merge from debian unstable. Remaining changes:
+ - ebian/patches/PlanetUbuntu.patch: add planet.ubuntu.com.
+
+ -- Bhavani Shankar Sat, 04 Jun 2011 23:19:11 +0530
+
blam (1.8.8-1) unstable; urgency=low
[ Julian Taylor ]
@@ -61,6 +98,13 @@ blam (1.8.8-1) unstable; urgency=low
-- Carlos Martín Nieto Tue, 31 May 2011 01:36:47 +0200
+blam (1.8.7-2ubuntu1) maverick; urgency=low
+
+ * Merge from debian unstable. Remaining changes: LP: #595425
+ + debian/patches/PlanetUbuntu.patch: add planet.ubuntu.com.
+
+ -- Bhavani Shankar Thu, 17 Jun 2010 13:59:15 +0530
+
blam (1.8.7-2) unstable; urgency=low
* debian/patches:
@@ -73,6 +117,13 @@ blam (1.8.7-2) unstable; urgency=low
-- Carlos Martín Nieto Fri, 04 Jun 2010 19:00:45 +0200
+blam (1.8.7-1ubuntu1) lucid; urgency=low
+
+ * Merge from Debian testing, remaining changes
+ + debian/patches/PlanetUbuntu.patch: add planet.ubuntu.com.
+
+ -- Iain Lane Mon, 01 Feb 2010 20:38:09 +0000
+
blam (1.8.7-1) unstable; urgency=low
[ Jo Shields ]
@@ -92,12 +143,28 @@ blam (1.8.7-1) unstable; urgency=low
-- Jo Shields Tue, 12 Jan 2010 11:51:38 +0000
+blam (1.8.6-3ubuntu1) karmic; urgency=low
+
+ * Merge from Debian(Unstable), remaining changes:
+ + debian/patches/PlanetUbuntu.patch: add planet.ubuntu.com.
+
+ -- Stefan Ebner Sat, 02 May 2009 22:59:51 +0200
+
blam (1.8.6-3) unstable; urgency=low
* debian/control: libgnome2.0-cil -> libgnome2.24-cil for GNOME# transition.
-- Iain Lane Sat, 18 Apr 2009 14:54:45 +0100
+blam (1.8.6-2ubuntu1) jaunty; urgency=low
+
+ * Merge from Debian Unstable (LP: #339863), remaining Ubuntu changes:
+ + debian/control:
+ - Update for Gnome# 2.24 transition
+ + debian/patches/PlanetUbuntu.patch: add planet.ubuntu.com.
+
+ -- Jo Shields Mon, 09 Mar 2009 10:55:41 +0000
+
blam (1.8.6-2) unstable; urgency=low
* debian/rules:
@@ -133,6 +200,40 @@ blam (1.8.6-1) unstable; urgency=low
-- Carlos Martín Nieto Fri, 06 Mar 2009 02:15:40 +0100
+blam (1.8.5-1ubuntu3) jaunty; urgency=low
+
+ * Adjust build-dependencies for gnome-sharp2 transition (LP: #314516):
+ - libgnome2.0-cil -> libgnome2.24-cil
+ - libgconf2.0-cil -> libgconf2.24-cil
+ * debian/patches/20_printing_support.patch:
+ - Remove obsolete GnomePrint usage, fixed in upstream SVN.
+
+ -- Luca Falavigna Sat, 14 Feb 2009 18:48:04 +0100
+
+blam (1.8.5-1ubuntu2) jaunty; urgency=low
+
+ * Mono 2.0 transition.
+ - Build depend on mono-devel instead of mono-mcs so that we can use csc.
+ - Pass GMCS=/usr/bin/csc to configure so that csc is used.
+
+ -- James Westby Sun, 30 Nov 2008 20:06:18 +0000
+
+blam (1.8.5-1ubuntu1) intrepid; urgency=low
+
+ * Merge from debian unstable (LP: #226670), remaining changes:
+ - xulrunner 1.9 + dependent sharp
+ + debian/control: raise build-depends bar to libgecko2.0-cil (>= 0.11)
+ + make use of standalone glue for C++ code and dependent gecko sharp
+ module for C# parts; fixup configure.in accordingly
+ - add debian/patches/10_xul1.9.patch
+ - Added debian/patches/PlanetUbuntu.patch
+ * Updated rerun autools patch:
+ - debian/patches/99_autotools_rerun.patch
+ * debian/rules: Added configure flag to pass libxul-embedding-unstable
+ as default, Fixes build-bustage.
+
+ -- Andres Rodriguez Sun, 17 Aug 2008 23:16:06 -0500
+
blam (1.8.5-1) unstable; urgency=low
* New upstream release
@@ -159,6 +260,27 @@ blam (1.8.4-4) unstable; urgency=low
-- Carlos Martín Nieto Thu, 13 Mar 2008 14:59:32 +0100
+blam (1.8.4-3ubuntu2) hardy; urgency=low
+
+ xulrunner 1.9 + dependent sharp
+ * raise build-depends bar to libgecko2.0-cil (>= 0.11-3ubuntu4~asac6)
+ - update debian/control
+ * make use of standalone glue for C++ code and dependent gecko sharp module
+ for C# parts; fixup configure.in accordingly
+ - add debian/patches/10_xul1.9.patch
+ * rerun autotools
+ - debian/patches/99_autotools_rerun.patch
+
+ -- Alexander Sack Tue, 29 Jan 2008 00:43:32 +0100
+
+blam (1.8.4-3ubuntu1) hardy; urgency=low
+
+ * Merge from Debian unstable, remaining changes:
+ - Added debian/patches/PlanetUbuntu.patch
+ - Update maintainer field in debian/control.
+
+ -- Michele Angrisano Wed, 16 Jan 2008 21:27:00 +0100
+
blam (1.8.4-3) unstable; urgency=low
* Delete the debug file that is created when building. If built twice,
@@ -174,6 +296,15 @@ blam (1.8.4-3) unstable; urgency=low
-- Carlos Martín Nieto Tue, 11 Dec 2007 19:05:33 +0100
+blam (1.8.4-2.1ubuntu1) hardy; urgency=low
+
+ * Merge from Debian unstable. Remaining Ubuntu changes:
+ - Keeping our orig.tar.gz as it's differing from Debian's
+ - Added debian/patches/PlanetUbuntu.patch
+ * Set Maintainer to Ubuntu MOTU Developers
+
+ -- Adrien Cunin Mon, 03 Dec 2007 20:46:37 +0100
+
blam (1.8.4-2.1) unstable; urgency=low
* Non-maintainer upload.
@@ -210,6 +341,18 @@ blam (1.8.3-3) unstable; urgency=low
-- Carlos Martín Nieto Tue, 12 Dec 2006 15:58:20 +0100
+blam (1.8.4-0ubuntu1) feisty; urgency=low
+
+ * Sync with Debian unstable
+ * New upstream release
+ * Added build-dependency on gnome-sharp2
+ * debian/patches/01_correct_default_theme.patch: dropped, included upstream
+ * Re-added the following Ubuntu changes:
+ - Build-Depends on firefox-dev instead of libxul-dev
+ - debian/patches/PlanetUbuntu.patch
+
+ -- Adrien Cunin Fri, 2 Feb 2007 00:37:16 +0100
+
blam (1.8.3-2) unstable; urgency=low
* Fix default theme path (closes: #400176).
diff -pruN 1.8.9-4/debian/control 1.8.9-4ubuntu1/debian/control
--- 1.8.9-4/debian/control 2014-10-14 17:14:26.000000000 +0000
+++ 1.8.9-4ubuntu1/debian/control 2014-12-24 16:49:15.000000000 +0000
@@ -1,7 +1,8 @@
Source: blam
Section: gnome
Priority: optional
-Maintainer: Debian CLI Applications Team
+Maintainer: Ubuntu Developers
+XSBC-Original-Maintainer: Debian CLI Applications Team
Uploaders: Carlos Martín Nieto
Build-Depends: debhelper (>= 7.0.50~)
Build-Depends-Indep: mono-devel (>= 2.4.3),
diff -pruN 1.8.9-4/debian/gbp.conf 1.8.9-4ubuntu1/debian/gbp.conf
--- 1.8.9-4/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000
+++ 1.8.9-4ubuntu1/debian/gbp.conf 2014-12-24 16:49:15.000000000 +0000
@@ -0,0 +1,3 @@
+[DEFAULT]
+debian-branch = ubuntu
+upstream-branch = upstream
diff -pruN 1.8.9-4/debian/patches/PlanetUbuntu.patch 1.8.9-4ubuntu1/debian/patches/PlanetUbuntu.patch
--- 1.8.9-4/debian/patches/PlanetUbuntu.patch 1970-01-01 00:00:00.000000000 +0000
+++ 1.8.9-4ubuntu1/debian/patches/PlanetUbuntu.patch 2014-12-24 16:49:15.000000000 +0000
@@ -0,0 +1,11 @@
+Index: blam/collection.xml
+===================================================================
+--- blam.orig/collection.xml 2011-11-13 21:44:35.038912048 +0000
++++ blam/collection.xml 2011-11-13 21:46:39.482006501 +0000
+@@ -13,4 +13,6 @@
+
+
+
++
++
+
diff -pruN 1.8.9-4/debian/patches/series 1.8.9-4ubuntu1/debian/patches/series
--- 1.8.9-4/debian/patches/series 2014-10-14 17:14:26.000000000 +0000
+++ 1.8.9-4ubuntu1/debian/patches/series 2014-12-24 16:49:15.000000000 +0000
@@ -2,3 +2,4 @@
0002-Use-elif.patch
0003-Make-Show-in-browser-a-link-in-the-blam-theme.patch
0004-Use-dbus2.patch
+PlanetUbuntu.patch
diff -pruN 1.8.9-4/.pc/applied-patches 1.8.9-4ubuntu1/.pc/applied-patches
--- 1.8.9-4/.pc/applied-patches 2014-12-24 18:36:27.230355720 +0000
+++ 1.8.9-4ubuntu1/.pc/applied-patches 2014-12-24 18:36:27.450361651 +0000
@@ -2,3 +2,4 @@
0002-Use-elif.patch
0003-Make-Show-in-browser-a-link-in-the-blam-theme.patch
0004-Use-dbus2.patch
+PlanetUbuntu.patch
diff -pruN 1.8.9-4/.pc/PlanetUbuntu.patch/collection.xml 1.8.9-4ubuntu1/.pc/PlanetUbuntu.patch/collection.xml
--- 1.8.9-4/.pc/PlanetUbuntu.patch/collection.xml 1970-01-01 00:00:00.000000000 +0000
+++ 1.8.9-4ubuntu1/.pc/PlanetUbuntu.patch/collection.xml 2014-12-24 18:36:27.000000000 +0000
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+