r1803 - /unstable/gtkhtml3.14/debian/

corsac at users.alioth.debian.org corsac at users.alioth.debian.org
Sun Feb 6 13:17:06 UTC 2011 

Author: corsac
Date: Sun Feb  6 13:16:56 2011
New Revision: 1803

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1803
Log:
merge experimental changes into unstable

Added:
    unstable/gtkhtml3.14/debian/libgtkhtml-editor-3.14-0.install
      - copied unchanged from r1802, experimental/gtkhtml3.14/debian/libgtkhtml-editor-3.14-0.install
    unstable/gtkhtml3.14/debian/libgtkhtml-editor-3.14-0.shlibs
      - copied unchanged from r1802, experimental/gtkhtml3.14/debian/libgtkhtml-editor-3.14-0.shlibs
    unstable/gtkhtml3.14/debian/libgtkhtml-editor-3.14-common.install
      - copied unchanged from r1802, experimental/gtkhtml3.14/debian/libgtkhtml-editor-3.14-common.install
    unstable/gtkhtml3.14/debian/libgtkhtml-editor-3.14-dev.install
      - copied unchanged from r1802, experimental/gtkhtml3.14/debian/libgtkhtml-editor-3.14-dev.install
Removed:
    unstable/gtkhtml3.14/debian/libgtkhtml-editor-common.install
    unstable/gtkhtml3.14/debian/libgtkhtml-editor-dev.install
    unstable/gtkhtml3.14/debian/libgtkhtml-editor0.install
    unstable/gtkhtml3.14/debian/libgtkhtml-editor0.shlibs
Modified:
    unstable/gtkhtml3.14/debian/changelog
    unstable/gtkhtml3.14/debian/control
    unstable/gtkhtml3.14/debian/libgtkhtml3.14-19.shlibs
    unstable/gtkhtml3.14/debian/rules
    unstable/gtkhtml3.14/debian/watch

Modified: unstable/gtkhtml3.14/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/gtkhtml3.14/debian/changelog?rev=1803&op=diff
==============================================================================
--- unstable/gtkhtml3.14/debian/changelog (original)
+++ unstable/gtkhtml3.14/debian/changelog Sun Feb  6 13:16:56 2011
@@ -1,3 +1,25 @@
+gtkhtml3.14 (3.32.1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * debian/watch updated to track 2.32 branch.
+  * debian/control:
+    - 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 at debian.org>  Mon, 18 Oct 2010 16:21:08 +0200
+
 gtkhtml3.14 (3.30.3-1) unstable; urgency=low
 
   * New upstream bugfix release, don't bump shlibs.

Modified: unstable/gtkhtml3.14/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/gtkhtml3.14/debian/control?rev=1803&op=diff
==============================================================================
--- unstable/gtkhtml3.14/debian/control (original)
+++ unstable/gtkhtml3.14/debian/control Sun Feb  6 13:16:56 2011
@@ -15,6 +15,7 @@
 Build-Depends: debhelper (>= 7.2.3~),
                cdbs (>= 0.4.37),
                dpkg-dev (>= 1.14.16),
+               hardening-includes,
                pkg-config,
                libtool,
                intltool (>= 0.36.3),
@@ -23,7 +24,7 @@
                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,
                chrpath,
@@ -70,35 +71,35 @@
  .
  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
  GtkHTML is a lightweight HTML rendering/printing/editing engine.
  .
  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.
  .
  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}
 Description: HTML rendering/editing library - editor widget development files

Modified: unstable/gtkhtml3.14/debian/libgtkhtml3.14-19.shlibs
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/gtkhtml3.14/debian/libgtkhtml3.14-19.shlibs?rev=1803&op=diff
==============================================================================
--- unstable/gtkhtml3.14/debian/libgtkhtml3.14-19.shlibs (original)
+++ unstable/gtkhtml3.14/debian/libgtkhtml3.14-19.shlibs Sun Feb  6 13:16:56 2011
@@ -1,1 +1,1 @@
-libgtkhtml-3.14 19 libgtkhtml3.14-19 (>= 3.30.2), libgtkhtml3.14-19 (<< 3.31)
+libgtkhtml-3.14 19 libgtkhtml3.14-19 (>= 3.32.0), libgtkhtml3.14-19 (<< 3.33)

Modified: unstable/gtkhtml3.14/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/gtkhtml3.14/debian/rules?rev=1803&op=diff
==============================================================================
--- unstable/gtkhtml3.14/debian/rules (original)
+++ unstable/gtkhtml3.14/debian/rules Sun Feb  6 13:16:56 2011
@@ -4,6 +4,7 @@
 include /usr/share/cdbs/1/class/autotools.mk
 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
 
@@ -13,7 +14,14 @@
 SOVERSION := $(shell expr $(CURRENT) - $(AGE))
 API_VER   := 3.14
 
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-static
+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
 DEB_SHLIBDEPS_INCLUDE_libgtkhtml$(API_VER)-dev += $(CURDIR)/debian/libgtkhtml$(API_VER)-$(SOVERSION)/usr/lib
@@ -23,8 +31,8 @@
 	chrpath -d -k \
 	$(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.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::
 	dh_bugfiles -A

Modified: unstable/gtkhtml3.14/debian/watch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/gtkhtml3.14/debian/watch?rev=1803&op=diff
==============================================================================
--- unstable/gtkhtml3.14/debian/watch (original)
+++ unstable/gtkhtml3.14/debian/watch Sun Feb  6 13:16:56 2011
@@ -1,2 +1,2 @@
 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]\.[\d]+[02468])/gtkhtml-([\d\.]+)\.tar\.gz debian uupdate

More information about the pkg-evolution-commits mailing list