From c39848cffcaf711bba53702b2703d2397acfdb7c Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Tue, 15 Feb 2011 01:30:13 +0000 Subject: [PATCH] * Rename binary packages to new so naming * debian/libgail-3-0.symbols: * debian/libgtk-3-0.symbols: --- debian/changelog | 7 +- debian/control | 102 +++++++++++------- debian/control.in | 52 ++++++--- ...mples.examples => gtk-3-examples.examples} | 0 ...s.install.in => gtk-3-examples.install.in} | 0 ...ail3.0-0-dbg.dirs => libgail-3-0-dbg.dirs} | 0 ...bgail3.0-0.install => libgail-3-0.install} | 0 debian/{libgail3.0-0.opt => libgail-3-0.opt} | 0 ...bgail3.0-0.symbols => libgail-3-0.symbols} | 0 ...install.in => libgail-3-common.install.in} | 0 ...l3.0-dev.install => libgail-3-dev.install} | 0 ... => libgail-3-doc.doc-base.gail-reference} | 2 +- ...l3.0-doc.install => libgail-3-doc.install} | 0 debian/libgail-3-doc.links | 1 + debian/libgail3.0-doc.links | 1 - ...0-dbg.links.in => libgtk-3-0-dbg.links.in} | 0 ....install.in => libgtk-3-0-udeb.install.in} | 0 ...3.0-0.install.in => libgtk-3-0.install.in} | 2 +- ...0-0.install.opt => libgtk-3-0.install.opt} | 0 ...bgtk3.0-0.links.in => libgtk-3-0.links.in} | 0 ...0-0.postinst.in => libgtk-3-0.postinst.in} | 0 ...tk3.0-0.postrm.in => libgtk-3-0.postrm.in} | 2 +- ...libgtk3.0-0.symbols => libgtk-3-0.symbols} | 0 ...0-0.triggers.in => libgtk-3-0.triggers.in} | 0 ...bin.install.in => libgtk-3-bin.install.in} | 2 +- ...3.0-bin.links.in => libgtk-3-bin.links.in} | 4 +- ...3.0-bin.manpages => libgtk-3-bin.manpages} | 0 ...bgtk3.0-bin.postrm => libgtk-3-bin.postrm} | 0 ...tk3.0-bin.preinst => libgtk-3-bin.preinst} | 0 ...common.install => libgtk-3-common.install} | 0 ....preinst.in => libgtk-3-common.preinst.in} | 0 ...dev.install.in => libgtk-3-dev.install.in} | 0 ...3.0-dev.links.in => libgtk-3-dev.links.in} | 0 ...se.gdk.in => libgtk-3-doc.doc-base.gdk.in} | 0 ...se.gtk.in => libgtk-3-doc.doc-base.gtk.in} | 0 ...doc.install.in => libgtk-3-doc.install.in} | 0 ...3.0-doc.links.in => libgtk-3-doc.links.in} | 0 debian/rules | 27 ++--- 38 files changed, 129 insertions(+), 73 deletions(-) rename debian/{gtk3.0-examples.examples => gtk-3-examples.examples} (100%) rename debian/{gtk3.0-examples.install.in => gtk-3-examples.install.in} (100%) rename debian/{libgail3.0-0-dbg.dirs => libgail-3-0-dbg.dirs} (100%) rename debian/{libgail3.0-0.install => libgail-3-0.install} (100%) rename debian/{libgail3.0-0.opt => libgail-3-0.opt} (100%) rename debian/{libgail3.0-0.symbols => libgail-3-0.symbols} (100%) rename debian/{libgail3.0-common.install.in => libgail-3-common.install.in} (100%) rename debian/{libgail3.0-dev.install => libgail-3-dev.install} (100%) rename debian/{libgail3.0-doc.doc-base.gail-reference => libgail-3-doc.doc-base.gail-reference} (90%) rename debian/{libgail3.0-doc.install => libgail-3-doc.install} (100%) create mode 100644 debian/libgail-3-doc.links delete mode 100644 debian/libgail3.0-doc.links rename debian/{libgtk3.0-0-dbg.links.in => libgtk-3-0-dbg.links.in} (100%) rename debian/{libgtk3.0-0-udeb.install.in => libgtk-3-0-udeb.install.in} (100%) rename debian/{libgtk3.0-0.install.in => libgtk-3-0.install.in} (86%) rename debian/{libgtk3.0-0.install.opt => libgtk-3-0.install.opt} (100%) rename debian/{libgtk3.0-0.links.in => libgtk-3-0.links.in} (100%) rename debian/{libgtk3.0-0.postinst.in => libgtk-3-0.postinst.in} (100%) rename debian/{libgtk3.0-0.postrm.in => libgtk-3-0.postrm.in} (89%) rename debian/{libgtk3.0-0.symbols => libgtk-3-0.symbols} (100%) rename debian/{libgtk3.0-0.triggers.in => libgtk-3-0.triggers.in} (100%) rename debian/{libgtk3.0-bin.install.in => libgtk-3-bin.install.in} (63%) rename debian/{libgtk3.0-bin.links.in => libgtk-3-bin.links.in} (54%) rename debian/{libgtk3.0-bin.manpages => libgtk-3-bin.manpages} (100%) rename debian/{libgtk3.0-bin.postrm => libgtk-3-bin.postrm} (100%) rename debian/{libgtk3.0-bin.preinst => libgtk-3-bin.preinst} (100%) rename debian/{libgtk3.0-common.install => libgtk-3-common.install} (100%) rename debian/{libgtk3.0-common.preinst.in => libgtk-3-common.preinst.in} (100%) rename debian/{libgtk3.0-dev.install.in => libgtk-3-dev.install.in} (100%) rename debian/{libgtk3.0-dev.links.in => libgtk-3-dev.links.in} (100%) rename debian/{libgtk3.0-doc.doc-base.gdk.in => libgtk-3-doc.doc-base.gdk.in} (100%) rename debian/{libgtk3.0-doc.doc-base.gtk.in => libgtk-3-doc.doc-base.gtk.in} (100%) rename debian/{libgtk3.0-doc.install.in => libgtk-3-doc.install.in} (100%) rename debian/{libgtk3.0-doc.links.in => libgtk-3-doc.links.in} (100%) diff --git a/debian/changelog b/debian/changelog index 3b08b16126..92809df7d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,17 +1,18 @@ gtk+3.0 (3.0.0-1) UNRELEASED; urgency=low * New upstream release + * Rename binary packages to new so naming * debian/control: - Bump build-depends on libglib2.0-dev, libgdk-pixbuf2.0-dev, libatk1.0-dev, gobject-introspection - * debian/libgail3.0-0.symbols: - * debian/libgtk3.0-0.symbols: + * debian/libgail-3-0.symbols: + * debian/libgtk-3-0.symbols: - Updated - Mark symbols with stable version number * debian/rules: - Bump SHVER - -- Robert Ancell Mon, 14 Feb 2011 09:56:54 +1100 + -- Robert Ancell Tue, 15 Feb 2011 12:28:34 +1100 gtk+3.0 (2.99.3-1) UNRELEASED; urgency=low diff --git a/debian/control b/debian/control index dad6ee6975..6efa15bcd4 100644 --- a/debian/control +++ b/debian/control @@ -53,17 +53,19 @@ Vcs-Svn: svn://svn.debian.org/pkg-gnome/desktop/unstable/gtk+3.0/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk+3.0/ Homepage: http://www.gtk.org/ -Package: libgtk3.0-0 +Package: libgtk-3-0 Architecture: any -Depends: libgtk3.0-common, +Depends: libgtk-3-common, ${misc:Depends}, ${shlibs:Depends}, shared-mime-info Provides: gtk3.0-binver-3.0.0 Recommends: hicolor-icon-theme, - libgtk3.0-bin + libgtk-3-bin Suggests: librsvg2-common, gvfs +Conflicts: libgtk3.0-0 +Replaces: libgtk3.0-0 Description: The GTK+ graphical user interface library The GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, the GTK+ is suitable @@ -72,7 +74,7 @@ Description: The GTK+ graphical user interface library . This package contains the shared libraries. -Package: libgtk3.0-0-udeb +Package: libgtk-3-0-udeb XC-Package-Type: udeb Section: debian-installer Priority: extra @@ -80,6 +82,8 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Provides: gtk3.0-binver-3.0.0 +Conflicts: libgtk3.0-0-udeb +Replaces: libgtk3.0-0-udeb Description: The GTK+ graphical user interface library - minimal runtime This is a udeb, or a microdeb, for the debian-installer. . @@ -91,11 +95,13 @@ Description: The GTK+ graphical user interface library - minimal runtime This package contains the minimal runtime library using X11 needed by the Debian installer. -Package: libgtk3.0-common +Package: libgtk-3-common Section: misc Architecture: all Depends: ${misc:Depends} -Recommends: libgtk3.0-0 +Recommends: libgtk-3-0 +Conflicts: libgtk3.0-common +Replaces: libgtk3.0-common Description: Common files for the GTK+ graphical user interface library The GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, the GTK+ is suitable @@ -104,12 +110,14 @@ Description: Common files for the GTK+ graphical user interface library . This package contains the common files which the libraries need. -Package: libgtk3.0-bin +Package: libgtk-3-bin Section: misc Architecture: all Depends: ${misc:Depends}, - libgtk3.0-0 (>= ${source:Version}), - libgtk3.0-common + libgtk-3-0 (>= ${source:Version}), + libgtk-3-common +Conflicts: libgtk3.0-bin +Replaces: libgtk3.0-bin Description: The programs for the GTK+ graphical user interface library The GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, the GTK+ is suitable @@ -119,11 +127,11 @@ Description: The programs for the GTK+ graphical user interface library This package contains the program files which is used for the libraries and others. -Package: libgtk3.0-dev +Package: libgtk-3-dev Section: libdevel Architecture: any -Depends: libgtk3.0-0 (= ${binary:Version}), - libgtk3.0-common, +Depends: libgtk-3-0 (= ${binary:Version}), + libgtk-3-common, ${misc:Depends}, ${shlibs:Depends}, libglib2.0-dev (>= 2.28.0), @@ -144,7 +152,9 @@ Depends: libgtk3.0-0 (= ${binary:Version}), libxml2-utils Recommends: python (>= 2.4), debhelper -Suggests: libgtk3.0-doc +Suggests: libgtk-3-doc +Conflicts: libgtk3.0-dev +Replaces: libgtk3.0-dev Description: Development files for the GTK+ library The GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, the GTK+ is suitable @@ -154,13 +164,15 @@ Description: Development files for the GTK+ library This package contains the header files and static libraries which is needed for developing the GTK+ applications. -Package: libgtk3.0-0-dbg +Package: libgtk-3-0-dbg Section: debug Priority: extra Architecture: any -Depends: libgtk3.0-0 (= ${binary:Version}), - libgtk3.0-common, +Depends: libgtk-3-0 (= ${binary:Version}), + libgtk-3-common, ${misc:Depends} +Conflicts: libgtk3.0-0-dbg +Replaces: libgtk3.0-0-dbg Description: The GTK+ libraries and debugging symbols The GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, the GTK+ is suitable @@ -171,7 +183,7 @@ Description: The GTK+ libraries and debugging symbols . Most people will not need this package. -Package: libgtk3.0-doc +Package: libgtk-3-doc Section: doc Architecture: all Depends: lynx | www-browser, @@ -179,6 +191,8 @@ Depends: lynx | www-browser, Recommends: libglib2.0-doc, libatk1.0-doc, libpango1.0-doc +Conflicts: libgtk3.0-doc +Replaces: libgtk3.0-doc Description: Documentation for the GTK+ graphical user interface library The GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, the GTK+ is suitable @@ -186,31 +200,33 @@ Description: Documentation for the GTK+ graphical user interface library suites. . This package contains the HTML documentation for the GTK+ library - in /usr/share/doc/libgtk3.0-doc/ . + in /usr/share/doc/libgtk-3-doc/ . -Package: gtk3.0-examples +Package: gtk-3-examples Section: x11 Priority: extra Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libgtk3.0-0 (= ${binary:Version}) -Description: Examples files for the GTK+ 3.0 + libgtk-3-0 (= ${binary:Version}) +Conflicts: gtk-3.0-examples +Replaces: gtk-3.0-examples +Description: Examples files for GTK+ 3 The GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, the GTK+ is suitable for projects ranging from small one-off tools to complete application suites. . This package contains the examples files and a demonstration program - for the GTK+-3.0. + for GTK+3. #Package: gtk3-engines-pixbuf #Section: graphics #Architecture: any #Depends: ${misc:Depends}, # ${shlibs:Depends}, -# libgtk3.0-0 (= ${binary:Version}), -# libgtk3.0-common +# libgtk-3-0 (= ${binary:Version}), +# libgtk-3-common #Description: Pixbuf-based theme for GTK+ 3.x # The GTK+ is a multi-platform toolkit for creating graphical user # interfaces. Offering a complete set of widgets, the GTK+ is suitable @@ -221,7 +237,7 @@ Description: Examples files for the GTK+ 3.0 Package: gir1.2-gtk-3.0 Architecture: any -Depends: libgtk3.0-common, +Depends: libgtk-3-common, ${misc:Depends}, ${shlibs:Depends}, ${gir:Depends} @@ -236,11 +252,13 @@ Description: The GTK+ graphical user interface library -- gir bindings This package can be used by other packages using the GIRepository format to generate dynamic bindings. -Package: libgail3.0-0 +Package: libgail-3-0 Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, - libgtk3.0-0 (= ${binary:Version}) + libgtk-3-0 (= ${binary:Version}) +Conflicts: libgail3.0-0 +Replaces: libgail3.0-0 Description: GNOME Accessibility Implementation Library -- shared libraries Gail implements ATK interfaces for GTK+ widgets which are dynamically loadable at runtime by a GTK+ application. Once loaded, those parts of @@ -249,11 +267,13 @@ Description: GNOME Accessibility Implementation Library -- shared libraries . This package contains the shared library. -Package: libgail3.0-common +Package: libgail-3-common Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, - libgail3.0-0 (= ${binary:Version}) + libgail-3-0 (= ${binary:Version}) +Conflicts: libgail3.0-common +Replaces: libgail3.0-common Description: GNOME Accessibility Implementation Library -- common modules Gail implements ATK interfaces for GTK+ widgets which are dynamically loadable at runtime by a GTK+ application. Once loaded, those parts of @@ -262,16 +282,18 @@ Description: GNOME Accessibility Implementation Library -- common modules . This package contains core shared libraries. -Package: libgail3.0-dev +Package: libgail-3-dev Architecture: any Section: libdevel Depends: ${misc:Depends}, - libgail3.0-0 (= ${binary:Version}), - libgail3.0-common (= ${binary:Version}), - libgtk3.0-dev (= ${binary:Version}), + libgail-3-0 (= ${binary:Version}), + libgail-3-common (= ${binary:Version}), + libgtk-3-dev (= ${binary:Version}), pkg-config, libatk1.0-dev (>= 1.13.0) -Suggests: libgail3.0-doc +Suggests: libgail-3-doc +Conflicts: libgail3.0-dev +Replaces: libgail3.0-dev Description: GNOME Accessibility Implementation Library -- development files Gail implements ATK interfaces for GTK+ widgets which are dynamically loadable at runtime by a GTK+ application. Once loaded, those parts of @@ -280,12 +302,14 @@ Description: GNOME Accessibility Implementation Library -- development files . This package contains the development files for Gail. -Package: libgail3.0-0-dbg +Package: libgail-3-0-dbg Architecture: any Section: debug Priority: extra -Depends: ${misc:Depends}, libgail3.0-0 (= ${binary:Version}) -Recommends: libgtk3.0-0-dbg +Depends: ${misc:Depends}, libgail-3-0 (= ${binary:Version}) +Recommends: libgtk-3-0-dbg +Conflicts: libgail3.0-0-dbg +Replaces: libgail3.0-0-dbg Description: Gail libraries and debugging symbols Gail is the "GNOME Accessibility Implementation Library". . @@ -293,10 +317,12 @@ Description: Gail libraries and debugging symbols . Most people will not need this package. -Package: libgail3.0-doc +Package: libgail-3-doc Architecture: all Section: doc Depends: ${misc:Depends}, lynx | www-browser +Conflicts: libgail3.0-doc +Replaces: libgail3.0-doc Description: documentation files of the Gail library Gail implements ATK interfaces for GTK+ widgets which are dynamically loadable at runtime by a GTK+ application. Once loaded, those parts of diff --git a/debian/control.in b/debian/control.in index 75f1454962..35f82f5e55 100644 --- a/debian/control.in +++ b/debian/control.in @@ -1,4 +1,4 @@ -Source: gtk+@APIVER@ +Source: gtk+3.0 Section: libs Priority: optional Maintainer: Sebastien Bacher @@ -64,6 +64,8 @@ Recommends: hicolor-icon-theme, @BIN_PKG@ Suggests: librsvg2-common, gvfs +Conflicts: libgtk3.0-0 +Replaces: libgtk3.0-0 Description: The GTK+ graphical user interface library The GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, the GTK+ is suitable @@ -80,6 +82,8 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Provides: @GTK_BINVER_DEP@ +Conflicts: libgtk3.0-0-udeb +Replaces: libgtk3.0-0-udeb Description: The GTK+ graphical user interface library - minimal runtime This is a udeb, or a microdeb, for the debian-installer. . @@ -96,6 +100,8 @@ Section: misc Architecture: all Depends: ${misc:Depends} Recommends: @SHARED_PKG@ +Conflicts: libgtk3.0-common +Replaces: libgtk3.0-common Description: Common files for the GTK+ graphical user interface library The GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, the GTK+ is suitable @@ -110,6 +116,8 @@ Architecture: all Depends: ${misc:Depends}, @SHARED_PKG@ (>= ${source:Version}), @COMMON_PKG@ +Conflicts: libgtk3.0-bin +Replaces: libgtk3.0-bin Description: The programs for the GTK+ graphical user interface library The GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, the GTK+ is suitable @@ -145,6 +153,8 @@ Depends: @SHARED_PKG@ (= ${binary:Version}), Recommends: python (>= 2.4), debhelper Suggests: @DOC_PKG@ +Conflicts: libgtk3.0-dev +Replaces: libgtk3.0-dev Description: Development files for the GTK+ library The GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, the GTK+ is suitable @@ -161,6 +171,8 @@ Architecture: any Depends: @SHARED_PKG@ (= ${binary:Version}), @COMMON_PKG@, ${misc:Depends} +Conflicts: libgtk3.0-0-dbg +Replaces: libgtk3.0-0-dbg Description: The GTK+ libraries and debugging symbols The GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, the GTK+ is suitable @@ -179,6 +191,8 @@ Depends: lynx | www-browser, Recommends: libglib2.0-doc, libatk1.0-doc, libpango1.0-doc +Conflicts: libgtk3.0-doc +Replaces: libgtk3.0-doc Description: Documentation for the GTK+ graphical user interface library The GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, the GTK+ is suitable @@ -195,14 +209,16 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, @SHARED_PKG@ (= ${binary:Version}) -Description: Examples files for the GTK+ 3.0 +Conflicts: gtk-3.0-examples +Replaces: gtk-3.0-examples +Description: Examples files for GTK+ 3 The GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, the GTK+ is suitable for projects ranging from small one-off tools to complete application suites. . This package contains the examples files and a demonstration program - for the GTK+-3.0. + for GTK+3. #Package: @PIXBUF_PKG@ #Section: graphics @@ -236,11 +252,13 @@ Description: The GTK+ graphical user interface library -- gir bindings This package can be used by other packages using the GIRepository format to generate dynamic bindings. -Package: libgail3.0-0 +Package: libgail-3-0 Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, @SHARED_PKG@ (= ${binary:Version}) +Conflicts: libgail3.0-0 +Replaces: libgail3.0-0 Description: GNOME Accessibility Implementation Library -- shared libraries Gail implements ATK interfaces for GTK+ widgets which are dynamically loadable at runtime by a GTK+ application. Once loaded, those parts of @@ -249,11 +267,13 @@ Description: GNOME Accessibility Implementation Library -- shared libraries . This package contains the shared library. -Package: libgail3.0-common +Package: libgail-3-common Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, - libgail3.0-0 (= ${binary:Version}) + libgail-3-0 (= ${binary:Version}) +Conflicts: libgail3.0-common +Replaces: libgail3.0-common Description: GNOME Accessibility Implementation Library -- common modules Gail implements ATK interfaces for GTK+ widgets which are dynamically loadable at runtime by a GTK+ application. Once loaded, those parts of @@ -262,16 +282,18 @@ Description: GNOME Accessibility Implementation Library -- common modules . This package contains core shared libraries. -Package: libgail3.0-dev +Package: libgail-3-dev Architecture: any Section: libdevel Depends: ${misc:Depends}, - libgail3.0-0 (= ${binary:Version}), - libgail3.0-common (= ${binary:Version}), + libgail-3-0 (= ${binary:Version}), + libgail-3-common (= ${binary:Version}), @DEV_PKG@ (= ${binary:Version}), pkg-config, libatk1.0-dev (>= 1.13.0) -Suggests: libgail3.0-doc +Suggests: libgail-3-doc +Conflicts: libgail3.0-dev +Replaces: libgail3.0-dev Description: GNOME Accessibility Implementation Library -- development files Gail implements ATK interfaces for GTK+ widgets which are dynamically loadable at runtime by a GTK+ application. Once loaded, those parts of @@ -280,12 +302,14 @@ Description: GNOME Accessibility Implementation Library -- development files . This package contains the development files for Gail. -Package: libgail3.0-0-dbg +Package: libgail-3-0-dbg Architecture: any Section: debug Priority: extra -Depends: ${misc:Depends}, libgail3.0-0 (= ${binary:Version}) +Depends: ${misc:Depends}, libgail-3-0 (= ${binary:Version}) Recommends: @DEBUG_PKG@ +Conflicts: libgail3.0-0-dbg +Replaces: libgail3.0-0-dbg Description: Gail libraries and debugging symbols Gail is the "GNOME Accessibility Implementation Library". . @@ -293,10 +317,12 @@ Description: Gail libraries and debugging symbols . Most people will not need this package. -Package: libgail3.0-doc +Package: libgail-3-doc Architecture: all Section: doc Depends: ${misc:Depends}, lynx | www-browser +Conflicts: libgail3.0-doc +Replaces: libgail3.0-doc Description: documentation files of the Gail library Gail implements ATK interfaces for GTK+ widgets which are dynamically loadable at runtime by a GTK+ application. Once loaded, those parts of diff --git a/debian/gtk3.0-examples.examples b/debian/gtk-3-examples.examples similarity index 100% rename from debian/gtk3.0-examples.examples rename to debian/gtk-3-examples.examples diff --git a/debian/gtk3.0-examples.install.in b/debian/gtk-3-examples.install.in similarity index 100% rename from debian/gtk3.0-examples.install.in rename to debian/gtk-3-examples.install.in diff --git a/debian/libgail3.0-0-dbg.dirs b/debian/libgail-3-0-dbg.dirs similarity index 100% rename from debian/libgail3.0-0-dbg.dirs rename to debian/libgail-3-0-dbg.dirs diff --git a/debian/libgail3.0-0.install b/debian/libgail-3-0.install similarity index 100% rename from debian/libgail3.0-0.install rename to debian/libgail-3-0.install diff --git a/debian/libgail3.0-0.opt b/debian/libgail-3-0.opt similarity index 100% rename from debian/libgail3.0-0.opt rename to debian/libgail-3-0.opt diff --git a/debian/libgail3.0-0.symbols b/debian/libgail-3-0.symbols similarity index 100% rename from debian/libgail3.0-0.symbols rename to debian/libgail-3-0.symbols diff --git a/debian/libgail3.0-common.install.in b/debian/libgail-3-common.install.in similarity index 100% rename from debian/libgail3.0-common.install.in rename to debian/libgail-3-common.install.in diff --git a/debian/libgail3.0-dev.install b/debian/libgail-3-dev.install similarity index 100% rename from debian/libgail3.0-dev.install rename to debian/libgail-3-dev.install diff --git a/debian/libgail3.0-doc.doc-base.gail-reference b/debian/libgail-3-doc.doc-base.gail-reference similarity index 90% rename from debian/libgail3.0-doc.doc-base.gail-reference rename to debian/libgail-3-doc.doc-base.gail-reference index 933e0e6881..a68c9d3488 100644 --- a/debian/libgail3.0-doc.doc-base.gail-reference +++ b/debian/libgail-3-doc.doc-base.gail-reference @@ -1,4 +1,4 @@ -Document: gail-reference-3.0 +Document: gail-reference-3 Title: Gail Reference Manual Author: Padraig O'Briain Abstract: This manual describes APIs for libgail-util diff --git a/debian/libgail3.0-doc.install b/debian/libgail-3-doc.install similarity index 100% rename from debian/libgail3.0-doc.install rename to debian/libgail-3-doc.install diff --git a/debian/libgail-3-doc.links b/debian/libgail-3-doc.links new file mode 100644 index 0000000000..79258d386e --- /dev/null +++ b/debian/libgail-3-doc.links @@ -0,0 +1 @@ +/usr/share/gtk-doc/html/gail-libgail-util3 /usr/share/doc/libgail-3-doc/html diff --git a/debian/libgail3.0-doc.links b/debian/libgail3.0-doc.links deleted file mode 100644 index ff0971488d..0000000000 --- a/debian/libgail3.0-doc.links +++ /dev/null @@ -1 +0,0 @@ -/usr/share/gtk-doc/html/gail-libgail-util-3.0 /usr/share/doc/libgail3.0-doc/html diff --git a/debian/libgtk3.0-0-dbg.links.in b/debian/libgtk-3-0-dbg.links.in similarity index 100% rename from debian/libgtk3.0-0-dbg.links.in rename to debian/libgtk-3-0-dbg.links.in diff --git a/debian/libgtk3.0-0-udeb.install.in b/debian/libgtk-3-0-udeb.install.in similarity index 100% rename from debian/libgtk3.0-0-udeb.install.in rename to debian/libgtk-3-0-udeb.install.in diff --git a/debian/libgtk3.0-0.install.in b/debian/libgtk-3-0.install.in similarity index 86% rename from debian/libgtk3.0-0.install.in rename to debian/libgtk-3-0.install.in index c7118bfe16..936698c5ba 100644 --- a/debian/libgtk3.0-0.install.in +++ b/debian/libgtk-3-0.install.in @@ -1,5 +1,5 @@ # from the shared flavor -debian/install/shared/etc/gtk-@APIVER@/im-multipress.conf etc/gtk-@APIVER@ +debian/install/shared/@CONFDIR@/im-multipress.conf @CONFDIR@ debian/install/shared/usr/bin/gtk-query-immodules-3.0 @LIBDIR@/@SHARED_PKG@ debian/install/shared/usr/bin/gtk-update-icon-cache @LIBDIR@/@SHARED_PKG@ debian/install/shared/@MODULES_BASE_PATH@/immodules/*.so @MODULES_BASE_PATH@/immodules diff --git a/debian/libgtk3.0-0.install.opt b/debian/libgtk-3-0.install.opt similarity index 100% rename from debian/libgtk3.0-0.install.opt rename to debian/libgtk-3-0.install.opt diff --git a/debian/libgtk3.0-0.links.in b/debian/libgtk-3-0.links.in similarity index 100% rename from debian/libgtk3.0-0.links.in rename to debian/libgtk-3-0.links.in diff --git a/debian/libgtk3.0-0.postinst.in b/debian/libgtk-3-0.postinst.in similarity index 100% rename from debian/libgtk3.0-0.postinst.in rename to debian/libgtk-3-0.postinst.in diff --git a/debian/libgtk3.0-0.postrm.in b/debian/libgtk-3-0.postrm.in similarity index 89% rename from debian/libgtk3.0-0.postrm.in rename to debian/libgtk-3-0.postrm.in index c56bc8449b..d7435e1e2c 100644 --- a/debian/libgtk3.0-0.postrm.in +++ b/debian/libgtk-3-0.postrm.in @@ -4,7 +4,7 @@ set -e case "$1" in purge) - rm -rf /etc/gtk-@APIVER@ + rm -rf /@CONFDIR@ ;; esac diff --git a/debian/libgtk3.0-0.symbols b/debian/libgtk-3-0.symbols similarity index 100% rename from debian/libgtk3.0-0.symbols rename to debian/libgtk-3-0.symbols diff --git a/debian/libgtk3.0-0.triggers.in b/debian/libgtk-3-0.triggers.in similarity index 100% rename from debian/libgtk3.0-0.triggers.in rename to debian/libgtk-3-0.triggers.in diff --git a/debian/libgtk3.0-bin.install.in b/debian/libgtk-3-bin.install.in similarity index 63% rename from debian/libgtk3.0-bin.install.in rename to debian/libgtk-3-bin.install.in index 6477fcdd3d..d1b85390c8 100644 --- a/debian/libgtk3.0-bin.install.in +++ b/debian/libgtk-3-bin.install.in @@ -1,4 +1,4 @@ # from the shared flavor docs/reference/gtk/gtk-update-icon-cache.1 usr/share/man/man1 -docs/reference/gtk/gtk-query-immodules-@APIVER@.1 usr/share/man/man1 +docs/reference/gtk/gtk-query-immodules-3.0.1 usr/share/man/man1 debian/update-icon-caches usr/sbin diff --git a/debian/libgtk3.0-bin.links.in b/debian/libgtk-3-bin.links.in similarity index 54% rename from debian/libgtk3.0-bin.links.in rename to debian/libgtk-3-bin.links.in index 79c33d629f..b99a286689 100644 --- a/debian/libgtk3.0-bin.links.in +++ b/debian/libgtk-3-bin.links.in @@ -1,5 +1,5 @@ -@LIBDIR@/@SHARED_PKG@/gtk-query-immodules-@APIVER@ usr/bin/gtk-query-immodules-@APIVER@ -@LIBDIR@/@SHARED_PKG@/gtk-update-icon-cache-@APIVER@ usr/bin/gtk-update-icon-cache-@APIVER@ +@LIBDIR@/@SHARED_PKG@/gtk-query-immodules-3.0 usr/bin/gtk-query-immodules-3.0 +@LIBDIR@/@SHARED_PKG@/gtk-update-icon-cache-3.0 usr/bin/gtk-update-icon-cache-3.0 usr/share/doc/@COMMON_PKG@/changelog.gz usr/share/doc/@BIN_PKG@/changelog.gz usr/share/doc/@COMMON_PKG@/NEWS.gz usr/share/doc/@BIN_PKG@/NEWS.gz usr/share/doc/@COMMON_PKG@/README.gz usr/share/doc/@BIN_PKG@/README.gz diff --git a/debian/libgtk3.0-bin.manpages b/debian/libgtk-3-bin.manpages similarity index 100% rename from debian/libgtk3.0-bin.manpages rename to debian/libgtk-3-bin.manpages diff --git a/debian/libgtk3.0-bin.postrm b/debian/libgtk-3-bin.postrm similarity index 100% rename from debian/libgtk3.0-bin.postrm rename to debian/libgtk-3-bin.postrm diff --git a/debian/libgtk3.0-bin.preinst b/debian/libgtk-3-bin.preinst similarity index 100% rename from debian/libgtk3.0-bin.preinst rename to debian/libgtk-3-bin.preinst diff --git a/debian/libgtk3.0-common.install b/debian/libgtk-3-common.install similarity index 100% rename from debian/libgtk3.0-common.install rename to debian/libgtk-3-common.install diff --git a/debian/libgtk3.0-common.preinst.in b/debian/libgtk-3-common.preinst.in similarity index 100% rename from debian/libgtk3.0-common.preinst.in rename to debian/libgtk-3-common.preinst.in diff --git a/debian/libgtk3.0-dev.install.in b/debian/libgtk-3-dev.install.in similarity index 100% rename from debian/libgtk3.0-dev.install.in rename to debian/libgtk-3-dev.install.in diff --git a/debian/libgtk3.0-dev.links.in b/debian/libgtk-3-dev.links.in similarity index 100% rename from debian/libgtk3.0-dev.links.in rename to debian/libgtk-3-dev.links.in diff --git a/debian/libgtk3.0-doc.doc-base.gdk.in b/debian/libgtk-3-doc.doc-base.gdk.in similarity index 100% rename from debian/libgtk3.0-doc.doc-base.gdk.in rename to debian/libgtk-3-doc.doc-base.gdk.in diff --git a/debian/libgtk3.0-doc.doc-base.gtk.in b/debian/libgtk-3-doc.doc-base.gtk.in similarity index 100% rename from debian/libgtk3.0-doc.doc-base.gtk.in rename to debian/libgtk-3-doc.doc-base.gtk.in diff --git a/debian/libgtk3.0-doc.install.in b/debian/libgtk-3-doc.install.in similarity index 100% rename from debian/libgtk3.0-doc.install.in rename to debian/libgtk-3-doc.install.in diff --git a/debian/libgtk3.0-doc.links.in b/debian/libgtk-3-doc.links.in similarity index 100% rename from debian/libgtk3.0-doc.links.in rename to debian/libgtk-3-doc.links.in diff --git a/debian/rules b/debian/rules index 935d3d93f1..ea32a23819 100644 --- a/debian/rules +++ b/debian/rules @@ -23,7 +23,7 @@ GNOME_MODULE = gtk+ # Make the linker work a bit harder so dynamic loading can be done faster LDFLAGS += -Wl,-O1 -APIVER := 3.0 +APIVER := 3 SONAME := 0 SHVER := 3.0.0 @@ -39,18 +39,21 @@ GTK_BINARY_VERSION := 3.0.0 # Gtk binary version virtual Provide GTK_BINVER_DEP := gtk$(APIVER)-binver-$(GTK_BINARY_VERSION) +# relative base directory for configuration +CONFDIR := etc/gtk-3.0 + # relative base directory for all types of modules -MODULES_BASE_PATH := $(LIBDIR)/gtk-$(APIVER)/$(GTK_BINARY_VERSION) +MODULES_BASE_PATH := $(LIBDIR)/gtk-3.0/$(GTK_BINARY_VERSION) # package names -SHARED_PKG := libgtk$(APIVER)-$(SONAME) -COMMON_PKG := libgtk$(APIVER)-common -DEV_PKG := libgtk$(APIVER)-dev +SHARED_PKG := libgtk-$(APIVER)-$(SONAME) +COMMON_PKG := libgtk-$(APIVER)-common +DEV_PKG := libgtk-$(APIVER)-dev UDEB_PKG := $(SHARED_PKG)-udeb -DOC_PKG := libgtk$(APIVER)-doc -BIN_PKG := libgtk$(APIVER)-bin +DOC_PKG := libgtk-$(APIVER)-doc +BIN_PKG := libgtk-$(APIVER)-bin DEBUG_PKG := $(SHARED_PKG)-dbg -EXAMPLES_PKG := gtk$(APIVER)-examples +EXAMPLES_PKG := gtk-$(APIVER)-examples PIXBUF_PKG := gtk3-engines-pixbuf @@ -86,9 +89,9 @@ DEB_MAKE_CHECK_TARGET = -k check || true DEB_INSTALL_DOCS_$(DOC_PKG) += -X.in DEB_DH_MAKESHLIBS_ARGS_ALL += -X$(MODULES_BASE_PATH) DEB_DH_MAKESHLIBS_ARGS_$(SHARED_PKG) += -V --add-udeb=$(UDEB_PKG) -- -c4 -DEB_DH_MAKESHLIBS_ARGS_libgail3.0-0 += -V"libgail3.0-0 (>= $(SHVER)), libgail3.0-common (>= $(SHVER))" -- -c4 +DEB_DH_MAKESHLIBS_ARGS_libgail-3-0 += -V"libgail-3-0 (>= $(SHVER)), libgail-3-common (>= $(SHVER))" -- -c4 DEB_DH_FIXPERMS_ARGS_ALL += -X$(LIBDIR)/$(SHARED_PKG) -DEB_DH_STRIP_ARGS = --dbg-package=$(if $(findstring libgail,$(cdbs_curpkg)),libgail3.0-0-dbg,$(DEBUG_PKG)) +DEB_DH_STRIP_ARGS = --dbg-package=$(if $(findstring libgail,$(cdbs_curpkg)),libgail-3-0-dbg,$(DEBUG_PKG)) DEB_DH_STRIP_ARGS_$(UDEB_PKG) = --dbg-package= # macro computing the list of 'debian/.*" files which have a @@ -131,12 +134,12 @@ build-arch: $(call dh_subst_files,$(DEB_ARCH_PACKAGES)) binary-install/$(SHARED_PKG):: # Install the binaries with a -3.0 suffix mv debian/$(SHARED_PKG)/$(LIBDIR)/$(SHARED_PKG)/gtk-update-icon-cache \ - debian/$(SHARED_PKG)/$(LIBDIR)/$(SHARED_PKG)/gtk-update-icon-cache-$(APIVER) + debian/$(SHARED_PKG)/$(LIBDIR)/$(SHARED_PKG)/gtk-update-icon-cache-3.0 binary-install/$(BIN_PKG):: # Install the binaries with a -3.0 suffix mv debian/$(BIN_PKG)/usr/share/man/man1/gtk-update-icon-cache.1 \ - debian/$(BIN_PKG)/usr/share/man/man1/gtk-update-icon-cache-$(APIVER).1 + debian/$(BIN_PKG)/usr/share/man/man1/gtk-update-icon-cache-3.0.1 binary-install/$(UDEB_PKG):: # generate a minimal MIME cache for the udeb