Index: /pkg/boss/main/libgtkhtml2/trunk/debian/libgtkhtml2-dev.links =================================================================== --- /pkg/boss/main/libgtkhtml2/trunk/debian/libgtkhtml2-dev.links (revision 4325) +++ /pkg/boss/main/libgtkhtml2/trunk/debian/libgtkhtml2-dev.links (revision 4325) @@ -0,0 +1,1 @@ +usr/share/doc/libgtkhtml2-0 usr/share/doc/libgtkhtml2-dev Index: /pkg/boss/main/libgtkhtml2/trunk/debian/control =================================================================== --- /pkg/boss/main/libgtkhtml2/trunk/debian/control (revision 4324) +++ /pkg/boss/main/libgtkhtml2/trunk/debian/control (revision 4325) @@ -3,25 +3,59 @@ Priority: optional Maintainer: Debian GNOME Maintainers -Uploaders: Loic Minier , Sebastien Bacher -Standards-Version: 3.7.2 -Build-Depends: debhelper (>= 5), gettext (>= 0.10.38), libxml2-dev (>= 2.4.16), libgail-dev (>= 1.4), libgtk2.0-dev (>= 2.2), libgnomevfs2-dev (>= 1.9.8), gnome-pkg-tools (>= 0.11), autotools-dev +Uploaders: Debian GNOME Maintainers , Josselin Mouette , Loic Minier , Sebastien Bacher +Standards-Version: 3.8.0.1 +Build-Depends: debhelper (>= 5), + gettext (>= 0.10.38), + libxml2-dev (>= 2.4.16), + libgtk2.0-dev (>= 2.13), + libgnomevfs2-dev (>= 1.9.8), + gnome-pkg-tools (>= 0.11), + autotools-dev Package: libgtkhtml2-0 Architecture: any Section: libs -Depends: ${misc:Depends}, ${shlibs:Depends} -Description: HTML rendering/editing library - runtime files. (for GNOME2) - This is GtkHTML, a lightweight HTML rendering/printing/editing engine. It - was originally based on KHTMLW, but is now being developed independently. +Depends: ${misc:Depends}, + ${shlibs:Depends} +Description: HTML rendering/editing library - runtime files + GtkHTML is a lightweight engine to render, print and edit HTML. It was + originally based on kHTML, but is now being developed independently. . - This package is a part of GNOME2 + This is version 2 of GtkHTML, which is now developed independently of + GtkHTML 3. + . + This package contains the runtime files needed by packages using + GtkHTML. + +Package: libgtkhtml2-dbg +Architecture: any +Section: libs +Priority: extra +Depends: ${misc:Depends}, + libgtkhtml2-0 (= ${binary:Version}), + ${shlibs:Depends} +Description: HTML rendering/editing library - detached debugging symbols + GtkHTML is a lightweight engine to render, print and edit HTML. It was + originally based on kHTML, but is now being developed independently. + . + This is version 2 of GtkHTML, which is now developed independently of + GtkHTML 3. + . + This package contains the detached debugging symbols. Package: libgtkhtml2-dev Architecture: any Section: libdevel -Depends: ${misc:Depends}, libgtkhtml2-0 (= ${Source-Version}), libxml2-dev, libgail-dev (>= 1.2) -Description: HTML rendering/editing library - development files. for (GNOME2) - This is GtkHTML, a lightweight HTML rendering/printing/editing engine. It - was originally based on KHTMLW, but is now being developed independently. +Depends: ${misc:Depends}, + libgtkhtml2-0 (= ${binary:Version}), + libxml2-dev +Replaces: libgtkhtml2-0 (<< 2.11.1-1) +Description: HTML rendering/editing library - development files + GtkHTML is a lightweight engine to render, print and edit HTML. It was + originally based on kHTML, but is now being developed independently. . - This package is a part of GNOME2 + This is version 2 of GtkHTML, which is now developed independently of + GtkHTML 3. + . + This package contains the development files needed to build packages + using GtkHTML. Index: /pkg/boss/main/libgtkhtml2/trunk/debian/libgtkhtml2-dev.preinst =================================================================== --- /pkg/boss/main/libgtkhtml2/trunk/debian/libgtkhtml2-dev.preinst (revision 4324) +++ /pkg/boss/main/libgtkhtml2/trunk/debian/libgtkhtml2-dev.preinst (revision 4325) @@ -2,8 +2,6 @@ if [ -L /usr/share/doc/libgtkhtml2-dev ]; then - rm /usr/share/doc/libgtkhtml2-dev + rm -f /usr/share/doc/libgtkhtml2-dev fi #DEBHELPER# - -exit 0 Index: /pkg/boss/main/libgtkhtml2/trunk/debian/control.in =================================================================== --- /pkg/boss/main/libgtkhtml2/trunk/debian/control.in (revision 4324) +++ /pkg/boss/main/libgtkhtml2/trunk/debian/control.in (revision 4325) @@ -4,24 +4,58 @@ Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ -Standards-Version: 3.7.2 -Build-Depends: debhelper (>= 5), gettext (>= 0.10.38), libxml2-dev (>= 2.4.16), libgail-dev (>= 1.4), libgtk2.0-dev (>= 2.2), libgnomevfs2-dev (>= 1.9.8), gnome-pkg-tools (>= 0.11), autotools-dev +Standards-Version: 3.8.0.1 +Build-Depends: debhelper (>= 5), + gettext (>= 0.10.38), + libxml2-dev (>= 2.4.16), + libgtk2.0-dev (>= 2.13), + libgnomevfs2-dev (>= 1.9.8), + gnome-pkg-tools (>= 0.11), + autotools-dev Package: libgtkhtml2-@SONAME@ Architecture: any Section: libs -Depends: ${misc:Depends}, ${shlibs:Depends} -Description: HTML rendering/editing library - runtime files. (for GNOME2) - This is GtkHTML, a lightweight HTML rendering/printing/editing engine. It - was originally based on KHTMLW, but is now being developed independently. +Depends: ${misc:Depends}, + ${shlibs:Depends} +Description: HTML rendering/editing library - runtime files + GtkHTML is a lightweight engine to render, print and edit HTML. It was + originally based on kHTML, but is now being developed independently. . - This package is a part of GNOME2 + This is version 2 of GtkHTML, which is now developed independently of + GtkHTML 3. + . + This package contains the runtime files needed by packages using + GtkHTML. + +Package: libgtkhtml2-dbg +Architecture: any +Section: libs +Priority: extra +Depends: ${misc:Depends}, + libgtkhtml2-@SONAME@ (= ${binary:Version}), + ${shlibs:Depends} +Description: HTML rendering/editing library - detached debugging symbols + GtkHTML is a lightweight engine to render, print and edit HTML. It was + originally based on kHTML, but is now being developed independently. + . + This is version 2 of GtkHTML, which is now developed independently of + GtkHTML 3. + . + This package contains the detached debugging symbols. Package: libgtkhtml2-dev Architecture: any Section: libdevel -Depends: ${misc:Depends}, libgtkhtml2-@SONAME@ (= ${Source-Version}), libxml2-dev, libgail-dev (>= 1.2) -Description: HTML rendering/editing library - development files. for (GNOME2) - This is GtkHTML, a lightweight HTML rendering/printing/editing engine. It - was originally based on KHTMLW, but is now being developed independently. +Depends: ${misc:Depends}, + libgtkhtml2-@SONAME@ (= ${binary:Version}), + libxml2-dev +Replaces: libgtkhtml2-@SONAME@ (<< 2.11.1-1) +Description: HTML rendering/editing library - development files + GtkHTML is a lightweight engine to render, print and edit HTML. It was + originally based on kHTML, but is now being developed independently. . - This package is a part of GNOME2 + This is version 2 of GtkHTML, which is now developed independently of + GtkHTML 3. + . + This package contains the development files needed to build packages + using GtkHTML. Index: /pkg/boss/main/libgtkhtml2/trunk/debian/libgtkhtml2-0.install =================================================================== --- /pkg/boss/main/libgtkhtml2/trunk/debian/libgtkhtml2-0.install (revision 4325) +++ /pkg/boss/main/libgtkhtml2/trunk/debian/libgtkhtml2-0.install (revision 4325) @@ -0,0 +1,1 @@ +usr/lib/*.so.* Index: /pkg/boss/main/libgtkhtml2/trunk/debian/changelog =================================================================== --- /pkg/boss/main/libgtkhtml2/trunk/debian/changelog (revision 4324) +++ /pkg/boss/main/libgtkhtml2/trunk/debian/changelog (revision 4325) @@ -1,2 +1,9 @@ +libgtkhtml2 (2.11.1-parsix2) unstable; urgency=low + + * Merged updates from Ubuntu 2.11.1-2ubuntu1 + * Bump standards version to 3.8.0.1 + + -- Alan Baghumian Fri, 31 Oct 2008 19:34:47 -0700 + libgtkhtml2 (2.11.1-parsix1) barry; urgency=low Index: /pkg/boss/main/libgtkhtml2/trunk/debian/rules =================================================================== --- /pkg/boss/main/libgtkhtml2/trunk/debian/rules (revision 4324) +++ /pkg/boss/main/libgtkhtml2/trunk/debian/rules (revision 4325) @@ -20,5 +20,5 @@ build: build-stamp -build-stamp: configure +build-stamp: configure-stamp dh_testdir $(MAKE) @@ -29,5 +29,5 @@ dh_testroot rm -f *-stamp - if [ -f Makefile ]; then $(MAKE) distclean; fi + [ ! -f Makefile ] || $(MAKE) distclean dh_clean sed -e 's#@SONAME@#$(SONAME)#g' \ @@ -35,35 +35,31 @@ debian/control.in >debian/control -install: build +install: install-stamp +install-stamp: build-stamp dh_testdir dh_testroot dh_clean - dh_installdirs - $(MAKE) install prefix=$(CURDIR)/debian/$(LIB_PKG)/usr - dh_movefiles --sourcedir=debian/$(LIB_PKG) - find debian -type d | xargs rmdir -p --ignore-fail-on-non-empty - touch install-stamp + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp -binary-indep: build install +binary-indep: install -binary-arch: build install +binary-arch: install dh_testdir dh_testroot + dh_install -s --sourcedir=debian/tmp dh_installdocs -p$(LIB_PKG) - dh_installman - dh_installchangelogs ChangeLog - rm -rv debian/libgtkhtml2-dev/usr/share/doc/* - dh_link -plibgtkhtml2-dev /usr/share/doc/$(LIB_PKG) \ - /usr/share/doc/libgtkhtml2-dev - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs -p$(LIB_PKG) -V - dh_installdeb - dh_shlibdeps -ldebian/$(LIB_PKG)/usr/lib - dh_gencontrol - dh_md5sums - dh_builddeb + dh_installman -s + dh_installchangelogs -p$(LIB_PKG) ChangeLog + dh_link -s + dh_strip -s --dbg-package=libgtkhtml2-dbg + dh_compress -s + dh_fixperms -s + dh_makeshlibs -s -V + dh_installdeb -s + dh_shlibdeps -s -ldebian/$(LIB_PKG)/usr/lib + dh_gencontrol -s + dh_md5sums -s + dh_builddeb -s binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +.PHONY: configure build clean install binary-indep binary-arch binary Index: /pkg/boss/main/libgtkhtml2/trunk/debian/libgtkhtml2-dbg.links =================================================================== --- /pkg/boss/main/libgtkhtml2/trunk/debian/libgtkhtml2-dbg.links (revision 4325) +++ /pkg/boss/main/libgtkhtml2/trunk/debian/libgtkhtml2-dbg.links (revision 4325) @@ -0,0 +1,1 @@ +usr/share/doc/libgtkhtml2-0 usr/share/doc/libgtkhtml2-dbg Index: /pkg/boss/main/libgtkhtml2/trunk/debian/libgtkhtml2-dev.install =================================================================== --- /pkg/boss/main/libgtkhtml2/trunk/debian/libgtkhtml2-dev.install (revision 4325) +++ /pkg/boss/main/libgtkhtml2/trunk/debian/libgtkhtml2-dev.install (revision 4325) @@ -0,0 +1,4 @@ +usr/include +usr/lib/*.so +usr/lib/*.a +usr/lib/pkgconfig