Merging from U. Desktop

6 files changed, 77 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index fa511c5..becf54c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,21 @@
-libindicator (0.4.1-0ubuntu1~ppa1) oneiric; urgency=low
+libindicator (0.4.1-1ubuntu1) UNRELEASED; urgency=low
+
+  * debian/control
+    - set ubuntu-desktop VCS and maintainer
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 22 Nov 2011 14:39:15 -0500
+
+libindicator (0.4.1-1) experimental; urgency=low
+
+  * Merge from Ubuntu.
+    + Re-enable GTK3 packages.
+    + Link to libm to prevent FTBFS.
+      Closes: #640459
+  * Set single-debian-patch in debian/source/options.
+
+ -- Evgeni Golov <evgeni@debian.org>  Sun, 02 Oct 2011 15:08:46 +0200
+
+libindicator (0.4.1-0ubuntu1) oneiric; urgency=low
 
   * New upstream release.
     * Ensure loader doesn't use menu proxy
@@ -77,6 +94,12 @@ libindicator (0.3.90-0ubuntu1) oneiric; urgency=low
 
  -- Ken VanDine <ken.vandine@canonical.com>  Thu, 07 Jul 2011 10:18:04 -0400
 
+libindicator (0.3.22-1) unstable; urgency=low
+
+  * Merge new upstream from Ubuntu.
+
+ -- Evgeni Golov <evgeni@debian.org>  Tue, 29 Mar 2011 10:07:03 +0200
+
 libindicator (0.3.22-0ubuntu2) oneiric; urgency=low
 
   * debian/libindicator3-dev.install
@@ -95,6 +118,16 @@ libindicator (0.3.22-0ubuntu1) natty; urgency=low
 
  -- Ted Gould <ted@ubuntu.com>  Wed, 23 Mar 2011 13:21:49 -0500
 
+libindicator (0.3.21-1) unstable; urgency=low
+
+  * Merge new upstream from Ubuntu.
+  * debian/control:
+    + Improve descriptions of the GTK3 packages.
+    + Standards-Version: 3.9.1
+  * Disable GTK3 packages until libgtk-3-dev is in unstable.
+
+ -- Evgeni Golov <evgeni@debian.org>  Sun, 20 Mar 2011 15:58:35 +0100
+
 libindicator (0.3.21-0ubuntu1) natty; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes
new file mode 100644
index 0000000..91e0322
--- /dev/null
+++ b/debian/patches/debian-changes
@@ -0,0 +1,40 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ libindicator (0.4.1-1) experimental; urgency=low
+ .
+   * Merge from Ubuntu.
+     + Re-enable GTK3 packages.
+     + Link to libm to prevent FTBFS.
+       Closes: #640459
+   * Set single-debian-patch in debian/source/options.
+Author: Evgeni Golov <evgeni@debian.org>
+Bug-Debian: http://bugs.debian.org/640459
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- libindicator-0.4.1.orig/tools/Makefile.am
++++ libindicator-0.4.1/tools/Makefile.am
+@@ -19,6 +19,7 @@ indicator_loader_SOURCES = \
+ indicator_loader_CFLAGS = \
+ 	-Wall -Werror \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \
++        -Wall -Werror \
+ 	-DBUILD_DIR="\"$(builddir)\""
+ 
+ indicator_loader_LDADD = \
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7bb8252
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+debian-changes
diff --git a/debian/rules b/debian/rules
index 66b1948..da650c3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,4 +23,3 @@ debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3)
 common-install-arch::
 	find debian/tmp -name \*.la -delete
 	cd po; intltool-update --pot --verbose
-
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..7423a2d
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1 @@
+single-debian-patch