Changeset 7117 for pkg/raul/main/gtkhtml3.14/trunk

Timestamp:

01/14/11 02:46:17 (2 years ago)

Author:

alanbach-guest

Message:

• Sync'd with Ubuntu 3.32.1-0ubuntu1

Location:

pkg/raul/main/gtkhtml3.14/trunk/debian

Files:

• changelog (modified) (2 diffs)
• control (modified) (4 diffs)
• libgtkhtml-editor-dev.install (modified) (1 diff)
• libgtkhtml-editor0.shlibs (modified) (1 diff)
• libgtkhtml3.14-19.shlibs (modified) (1 diff)
• rules (modified) (2 diffs)
• source (added)
• source/format (added)
• watch (modified) (1 diff)

pkg/raul/main/gtkhtml3.14/trunk/debian/changelog

@@ -1 @@
-gtkhtml3.14 (3.30.3-parsix1) unstable; urgency=low
-
-  * New upstream stable release
-
- -- Alan Baghumian <alan@technotux.org>  Sat, 21 Aug 2010 13:46:59 -0700
-
-gtkhtml3.14 (3.30.2-parsix1) unstable; urgency=low
-
-  * Sync'd with Debian 3.30.2-1
-
- -- Alan Baghumian <alan@technotux.org>  Sun, 04 Jul 2010 10:43:20 -0700
+gtkhtml3.14 (3.32.1-parsix1) unstable; urgency=low
+
+  * Sync'd with Ubuntu 3.32.1-0ubuntu1
+
+ -- Alan Baghumian <alan@technotux.org>  Thu, 13 Jan 2011 17:45:12 -0800
+
+gtkhtml3.14 (3.32.1-0ubuntu1) natty; urgency=low
+
+  * New upstream release
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Fri, 26 Nov 2010 11:14:46 +1100
+
+gtkhtml3.14 (3.32.0-0ubuntu1) natty; urgency=low
+
+  * New upstream release 3.32.0
+    - Crash after closing inline view of text attachment (LP: #178959, #284060)
+    - Translations not working in Emoticons, Find/Replace dialogs (LP: #562633)
+  * debian/patches/gtkhtml3.14_ftbfs.patch: dropped.
+  * debian/rules: append API_VER for libgtkhtml-editor chrpath as well
+  * debian/libgtkhtml-editor-dev.install: append api version to pkgconfig
+    file name.
+  * debian/*.shlibs: update shlibs files for new version with same soname, also
+    rename libgtkhtml-editor to libgtkhtml-editor-3.14
+  * debian/control: Replaces/Conflicts gtkhtml3.14 (<< 3.32.0)
+  * debian/control: bump libgtk2.0-dev and libgail-dev Build-Depends to 2.20
+  * debian/rules: disable deprecation warnings so the build completes
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Tue, 02 Nov 2010 14:34:48 -0400
+
+gtkhtml3.14 (1:3.30.3-1ubuntu1) maverick; urgency=low
+
+  * Merge with Debian unstable. Remaining Ubuntu changes:
+  * debian/control:
+    - Add Vcs-Bzr link
+  * debian/libgtkhtml-editor0.shlibs:
+  * debian/libgtkhtml3.14-19.shlibs:
+    - Add epoch (accidentally added in Ubuntu)
+  * debian/patches/gtkhtml3.14_ftbfs.diff:
+    - Build without DGTK_DISABLE_DEPRECATED to fix FTBFS
+  * debian/watch:
+    - Watch for unstable versions
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Wed, 25 Aug 2010 14:22:37 +1000
+
+gtkhtml3.14 (3.30.3-1) unstable; urgency=low
+
+  * New upstream bugfix release, don't bump shlibs.
+  * debian/control:
+    - update standards version to 3.9.1.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sat, 14 Aug 2010 13:47:26 +0200
 
 gtkhtml3.14 (3.30.2-1) unstable; urgency=low
@@ -112 +152 @@
   * debian/rules:
     - force build of static libs.
+
   [3.29.2]
   * New upstream release. 
 
  -- Yves-Alexis Perez <corsac@debian.org>  Mon, 16 Nov 2009 21:52:56 +0100
-
-gtkhtml3.14 (3.28.3-1) unstable; urgency=low
-
-  * New upstream bugfix release.
-  * debian/control: 
-    - update standards version to 3.8.4.
-
- -- Yves-Alexis Perez <corsac@debian.org>  Mon, 01 Mar 2010 18:16:55 +0100
-
-gtkhtml3.14 (3.28.2-2) unstable; urgency=low
-
-  * debian/patches:
-    - 01_restore-gc-fill-style added, fix draw_spell_error() not restoring GC
-      fill style. Thanks Michel DÀnzer.                         closes: #562483
-
- -- Yves-Alexis Perez <corsac@debian.org>  Mon, 28 Dec 2009 11:08:20 +0100
-
-gtkhtml3.14 (3.28.2-1) unstable; urgency=low
-
-  * New upstream bugfix release.
-
- -- Yves-Alexis Perez <corsac@debian.org>  Tue, 15 Dec 2009 08:35:11 +0100
 
 gtkhtml3.14 (3.28.1-1) unstable; urgency=low

pkg/raul/main/gtkhtml3.14/trunk/debian/control

@@ -2 +2 @@
 Section: gnome
 Priority: optional
-Maintainer: Debian Evolution Maintainers <pkg-evolution-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Evolution Maintainers <pkg-evolution-maintainers@lists.alioth.debian.org>
 Uploaders: Loic Minier <lool@dooz.org>,
            Heikki Henriksen <heikkih@gmail.com>,
@@ -8 +9 @@
            Pedro Fragoso <ember@ubuntu.com>,
            Yves-Alexis Perez <corsac@debian.org>
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Dm-Upload-Allowed: yes
 Homepage: http://www.gnome.org/projects/evolution/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-evolution/unstable/gtkhtml3.14
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-evolution/unstable/gtkhtml3.14
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gtkhtml3.14/ubuntu
 Build-Depends: debhelper (>= 7.2.3~),
                cdbs (>= 0.4.37),
@@ -19 +19 @@
                libtool,
                intltool (>= 0.36.3),
-               libgail-dev (>= 1.1.0),
+               libgail-dev (>= 2.20.0),
                libgnomeui-dev (>= 2.0.0),
                libpango1.0-dev (>= 1.5),
                liborbit2-dev,
                libsoup2.4-dev,
-               libgtk2.0-dev (>= 2.18.0),
+               libgtk2.0-dev (>= 2.20.0),
                gnome-icon-theme (>= 1.2.0),
                gnome-pkg-tools,
@@ -38 +38 @@
          ${misc:Depends},
 Suggests: libgtkhtml3.14-dbg
-Replaces: gtkhtml3.14 (<< 3.16.0)
-Conflicts: gtkhtml3.14 (<< 3.16.0)
+Replaces: gtkhtml3.14 (<< 3.32.0)
+Conflicts: gtkhtml3.14 (<< 3.32.0)
 Description: HTML rendering/editing library - runtime files
  GtkHTML is a lightweight HTML rendering/printing/editing engine.

pkg/raul/main/gtkhtml3.14/trunk/debian/libgtkhtml-editor-dev.install

@@ -2 +2 @@
 debian/tmp/usr/lib/libgtkhtml-editor*.a
 debian/tmp/usr/lib/libgtkhtml-editor*.so
-debian/tmp/usr/lib/pkgconfig/gtkhtml-editor.pc
+debian/tmp/usr/lib/pkgconfig/gtkhtml-editor-3.14.pc

pkg/raul/main/gtkhtml3.14/trunk/debian/libgtkhtml-editor0.shlibs

@@ -1 @@
-libgtkhtml-editor 0 libgtkhtml-editor0 (>= 3.30.2), libgtkhtml-editor0 (<< 3.31)
+libgtkhtml-editor-3.14 0 libgtkhtml-editor0 (>= 1:3.30.2), libgtkhtml-editor0 (<< 1:3.33)

pkg/raul/main/gtkhtml3.14/trunk/debian/libgtkhtml3.14-19.shlibs

@@ -1 @@
-libgtkhtml-3.14 19 libgtkhtml3.14-19 (>= 3.30.2), libgtkhtml3.14-19 (<< 3.31)
+libgtkhtml-3.14 19 libgtkhtml3.14-19 (>= 1:3.30.2), libgtkhtml3.14-19 (<< 1:3.33)

pkg/raul/main/gtkhtml3.14/trunk/debian/rules

@@ -14 +14 @@
 API_VER   := 3.14
 
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-static
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-static --disable-deprecated_warning_flags
 DEB_SHLIBDEPS_INCLUDE_gtkhtml$(API_VER) += $(CURDIR)/debian/libgtkhtml$(API_VER)-$(SOVERSION)/usr/lib
 DEB_DH_MAKESHLIBS_ARGS_gtkhtml$(API_VER) += --noscripts
@@ -25 +25 @@
 
 binary-post-install/libgtkhtml-editor0::
-        chrpath -d -k $(CURDIR)/debian/libgtkhtml-editor0/usr/lib/libgtkhtml-editor.so.0.0.0 
+        chrpath -d -k $(CURDIR)/debian/libgtkhtml-editor0/usr/lib/libgtkhtml-editor-$(API_VER).so.0.0.0 
 
 common-binary-post-install-indep::

pkg/raul/main/gtkhtml3.14/trunk/debian/watch

@@ -1 +1 @@
 version=3
-http://ftp.gnome.org/pub/gnome/sources/gtkhtml/([\d\.]+)[02468]/gtkhtml-([\d\.]+)\.tar\.gz debian uupdate
+http://ftp.gnome.org/pub/GNOME/sources/gtkhtml/([\d\.]+[02468])/gtkhtml-([\d\.]+)\.tar\.gz  debian  uupdate