r26202 - in /desktop/experimental/pango1.0/debian: ./ defoma/

pochu at users.alioth.debian.org pochu at users.alioth.debian.org
Tue Jan 11 02:31:00 UTC 2011


Author: pochu
Date: Tue Jan 11 02:31:00 2011
New Revision: 26202

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26202
Log:
Drop defoma support since it's going away. Closes: #540984.

Removed:
    desktop/experimental/pango1.0/debian/README.Defoma
    desktop/experimental/pango1.0/debian/defoma/
    desktop/experimental/pango1.0/debian/libpango1.0-common.dirs
    desktop/experimental/pango1.0/debian/libpango1.0-common.docs
    desktop/experimental/pango1.0/debian/libpango1.0-common.install
    desktop/experimental/pango1.0/debian/libpango1.0-common.manpages
    desktop/experimental/pango1.0/debian/libpango1.0-common.postinst
    desktop/experimental/pango1.0/debian/libpango1.0-common.postrm
    desktop/experimental/pango1.0/debian/libpango1.0-common.preinst.in
    desktop/experimental/pango1.0/debian/libpango1.0-common.prerm
    desktop/experimental/pango1.0/debian/libpango1.0-doc.postinst.in
    desktop/experimental/pango1.0/debian/pango.defoma
    desktop/experimental/pango1.0/debian/update-pangox-aliases
    desktop/experimental/pango1.0/debian/update-pangox-aliases.8
    desktop/experimental/pango1.0/debian/update-pangox-aliases.fr.8
Modified:
    desktop/experimental/pango1.0/debian/changelog
    desktop/experimental/pango1.0/debian/control
    desktop/experimental/pango1.0/debian/control.in
    desktop/experimental/pango1.0/debian/rules

Modified: desktop/experimental/pango1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/changelog?rev=26202&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/pango1.0/debian/changelog [utf-8] Tue Jan 11 02:31:00 2011
@@ -4,6 +4,7 @@
   * Switch to CDBS with its awesome flavors support.
   * Stop symlinking /usr/share/doc/$pkg directories.
   * Abort the build if the test suite doesn't pass.
+  * Drop defoma support since it's going away. Closes: #540984.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Tue, 11 Jan 2011 01:20:27 +0000
 

Modified: desktop/experimental/pango1.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/control?rev=26202&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/control [utf-8] (original)
+++ desktop/experimental/pango1.0/debian/control [utf-8] Tue Jan 11 02:31:00 2011
@@ -4,22 +4,19 @@
 Maintainer: Sebastien Bacher <seb128 at debian.org>
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: debhelper (>= 5.0.22),
+               cdbs (>= 0.4.90~),
+               gnome-pkg-tools (>= 0.11),
+               autotools-dev,
+               perl,
                libfreetype6-dev (>= 2.1.7),
                libx11-dev (>= 2:1.3.3-2),
                libxrender-dev (>= 1:0.9.0.2-2),
                libxt-dev,
                libglib2.0-dev (>= 2.27.0),
                pkg-config,
-               defoma (>= 0.11.1),
                libxft-dev (>= 2.1.14-2),
                libfontconfig1-dev (>= 2.5.0),
-               autotools-dev,
-               po-debconf,
-               gnome-pkg-tools (>= 0.11),
                libcairo2-dev (>= 1.8.10-3),
-               perl,
-               quilt,
-               dpkg-dev (>= 1.14.17),
                libthai-dev (>= 0.1.9),
                gobject-introspection (>= 0.9.12-4~),
                libgirepository1.0-dev (>= 0.9.5),
@@ -32,59 +29,10 @@
 
 Package: libpango1.0-0
 Architecture: any
-Depends: libpango1.0-common (>= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Conflicts: pango-libthai
-Provides: pango1.0-modver-1.6.0
-Description: Layout and rendering of internationalized text
- Pango is a library for layout and rendering of text, with an emphasis
- on internationalization. Pango can be used anywhere that text layout is
- needed. however, most of the work on Pango-1.0 was done using the GTK+
- widget toolkit as a test platform. Pango forms the core of text and
- font handling for GTK+-2.0.
- .
- Pango is designed to be modular; the core Pango layout can be used with
- four different font backends:
-  - Core X windowing system fonts
-  - Client-side fonts on X using the Xft library
-  - Direct rendering of scalable fonts using the FreeType library
-  - Native fonts on Microsoft backends
- .
- This package contains the shared libraries.
-
-Package: libpango1.0-udeb
-XC-Package-Type: udeb
-Section: debian-installer
-Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Provides: pango1.0-modver-1.6.0
-Description: Layout and rendering of internationalized text - minimal runtime
- This is a udeb, or a microdeb, for the debian-installer.
- .
- Pango is a library for layout and rendering of text, with an emphasis
- on internationalization. Pango can be used anywhere that text layout is
- needed. however, most of the work on Pango-1.0 was done using the GTK+
- widget toolkit as a test platform. Pango forms the core of text and
- font handling for GTK+-2.0.
- .
- Pango is designed to be modular; the core Pango layout can be used with
- four different font backends:
-  - Direct rendering of scalable fonts using the FreeType library
-  - Native fonts on Microsoft backends
- .
- This package contains the minimal runtime library needed by the Debian
- installer.
-
-Package: libpango1.0-common
-Section: misc
-Architecture: all
-Depends: ${misc:Depends},
-         debconf | debconf-2.0,
-         defoma (>= 0.11.1),
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
          fontconfig (>= 2.1.91)
-Recommends: x-ttcidfont-conf, libpango1.0-0
+Recommends: x-ttcidfont-conf
 Suggests: ttf-japanese-gothic,
           ttf-japanese-mincho,
           ttf-thryomanes,
@@ -93,25 +41,47 @@
           ttf-arphic-bsmi00lp,
           ttf-arphic-gkai00mp,
           ttf-arphic-bkai00mp
-Replaces: libpango0,
-          libpango-common (<< 1.0.0)
-Conflicts: pango-libthai (<< 0.1.6-2)
-Description: Modules and configuration files for the Pango
- Pango is a library for layout and rendering of text, with an emphasis
- on internationalization. Pango can be used anywhere that text layout is
- needed. however, most of the work on Pango-1.0 was done using the GTK+
- widget toolkit as a test platform. Pango forms the core of text and
- font handling for GTK+-2.0.
- .
- Pango is designed to be modular; the core Pango layout can be used with
- four different font backends:
-  - Core X windowing system fonts
-  - Client-side fonts on X using the Xft library
-  - Direct rendering of scalable fonts using the FreeType library
-  - Native fonts on Microsoft backends
- .
- This package contains the Pango modules and the configuration files
- which Pango needs.
+Conflicts: pango-libthai
+Provides: pango1.0-modver-1.6.0
+Description: Layout and rendering of internationalized text
+ Pango is a library for layout and rendering of text, with an emphasis
+ on internationalization. Pango can be used anywhere that text layout is
+ needed. however, most of the work on Pango-1.0 was done using the GTK+
+ widget toolkit as a test platform. Pango forms the core of text and
+ font handling for GTK+-2.0.
+ .
+ Pango is designed to be modular; the core Pango layout can be used with
+ four different font backends:
+  - Core X windowing system fonts
+  - Client-side fonts on X using the Xft library
+  - Direct rendering of scalable fonts using the FreeType library
+  - Native fonts on Microsoft backends
+ .
+ This package contains the shared libraries.
+
+Package: libpango1.0-udeb
+XC-Package-Type: udeb
+Section: debian-installer
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Provides: pango1.0-modver-1.6.0
+Description: Layout and rendering of internationalized text - minimal runtime
+ This is a udeb, or a microdeb, for the debian-installer.
+ .
+ Pango is a library for layout and rendering of text, with an emphasis
+ on internationalization. Pango can be used anywhere that text layout is
+ needed. however, most of the work on Pango-1.0 was done using the GTK+
+ widget toolkit as a test platform. Pango forms the core of text and
+ font handling for GTK+-2.0.
+ .
+ Pango is designed to be modular; the core Pango layout can be used with
+ four different font backends:
+  - Direct rendering of scalable fonts using the FreeType library
+  - Native fonts on Microsoft backends
+ .
+ This package contains the minimal runtime library needed by the Debian
+ installer.
 
 Package: libpango1.0-dev
 Section: libdevel

Modified: desktop/experimental/pango1.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/control.in?rev=26202&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/control.in [utf-8] (original)
+++ desktop/experimental/pango1.0/debian/control.in [utf-8] Tue Jan 11 02:31:00 2011
@@ -5,20 +5,18 @@
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 5.0.22),
                cdbs (>= 0.4.90~),
+               gnome-pkg-tools (>= 0.11),
+               autotools-dev,
+               perl,
                libfreetype6-dev (>= 2.1.7),
                libx11-dev (>= 2:1.3.3-2),
                libxrender-dev (>= 1:0.9.0.2-2),
                libxt-dev,
                libglib2.0-dev (>= 2.27.0),
                pkg-config,
-               defoma (>= 0.11.1),
                libxft-dev (>= 2.1.14-2),
                libfontconfig1-dev (>= 2.5.0),
-               autotools-dev,
-               po-debconf,
-               gnome-pkg-tools (>= 0.11),
                libcairo2-dev (>= 1.8.10-3),
-               perl,
                libthai-dev (>= 0.1.9),
                gobject-introspection (>= 0.9.12-4~),
                libgirepository1.0-dev (>= 0.9.5),
@@ -31,59 +29,10 @@
 
 Package: libpango1.0- at SONAME@
 Architecture: any
-Depends: libpango1.0-common (>= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Conflicts: pango-libthai
-Provides: @PANGO_MODVER_DEP@
-Description: Layout and rendering of internationalized text
- Pango is a library for layout and rendering of text, with an emphasis
- on internationalization. Pango can be used anywhere that text layout is
- needed. however, most of the work on Pango-1.0 was done using the GTK+
- widget toolkit as a test platform. Pango forms the core of text and
- font handling for GTK+-2.0.
- .
- Pango is designed to be modular; the core Pango layout can be used with
- four different font backends:
-  - Core X windowing system fonts
-  - Client-side fonts on X using the Xft library
-  - Direct rendering of scalable fonts using the FreeType library
-  - Native fonts on Microsoft backends
- .
- This package contains the shared libraries.
-
-Package: libpango1.0-udeb
-XC-Package-Type: udeb
-Section: debian-installer
-Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Provides: @PANGO_MODVER_DEP@
-Description: Layout and rendering of internationalized text - minimal runtime
- This is a udeb, or a microdeb, for the debian-installer.
- .
- Pango is a library for layout and rendering of text, with an emphasis
- on internationalization. Pango can be used anywhere that text layout is
- needed. however, most of the work on Pango-1.0 was done using the GTK+
- widget toolkit as a test platform. Pango forms the core of text and
- font handling for GTK+-2.0.
- .
- Pango is designed to be modular; the core Pango layout can be used with
- four different font backends:
-  - Direct rendering of scalable fonts using the FreeType library
-  - Native fonts on Microsoft backends
- .
- This package contains the minimal runtime library needed by the Debian
- installer.
-
-Package: libpango1.0-common
-Section: misc
-Architecture: all
-Depends: ${misc:Depends},
-         debconf | debconf-2.0,
-         defoma (>= 0.11.1),
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
          fontconfig (>= 2.1.91)
-Recommends: x-ttcidfont-conf, libpango1.0- at SONAME@
+Recommends: x-ttcidfont-conf
 Suggests: ttf-japanese-gothic,
           ttf-japanese-mincho,
           ttf-thryomanes,
@@ -92,25 +41,47 @@
           ttf-arphic-bsmi00lp,
           ttf-arphic-gkai00mp,
           ttf-arphic-bkai00mp
-Replaces: libpango0,
-          libpango-common (<< 1.0.0)
-Conflicts: pango-libthai (<< 0.1.6-2)
-Description: Modules and configuration files for the Pango
- Pango is a library for layout and rendering of text, with an emphasis
- on internationalization. Pango can be used anywhere that text layout is
- needed. however, most of the work on Pango-1.0 was done using the GTK+
- widget toolkit as a test platform. Pango forms the core of text and
- font handling for GTK+-2.0.
- .
- Pango is designed to be modular; the core Pango layout can be used with
- four different font backends:
-  - Core X windowing system fonts
-  - Client-side fonts on X using the Xft library
-  - Direct rendering of scalable fonts using the FreeType library
-  - Native fonts on Microsoft backends
- .
- This package contains the Pango modules and the configuration files
- which Pango needs.
+Conflicts: pango-libthai
+Provides: @PANGO_MODVER_DEP@
+Description: Layout and rendering of internationalized text
+ Pango is a library for layout and rendering of text, with an emphasis
+ on internationalization. Pango can be used anywhere that text layout is
+ needed. however, most of the work on Pango-1.0 was done using the GTK+
+ widget toolkit as a test platform. Pango forms the core of text and
+ font handling for GTK+-2.0.
+ .
+ Pango is designed to be modular; the core Pango layout can be used with
+ four different font backends:
+  - Core X windowing system fonts
+  - Client-side fonts on X using the Xft library
+  - Direct rendering of scalable fonts using the FreeType library
+  - Native fonts on Microsoft backends
+ .
+ This package contains the shared libraries.
+
+Package: libpango1.0-udeb
+XC-Package-Type: udeb
+Section: debian-installer
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Provides: @PANGO_MODVER_DEP@
+Description: Layout and rendering of internationalized text - minimal runtime
+ This is a udeb, or a microdeb, for the debian-installer.
+ .
+ Pango is a library for layout and rendering of text, with an emphasis
+ on internationalization. Pango can be used anywhere that text layout is
+ needed. however, most of the work on Pango-1.0 was done using the GTK+
+ widget toolkit as a test platform. Pango forms the core of text and
+ font handling for GTK+-2.0.
+ .
+ Pango is designed to be modular; the core Pango layout can be used with
+ four different font backends:
+  - Direct rendering of scalable fonts using the FreeType library
+  - Native fonts on Microsoft backends
+ .
+ This package contains the minimal runtime library needed by the Debian
+ installer.
 
 Package: libpango1.0-dev
 Section: libdevel

Modified: desktop/experimental/pango1.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/rules?rev=26202&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/rules [utf-8] (original)
+++ desktop/experimental/pango1.0/debian/rules [utf-8] Tue Jan 11 02:31:00 2011
@@ -49,7 +49,6 @@
 # package names
 SHARED_PKG := libpango$(APIVER)-$(SONAME)
 UDEB_PKG := libpango$(APIVER)-udeb
-COMMON_PKG := libpango$(APIVER)-common
 DEV_PKG := libpango$(APIVER)-dev
 DEBUG_PKG := libpango$(APIVER)-$(SONAME)-dbg
 DOC_PKG := libpango$(APIVER)-doc
@@ -103,11 +102,6 @@
 build-indep: $(call dh_subst_files,$(DEB_INDEP_PACKAGES))
 build-arch: $(call dh_subst_files,$(DEB_ARCH_PACKAGES)) debian/dh_pangomodules.1
 
-# FIXME: defoma is going to be removed, see bug #540984
-# http://wiki.debian.org/OldPkgRemovals#defoma
-$(patsubst %,binary-install/%,$(DEB_ALL_PACKAGES)) ::
-	dh_installdefoma -s
-
 binary-install/$(SHARED_PKG)::
 	# fix the permissions of dh_pangomodules
 	chmod +x debian/dh_pangomodules




More information about the pkg-gnome-commits mailing list