Merge lp:~logan/ubuntu/quantal/conglomerate/debian-merge into lp:ubuntu/quantal/conglomerate

[Logan Rosen]

=== modified file 'debian/changelog'
--- debian/changelog	2009-08-25 20:21:55 +0000
+++ debian/changelog	2012-09-13 18:41:21 +0000
@@ -1,3 +1,19 @@
+conglomerate (0.9.1-3.3ubuntu1) quantal; urgency=low
+
+  * Merge from Debian unstable (LP: #1016032). Remaining change:
+    - debian/patches/remove-gnome-entry-from-desktop.dpatch: Make .desktop
+      files freedesktop compliant
+
+ -- Logan Rosen <[e-mail]>  Thu, 13 Sep 2012 14:35:16 -0400
+
+conglomerate (0.9.1-3.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * fix_duplicate_clone.dpatch: Rename clone functions. (Closes: #666584).
+  * Remove rpath setting in conglomerate binary with chrpath.
+
+ -- Mònica Ramírez Arceda <[e-mail]>  Mon, 07 May 2012 14:03:37 +0200
+
 conglomerate (0.9.1-3.2ubuntu1) karmic; urgency=low
 
   * Merge from debian unstable, remaining changes: LP: #418663

=== modified file 'debian/control'
--- debian/control	2009-08-25 20:21:55 +0000
+++ debian/control	2012-09-13 18:41:21 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Geert Stappers <[e-mail]>
-Build-Depends: debhelper (>> 5.0.0), dpatch, libxml-parser-perl, libbonobo2-dev, libbonoboui2-dev, libenchant-dev, libgnomeui-dev (>= 2.6.1.1-4), libgnomeprintui2.2-dev, libgtksourceview2.0-dev, libxslt1-dev, scrollkeeper, libglade2-dev, autotools-dev
+Build-Depends: debhelper (>> 5.0.0), dpatch, libxml-parser-perl, libbonobo2-dev, libbonoboui2-dev, libenchant-dev, libgnomeui-dev (>= 2.6.1.1-4), libgnomeprintui2.2-dev, libgtksourceview2.0-dev, libxslt1-dev, scrollkeeper, libglade2-dev, autotools-dev, chrpath
 Standards-Version: 3.8.2
 Homepage: http://www.conglomerate.org
 

=== modified file 'debian/patches/00list'
--- debian/patches/00list	2005-04-17 23:15:00 +0000
+++ debian/patches/00list	2012-09-13 18:41:21 +0000
@@ -7,3 +7,4 @@
 # only cosmetic
 package_version.dpatch
 remove-gnome-entry-from-desktop
+fix_duplicate_clone.dpatch

=== added file 'debian/patches/fix_duplicate_clone.dpatch'
--- debian/patches/fix_duplicate_clone.dpatch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix_duplicate_clone.dpatch	2012-09-13 18:41:21 +0000
@@ -0,0 +1,63 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_duplicate_cloned.dpatch by Mònica Ramírez Arceda <[e-mail]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Rename clone functions. (Closes: #666584).
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' conglomerate-0.9.1~/src/cong-editor-line-iter-simple.c conglomerate-0.9.1/src/cong-editor-line-iter-simple.c
+--- conglomerate-0.9.1~/src/cong-editor-line-iter-simple.c	2012-05-07 11:59:34.000000000 +0200
++++ conglomerate-0.9.1/src/cong-editor-line-iter-simple.c	2012-05-07 11:59:37.000000000 +0200
+@@ -26,13 +26,13 @@
+ #include "cong-editor-line-iter-simple.h"
+ 
+ static CongEditorLineIter*
+-clone (CongEditorLineIter *line_iter);
++congclone (CongEditorLineIter *line_iter);
+ 
+ static CongEditorAreaLine*
+ get_line (CongEditorLineIter *line_iter);
+ 
+ CONG_DEFINE_CLASS_PUBLIC_DATA (CongEditorLineIterSimple, cong_editor_line_iter_simple, CONG_EDITOR_LINE_ITER_SIMPLE, CongEditorLineIter, CONG_EDITOR_LINE_ITER_TYPE, 
+-			       CONG_EDITOR_LINE_ITER_CLASS (klass)->clone = clone;
++			       CONG_EDITOR_LINE_ITER_CLASS (klass)->clone = congclone;
+ 			       CONG_EDITOR_LINE_ITER_CLASS (klass)->get_line = get_line;)
+ 
+ CONG_DEFINE_EMPTY_DISPOSE(cong_editor_line_iter_simple)
+@@ -58,7 +58,7 @@
+ }
+ 
+ static CongEditorLineIter*
+-clone (CongEditorLineIter *line_iter)
++congclone (CongEditorLineIter *line_iter)
+ {
+ 	CongEditorLineIterSimple* simple_iter = CONG_EDITOR_LINE_ITER_SIMPLE (line_iter);
+ 	CongEditorLineIterSimple* new_iter;
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' conglomerate-0.9.1~/src/cong-editor-line-iter-span-wrapper.c conglomerate-0.9.1/src/cong-editor-line-iter-span-wrapper.c
+--- conglomerate-0.9.1~/src/cong-editor-line-iter-span-wrapper.c	2004-11-04 20:18:48.000000000 +0100
++++ conglomerate-0.9.1/src/cong-editor-line-iter-span-wrapper.c	2012-05-07 12:00:46.642532680 +0200
+@@ -26,13 +26,13 @@
+ #include "cong-editor-line-iter-span-wrapper.h"
+ 
+ static CongEditorLineIter*
+-clone (CongEditorLineIter *line_iter);
++congclone (CongEditorLineIter *line_iter);
+ 
+ static CongEditorAreaLine*
+ get_line (CongEditorLineIter *line_iter);
+ 
+ CONG_DEFINE_CLASS_PUBLIC_DATA (CongEditorLineIterSpanWrapper, cong_editor_line_iter_span_wrapper, CONG_EDITOR_LINE_ITER_SPAN_WRAPPER, CongEditorLineIter, CONG_EDITOR_LINE_ITER_TYPE, 
+-			       CONG_EDITOR_LINE_ITER_CLASS (klass)->clone = clone;
++			       CONG_EDITOR_LINE_ITER_CLASS (klass)->clone = congclone;
+ 			       CONG_EDITOR_LINE_ITER_CLASS (klass)->get_line = get_line;)
+ 
+ /* Implementation of CongLineEditorIterSpanWrapper: */
+@@ -80,7 +80,7 @@
+ }
+ 
+ static CongEditorLineIter*
+-clone (CongEditorLineIter *line_iter)
++congclone (CongEditorLineIter *line_iter)
+ {
+ 	CongEditorLineIterSpanWrapper* span_wrapper_iter = CONG_EDITOR_LINE_ITER_SPAN_WRAPPER (line_iter);
+ 	CongEditorLineIterSpanWrapper* new_iter;

=== modified file 'debian/rules'
--- debian/rules	2009-08-25 20:21:55 +0000
+++ debian/rules	2012-09-13 18:41:21 +0000
@@ -116,6 +116,7 @@
 	dh_clean -k -s
 	dh_installdirs -s
 
+	chrpath -d src/conglomerate
 	install -m 755 src/conglomerate $(CURDIR)/debian/conglomerate/usr/bin/conglomerate
 
 	install -m 644 debian/conglomerate.lintian-override $(CURDIR)/debian/conglomerate/usr/share/lintian/overrides/conglomerate