Changeset 7443

Timestamp:

02/22/11 01:59:02 (2 years ago)

Author:

alanbach-guest

Message:

• Sync'd with Debian 3.32.2-1

Location:

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

Files:

• changelog (modified) (2 diffs)
• control (modified) (6 diffs)
• libgtkhtml-editor-3.14-0.install (added)
• libgtkhtml-editor-3.14-0.shlibs (added)
• libgtkhtml-editor-3.14-common.install (added)
• libgtkhtml-editor-3.14-dev.install (added)
• libgtkhtml-editor-common.install (deleted)
• libgtkhtml-editor-dev.install (deleted)
• libgtkhtml-editor0.install (deleted)
• libgtkhtml-editor0.shlibs (deleted)
• libgtkhtml3.14-19.shlibs (modified) (1 diff)
• rules (modified) (3 diffs)

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

@@ -1 @@
-gtkhtml3.14 (3.32.1-parsix4) unstable; urgency=low
-
-  * Rebuild with new libs
-
- -- Alan Baghumian <alan@technotux.org>  Fri, 04 Feb 2011 20:59:44 -0800
-
-gtkhtml3.14 (3.32.1-parsix3) unstable; urgency=low
-
-  * Fixed libgtkhtml3.14-19.shlibs version numbers
-
- -- Alan Baghumian <alan@technotux.org>  Fri, 14 Jan 2011 09:39:45 -0800
-
-gtkhtml3.14 (3.32.1-parsix2) unstable; urgency=low
-
-  * Rebuild with correct shlibs
-
- -- root <root@buildd>  Thu, 13 Jan 2011 22:18:56 -0800
-
-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:
+gtkhtml3.14 (3.32.2-parsix1) unstable; urgency=low
+
+  * Sync'd with Debian 3.32.2-1
+
+ -- Alan Baghumian <alan@technotux.org>  Mon, 21 Feb 2011 16:58:25 -0800
+
+gtkhtml3.14 (3.32.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/watch updated, remove the call to uupdate.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sat, 12 Feb 2011 21:45:46 +0100
+
+gtkhtml3.14 (3.32.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/watch updated to track 2.32 branch.
   * 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
+    - bump GTK+ build-dep to 2.20
+    - rename libgtkhtml-editor0 package to libgtkhtml-editor-3.14-0 to follow
+      soname change.
+    - add conflicts/replaces to ease transition.
+    - add build-dep on hardening-includes.
+  * debian/rules:
+    - explicitly disable GTK+ 3 support.
+    - add $(API_VER) to libgtkhtml-editor0 name. 
+    - include hardening rules
+    - pick flags from dpkg-buildflags
+    - add hardening flags, -z,defs, -O1 and --as-needed to LDFLAGS
+    - add hardening flags to CFLAGS. 
+  * debian/libgtkhtmleditor*.install renamed and edited to follow soname
+    change.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sat, 12 Feb 2011 20:07:08 +0100
 
 gtkhtml3.14 (3.30.3-1) unstable; urgency=low
@@ -170 +143 @@
   * 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: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian Evolution Maintainers <pkg-evolution-maintainers@lists.alioth.debian.org>
+Maintainer: Debian Evolution Maintainers <pkg-evolution-maintainers@lists.alioth.debian.org>
 Uploaders: Loic Minier <lool@dooz.org>,
            Heikki Henriksen <heikkih@gmail.com>,
@@ -12 +11 @@
 Dm-Upload-Allowed: yes
 Homepage: http://www.gnome.org/projects/evolution/
-Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gtkhtml3.14/ubuntu
+Vcs-Svn: svn://svn.debian.org/svn/pkg-evolution/unstable/gtkhtml3.14
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-evolution/unstable/gtkhtml3.14
 Build-Depends: debhelper (>= 7.2.3~),
                cdbs (>= 0.4.37),
                dpkg-dev (>= 1.14.16),
+               hardening-includes,
                pkg-config,
                libtool,
                intltool (>= 0.36.3),
-               libgail-dev (>= 2.20.0),
+               libgail-dev (>= 1.1.0),
                libgnomeui-dev (>= 2.0.0),
                libpango1.0-dev (>= 1.5),
@@ -38 +39 @@
          ${misc:Depends},
 Suggests: libgtkhtml3.14-dbg
-Replaces: gtkhtml3.14 (<< 3.32.0)
-Conflicts: gtkhtml3.14 (<< 3.32.0)
+Replaces: gtkhtml3.14 (<< 3.16.0)
+Conflicts: gtkhtml3.14 (<< 3.16.0)
 Description: HTML rendering/editing library - runtime files
  GtkHTML is a lightweight HTML rendering/printing/editing engine.
@@ -71 +72 @@
  This package contains the unstripped libraries used for debugging purposes.
 
-Package: libgtkhtml-editor0
+Package: libgtkhtml-editor-3.14-0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libgtkhtml-editor-common (= ${source:Version})
+         libgtkhtml-editor-3.14-common (= ${source:Version})
 Breaks: libgtkhtml3.14 (<< 3.26)
 Description: HTML rendering/editing library - editor widget
@@ -83 +84 @@
  This package contains the editor widget.
 
-Package: libgtkhtml-editor-common
+Package: libgtkhtml-editor-3.14-common
 Section: libs
 Architecture: all
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-Conflicts: gtkhtml3.14
-Replaces: gtkhtml3.14
+Conflicts: gtkhtml3.14, libgtkhtml-editor-common
+Replaces: gtkhtml3.14, libgtkhtml-editor-common
 Description: HTML rendering/editing library - editor widget data
  GtkHTML is a lightweight HTML rendering/printing/editing engine.
@@ -95 +96 @@
  This package contains the editor widget data.
 
-Package: libgtkhtml-editor-dev
+Package: libgtkhtml-editor-3.14-dev
 Architecture: any
 Section: libdevel
 Priority: extra
-Depends: libgtkhtml-editor0 (= ${binary:Version}),
+Depends: libgtkhtml-editor-3.14-0 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}

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.33)
+libgtkhtml-3.14 19 libgtkhtml3.14-19 (>= 3.32.0), libgtkhtml3.14-19 (<< 3.33)

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

@@ -5 +5 @@
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+include /usr/share/hardening-includes/hardening.make
 
 GNOME_MODULE := gtkhtml
@@ -14 +15 @@
 API_VER   := 3.14
 
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-static --disable-deprecated_warning_flags
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
+CFLAGS+=$(HARDENING_CFLAGS)
+
+export CFLAGS LDFLAGS
+
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-static --enable-gtk3=no
 DEB_SHLIBDEPS_INCLUDE_gtkhtml$(API_VER) += $(CURDIR)/debian/libgtkhtml$(API_VER)-$(SOVERSION)/usr/lib
 DEB_DH_MAKESHLIBS_ARGS_gtkhtml$(API_VER) += --noscripts
@@ -24 +32 @@
         $(CURDIR)/debian/libgtkhtml$(API_VER)-$(SOVERSION)/usr/lib/libgtkhtml-$(API_VER).so.$(SOVERSION).$(AGE).$(REVISION)
 
-binary-post-install/libgtkhtml-editor0::
-        chrpath -d -k $(CURDIR)/debian/libgtkhtml-editor0/usr/lib/libgtkhtml-editor-$(API_VER).so.0.0.0 
+binary-post-install/libgtkhtml-editor-$(API_VER)-0::
+        chrpath -d -k $(CURDIR)/debian/libgtkhtml-editor-$(API_VER)-0/usr/lib/libgtkhtml-editor-$(API_VER).so.0.0.0 
 
 common-binary-post-install-indep::