r31788 - in /desktop/unstable/gtk+3.0/debian: ./ patches/
mpitt at users.alioth.debian.org
mpitt at users.alioth.debian.org
Tue Nov 22 10:39:02 UTC 2011
Author: mpitt
Date: Tue Nov 22 10:39:01 2011
New Revision: 31788
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31788
Log:
* Build for multiarch. Adapted Steve Langasek's changes to Ubuntu's gtk+2.0
package:
- debian/control.in: Bump build dependencies to multiarch aware versions.
- debian/control.in: Add Multi-Arch: and necessary Pre-Depends: fields.
(libraries/-dbg are "same", -doc/-bin are "foreign").
- debian/rules: Use multiarch LIBDIR.
- debian/libgail-3-dev.install, debian/libgail-3-0.install: Rename to
*.in, and use @LIBDIR@ instead of hardcoded usr/lib.
- debian/gir1.2-gtk-3.0.install.in: Use @LIBDIR at .
- debian/libgtk-3-0.triggers.in, debian/libgtk-3-0.postinst.in,
debian/rules: Also trigger on changes to the fallback non-multiarch
module directory, which is now called @OLD_MODULES_BASE_PATH at .
- Add 061_multiarch_module_fallback.patch: Fall back to the hard-coded
pre-multiarch module directory when searching for modules. This
maintains compatibility with packages installing modules to
the old directories.
Added:
desktop/unstable/gtk+3.0/debian/libgail-3-0.install.in
- copied, changed from r31782, desktop/unstable/gtk+3.0/debian/libgail-3-0.install
desktop/unstable/gtk+3.0/debian/libgail-3-dev.install.in
- copied, changed from r31782, desktop/unstable/gtk+3.0/debian/libgail-3-dev.install
desktop/unstable/gtk+3.0/debian/patches/061_multiarch_module_fallback.patch
Removed:
desktop/unstable/gtk+3.0/debian/libgail-3-0.install
desktop/unstable/gtk+3.0/debian/libgail-3-dev.install
Modified:
desktop/unstable/gtk+3.0/debian/changelog
desktop/unstable/gtk+3.0/debian/control
desktop/unstable/gtk+3.0/debian/control.in
desktop/unstable/gtk+3.0/debian/gir1.2-gtk-3.0.install.in
desktop/unstable/gtk+3.0/debian/libgtk-3-0.postinst.in
desktop/unstable/gtk+3.0/debian/libgtk-3-0.triggers.in
desktop/unstable/gtk+3.0/debian/patches/series
desktop/unstable/gtk+3.0/debian/rules
Modified: desktop/unstable/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/changelog?rev=31788&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/changelog [utf-8] Tue Nov 22 10:39:01 2011
@@ -15,6 +15,22 @@
fixes missing GTypes in the .gir when using a separate build tree.
(LP: #769256, GNOME #647729)
* debian/rules: Bump SHVER to 3.1.90.
+ * Build for multiarch. Adapted Steve Langasek's changes to Ubuntu's gtk+2.0
+ package:
+ - debian/control.in: Bump build dependencies to multiarch aware versions.
+ - debian/control.in: Add Multi-Arch: and necessary Pre-Depends: fields.
+ (libraries/-dbg are "same", -doc/-bin are "foreign").
+ - debian/rules: Use multiarch LIBDIR.
+ - debian/libgail-3-dev.install, debian/libgail-3-0.install: Rename to
+ *.in, and use @LIBDIR@ instead of hardcoded usr/lib.
+ - debian/gir1.2-gtk-3.0.install.in: Use @LIBDIR at .
+ - debian/libgtk-3-0.triggers.in, debian/libgtk-3-0.postinst.in,
+ debian/rules: Also trigger on changes to the fallback non-multiarch
+ module directory, which is now called @OLD_MODULES_BASE_PATH at .
+ - Add 061_multiarch_module_fallback.patch: Fall back to the hard-coded
+ pre-multiarch module directory when searching for modules. This
+ maintains compatibility with packages installing modules to
+ the old directories.
-- Martin Pitt <mpitt at debian.org> Tue, 22 Nov 2011 09:34:45 +0100
Modified: desktop/unstable/gtk+3.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/control?rev=31788&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/control [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/control [utf-8] Tue Nov 22 10:39:01 2011
@@ -3,9 +3,10 @@
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 8.1.3),
cdbs (>= 0.4.90~),
gnome-pkg-tools (>= 0.11),
+ dpkg-dev (>= 1.16.0),
gtk-doc-tools (>= 1.11),
dh-autoreconf,
gettext,
@@ -31,8 +32,8 @@
libcairo2-dev (>= 1.10.0),
x11proto-xext-dev,
libcups2-dev (>= 1.2),
- gobject-introspection (>= 0.10.1),
- libgirepository1.0-dev (>= 0.10.1),
+ gobject-introspection (>= 0.10.8-2),
+ libgirepository1.0-dev (>= 0.10.8-2),
gir1.2-glib-2.0,
gir1.2-freedesktop,
gir1.2-atk-1.0,
@@ -63,6 +64,8 @@
Conflicts: libgtk3.0-0
Replaces: libgtk3.0-0
Breaks: gnome-themes-standard (<< 3.2)
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Description: GTK+ graphical user interface library
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -99,6 +102,7 @@
Recommends: libgtk-3-0
Conflicts: libgtk3.0-common
Replaces: libgtk3.0-common
+Multi-Arch: foreign
Description: common files for the GTK+ graphical user interface library
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -115,6 +119,7 @@
libgtk-3-common (= ${source:Version})
Conflicts: libgtk3.0-bin
Replaces: libgtk3.0-bin
+Multi-Arch: foreign
Description: programs for the GTK+ graphical user interface library
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -146,7 +151,7 @@
libxfixes-dev (>= 1:3.0.0-3),
libxcomposite-dev (>= 1:0.2.0-3),
libxdamage-dev (>= 1:1.0.1-3),
- pkg-config,
+ pkg-config (>= 0.26-1),
libxml2-utils
Recommends: python (>= 2.4),
debhelper
@@ -171,6 +176,7 @@
${misc:Depends}
Conflicts: libgtk3.0-0-dbg
Replaces: libgtk3.0-0-dbg
+Multi-Arch: same
Description: GTK+ libraries and debugging symbols
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -191,6 +197,7 @@
Suggests: devhelp
Conflicts: libgtk3.0-doc
Replaces: libgtk3.0-doc
+Multi-Arch: foreign
Description: documentation for the GTK+ graphical user interface library
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -257,6 +264,8 @@
libgtk-3-0 (= ${binary:Version})
Conflicts: libgail3.0-0
Replaces: libgail3.0-0
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
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
@@ -271,7 +280,7 @@
Depends: ${misc:Depends},
libgail-3-0 (= ${binary:Version}),
libgtk-3-dev (= ${binary:Version}),
- pkg-config,
+ pkg-config (>= 0.26-1),
libatk1.0-dev (>= 1.13.0)
Suggests: libgail-3-doc
Conflicts: libgail3.0-dev
@@ -292,6 +301,7 @@
Recommends: libgtk-3-0-dbg
Conflicts: libgail3.0-0-dbg
Replaces: libgail3.0-0-dbg
+Multi-Arch: same
Description: Gail libraries and debugging symbols
Gail is the "GNOME Accessibility Implementation Library".
.
@@ -306,6 +316,7 @@
Suggests: devhelp
Conflicts: libgail3.0-doc
Replaces: libgail3.0-doc
+Multi-Arch: foreign
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
Modified: desktop/unstable/gtk+3.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/control.in?rev=31788&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/control.in [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/control.in [utf-8] Tue Nov 22 10:39:01 2011
@@ -3,9 +3,10 @@
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 8.1.3),
cdbs (>= 0.4.90~),
gnome-pkg-tools (>= 0.11),
+ dpkg-dev (>= 1.16.0),
gtk-doc-tools (>= 1.11),
dh-autoreconf,
gettext,
@@ -31,8 +32,8 @@
libcairo2-dev (>= 1.10.0),
x11proto-xext-dev,
libcups2-dev (>= 1.2),
- gobject-introspection (>= 0.10.1),
- libgirepository1.0-dev (>= 0.10.1),
+ gobject-introspection (>= 0.10.8-2),
+ libgirepository1.0-dev (>= 0.10.8-2),
gir1.2-glib-2.0,
gir1.2-freedesktop,
gir1.2-atk-1.0,
@@ -63,6 +64,8 @@
Conflicts: libgtk3.0-0
Replaces: libgtk3.0-0
Breaks: gnome-themes-standard (<< 3.2)
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Description: GTK+ graphical user interface library
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -99,6 +102,7 @@
Recommends: @SHARED_PKG@
Conflicts: libgtk3.0-common
Replaces: libgtk3.0-common
+Multi-Arch: foreign
Description: common files for the GTK+ graphical user interface library
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -115,6 +119,7 @@
@COMMON_PKG@ (= ${source:Version})
Conflicts: libgtk3.0-bin
Replaces: libgtk3.0-bin
+Multi-Arch: foreign
Description: programs for the GTK+ graphical user interface library
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -146,7 +151,7 @@
libxfixes-dev (>= 1:3.0.0-3),
libxcomposite-dev (>= 1:0.2.0-3),
libxdamage-dev (>= 1:1.0.1-3),
- pkg-config,
+ pkg-config (>= 0.26-1),
libxml2-utils
Recommends: python (>= 2.4),
debhelper
@@ -171,6 +176,7 @@
${misc:Depends}
Conflicts: libgtk3.0-0-dbg
Replaces: libgtk3.0-0-dbg
+Multi-Arch: same
Description: GTK+ libraries and debugging symbols
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -191,6 +197,7 @@
Suggests: devhelp
Conflicts: libgtk3.0-doc
Replaces: libgtk3.0-doc
+Multi-Arch: foreign
Description: documentation for the GTK+ graphical user interface library
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -257,6 +264,8 @@
@SHARED_PKG@ (= ${binary:Version})
Conflicts: libgail3.0-0
Replaces: libgail3.0-0
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
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
@@ -271,7 +280,7 @@
Depends: ${misc:Depends},
libgail-3-0 (= ${binary:Version}),
@DEV_PKG@ (= ${binary:Version}),
- pkg-config,
+ pkg-config (>= 0.26-1),
libatk1.0-dev (>= 1.13.0)
Suggests: libgail-3-doc
Conflicts: libgail3.0-dev
@@ -292,6 +301,7 @@
Recommends: @DEBUG_PKG@
Conflicts: libgail3.0-0-dbg
Replaces: libgail3.0-0-dbg
+Multi-Arch: same
Description: Gail libraries and debugging symbols
Gail is the "GNOME Accessibility Implementation Library".
.
@@ -306,6 +316,7 @@
Suggests: devhelp
Conflicts: libgail3.0-doc
Replaces: libgail3.0-doc
+Multi-Arch: foreign
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
Modified: desktop/unstable/gtk+3.0/debian/gir1.2-gtk-3.0.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/gir1.2-gtk-3.0.install.in?rev=31788&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/gir1.2-gtk-3.0.install.in [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/gir1.2-gtk-3.0.install.in [utf-8] Tue Nov 22 10:39:01 2011
@@ -1,1 +1,1 @@
-debian/install/shared/usr/lib/girepository-1.0/ usr/lib/
+debian/install/shared/@LIBDIR@/girepository-1.0/ usr/lib/
Copied: desktop/unstable/gtk+3.0/debian/libgail-3-0.install.in (from r31782, desktop/unstable/gtk+3.0/debian/libgail-3-0.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/libgail-3-0.install.in?rev=31788&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/libgail-3-0.install [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/libgail-3-0.install.in [utf-8] Tue Nov 22 10:39:01 2011
@@ -1,1 +1,1 @@
-debian/install/shared/usr/lib/libgail*.so.* /usr/lib
+debian/install/shared/@LIBDIR@/libgail*.so.* @LIBDIR@
Copied: desktop/unstable/gtk+3.0/debian/libgail-3-dev.install.in (from r31782, desktop/unstable/gtk+3.0/debian/libgail-3-dev.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/libgail-3-dev.install.in?rev=31788&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/libgail-3-dev.install [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/libgail-3-dev.install.in [utf-8] Tue Nov 22 10:39:01 2011
@@ -1,4 +1,4 @@
debian/install/shared/usr/include/gail* /usr/include
-debian/install/shared/usr/lib/libgail*.so /usr/lib
-debian/install/static/usr/lib/libgail*.a /usr/lib
-debian/install/shared/usr/lib/pkgconfig/gail*.pc /usr/lib/pkgconfig
+debian/install/shared/@LIBDIR@/libgail*.so @LIBDIR@
+debian/install/static/@LIBDIR@/libgail*.a @LIBDIR@
+debian/install/shared/@LIBDIR@/pkgconfig/gail*.pc @LIBDIR@/pkgconfig
Modified: desktop/unstable/gtk+3.0/debian/libgtk-3-0.postinst.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/libgtk-3-0.postinst.in?rev=31788&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/libgtk-3-0.postinst.in [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/libgtk-3-0.postinst.in [utf-8] Tue Nov 22 10:39:01 2011
@@ -7,10 +7,10 @@
continue
fi
case $trigger in
- /@MODULES_BASE_PATH@/immodules)
+ /@MODULES_BASE_PATH@/immodules|/@OLD_MODULES_BASE_PATH@/immodules)
# This is triggered everytime an application installs a
# GTK immodule loader
- /@LIBDIR@/@SHARED_PKG@/gtk-query-immodules-3.0 /@MODULES_BASE_PATH@/immodules/*.so > /@MODULES_BASE_PATH@/immodules.cache || true
+ /@LIBDIR@/@SHARED_PKG@/gtk-query-immodules-3.0 /@MODULES_BASE_PATH@/immodules/*.so /@OLD_MODULES_BASE_PATH@/immodules/*.so > /@MODULES_BASE_PATH@/immodules.cache || true
;;
esac
done
@@ -21,6 +21,6 @@
# Also handle the initial installation
if [ -d /@MODULES_BASE_PATH@/immodules ]; then
- /@LIBDIR@/@SHARED_PKG@/gtk-query-immodules-3.0 /@MODULES_BASE_PATH@/immodules/*.so > /@MODULES_BASE_PATH@/immodules.cache || true
+ /@LIBDIR@/@SHARED_PKG@/gtk-query-immodules-3.0 /@MODULES_BASE_PATH@/immodules/*.so /@OLD_MODULES_BASE_PATH@/immodules/*.so > /@MODULES_BASE_PATH@/immodules.cache || true
fi
Modified: desktop/unstable/gtk+3.0/debian/libgtk-3-0.triggers.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/libgtk-3-0.triggers.in?rev=31788&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/libgtk-3-0.triggers.in [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/libgtk-3-0.triggers.in [utf-8] Tue Nov 22 10:39:01 2011
@@ -1,1 +1,2 @@
interest /@MODULES_BASE_PATH@/immodules
+interest /@OLD_MODULES_BASE_PATH@/immodules
Added: desktop/unstable/gtk+3.0/debian/patches/061_multiarch_module_fallback.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/061_multiarch_module_fallback.patch?rev=31788&op=file
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/061_multiarch_module_fallback.patch (added)
+++ desktop/unstable/gtk+3.0/debian/patches/061_multiarch_module_fallback.patch [utf-8] Tue Nov 22 10:39:01 2011
@@ -1,0 +1,48 @@
+Description: Fall back to the hard-coded pre-multiarch module directory
+ Include /usr/lib/gtk-3.0 in the path as a fallback when building for
+ multiarch, to maintain compatibility with packages installing modules to
+ the old directories.
+Author: Steve Langasek <steve.langasek at linaro.org>
+Forwarded: not-needed
+
+Index: gtk+3.0/gtk/gtkmodules.c
+===================================================================
+--- gtk+3.0.orig/gtk/gtkmodules.c 2011-11-11 23:39:31.000000000 +0100
++++ gtk+3.0/gtk/gtkmodules.c 2011-11-22 10:36:57.091163711 +0100
+@@ -59,6 +59,7 @@
+ gchar *home_gtk_dir = NULL;
+ gchar *module_path;
+ gchar *default_dir;
++ gchar *pre_multiarch_dir = NULL;
+ static gchar **result = NULL;
+
+ if (result)
+@@ -73,21 +74,23 @@
+
+ if (exe_prefix)
+ default_dir = g_build_filename (exe_prefix, "lib", "gtk-3.0", NULL);
+- else
++ else {
+ default_dir = g_build_filename (GTK_LIBDIR, "gtk-3.0", NULL);
++ pre_multiarch_dir = "/usr/lib/gtk-3.0";
++ }
+
+ if (module_path_env && home_gtk_dir)
+ module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
+- module_path_env, home_gtk_dir, default_dir, NULL);
++ module_path_env, home_gtk_dir, default_dir, pre_multiarch_dir, NULL);
+ else if (module_path_env)
+ module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
+- module_path_env, default_dir, NULL);
++ module_path_env, default_dir, pre_multiarch_dir, NULL);
+ else if (home_gtk_dir)
+ module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
+- home_gtk_dir, default_dir, NULL);
++ home_gtk_dir, default_dir, pre_multiarch_dir, NULL);
+ else
+ module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
+- default_dir, NULL);
++ default_dir, pre_multiarch_dir, NULL);
+
+ g_free (home_gtk_dir);
+ g_free (default_dir);
Modified: desktop/unstable/gtk+3.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/series?rev=31788&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/patches/series [utf-8] Tue Nov 22 10:39:01 2011
@@ -11,4 +11,5 @@
043_notebook_scroll.patch
044_tracker_fts.patch
060_ignore-random-icons.patch
+061_multiarch_module_fallback.patch
70-Fix-document-generation-in-out-of-tree-builds.patch
Modified: desktop/unstable/gtk+3.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/rules?rev=31788&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/rules [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/rules [utf-8] Tue Nov 22 10:39:01 2011
@@ -25,11 +25,7 @@
SONAME := 0
SHVER := 3.1.90
-ifneq (,$(findstring multiarch,$(DEB_BUILD_OPTIONS)))
-LIBDIR := usr/lib/$(DEB_HOST_GNU_TYPE)
-else
-LIBDIR := usr/lib
-endif
+LIBDIR := usr/lib/$(DEB_HOST_MULTIARCH)
# earliest version that this release has backwards binary compatibility for
GTK_BINARY_VERSION := 3.0.0
@@ -42,6 +38,7 @@
# relative base directory for all types of modules
MODULES_BASE_PATH := $(LIBDIR)/gtk-3.0/$(GTK_BINARY_VERSION)
+OLD_MODULES_BASE_PATH := usr/lib/gtk-3.0/$(GTK_BINARY_VERSION)
# package names
SHARED_PKG := libgtk-$(APIVER)-$(SONAME)
@@ -117,6 +114,7 @@
-e 's#@OPTLIBDIR@#$(OPTLIBDIR)#g' \
-e 's#@CONFDIR@#$(CONFDIR)#g' \
-e "s#@MODULES_BASE_PATH@#$(MODULES_BASE_PATH)#g" \
+ -e "s#@OLD_MODULES_BASE_PATH@#$(OLD_MODULES_BASE_PATH)#g" \
$@.in > $@
clean:: debian/control
More information about the pkg-gnome-commits
mailing list