Set --sourcedir for the different flavors when running dh_install. This
way the .install files can be simplified a lot which makes them much more readable.
This commit is contained in:
parent
d768fd50f7
commit
ce34580537
3
debian/changelog
vendored
3
debian/changelog
vendored
@ -9,6 +9,9 @@ gtk+3.0 (3.4.1-1) UNRELEASED; urgency=low
|
||||
* Drop explicit Build-Depends on gir1.2-glib-2.0 and gir1.2-freedesktop.
|
||||
* Refresh patches.
|
||||
* Remove leftovers from the opt flavor.
|
||||
* Set --sourcedir for the different flavors when running dh_install. This
|
||||
way the .install files can be simplified a lot which makes them much more
|
||||
readable.
|
||||
|
||||
-- Michael Biebl <biebl@debian.org> Mon, 16 Apr 2012 00:39:13 +0200
|
||||
|
||||
|
1
debian/gir1.2-gtk-3.0.install
vendored
Normal file
1
debian/gir1.2-gtk-3.0.install
vendored
Normal file
@ -0,0 +1 @@
|
||||
usr/lib/*/girepository-1.0/ usr/lib/
|
1
debian/gir1.2-gtk-3.0.install.in
vendored
1
debian/gir1.2-gtk-3.0.install.in
vendored
@ -1 +0,0 @@
|
||||
debian/install/shared/@LIBDIR@/girepository-1.0/ usr/lib/
|
4
debian/gtk-3-examples.install
vendored
Normal file
4
debian/gtk-3-examples.install
vendored
Normal file
@ -0,0 +1,4 @@
|
||||
usr/bin/gtk3-demo
|
||||
usr/bin/gtk3-widget-factory
|
||||
usr/share/gtk-3.0/demo
|
||||
usr/share/glib-2.0/schemas/org.gtk.Demo.gschema.xml
|
4
debian/gtk-3-examples.install.in
vendored
4
debian/gtk-3-examples.install.in
vendored
@ -1,4 +0,0 @@
|
||||
debian/install/shared/usr/bin/gtk3-demo usr/bin
|
||||
debian/install/shared/usr/bin/gtk3-widget-factory usr/bin
|
||||
debian/install/shared/usr/share/gtk-3.0/demo usr/share/gtk-3.0
|
||||
debian/install/shared/usr/share/glib-2.0/schemas/org.gtk.Demo.gschema.xml usr/share/glib-2.0/schemas
|
2
debian/libgail-3-0.install
vendored
2
debian/libgail-3-0.install
vendored
@ -1 +1 @@
|
||||
debian/install/shared/usr/lib/libgail*.so.* /usr/lib
|
||||
usr/lib/*/libgail*.so.*
|
||||
|
1
debian/libgail-3-0.install.in
vendored
1
debian/libgail-3-0.install.in
vendored
@ -1 +0,0 @@
|
||||
debian/install/shared/@LIBDIR@/libgail*.so.* @LIBDIR@
|
2
debian/libgail-3-0.opt
vendored
2
debian/libgail-3-0.opt
vendored
@ -1,2 +0,0 @@
|
||||
# from the optimised flavor
|
||||
debian/install/opt/@LIBDIR@/libgail*.so.* @OPTLIBDIR@
|
7
debian/libgail-3-dev.install
vendored
7
debian/libgail-3-dev.install
vendored
@ -1,4 +1,3 @@
|
||||
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
|
||||
usr/include/gail*
|
||||
usr/lib/*/libgail*.so
|
||||
usr/lib/*/pkgconfig/gail*.pc
|
||||
|
3
debian/libgail-3-dev.install.in
vendored
3
debian/libgail-3-dev.install.in
vendored
@ -1,3 +0,0 @@
|
||||
debian/install/shared/usr/include/gail* /usr/include
|
||||
debian/install/shared/@LIBDIR@/libgail*.so @LIBDIR@
|
||||
debian/install/shared/@LIBDIR@/pkgconfig/gail*.pc @LIBDIR@/pkgconfig
|
2
debian/libgail-3-doc.install
vendored
2
debian/libgail-3-doc.install
vendored
@ -1 +1 @@
|
||||
debian/install/shared/usr/share/gtk-doc/html/gail* usr/share/gtk-doc/html
|
||||
usr/share/gtk-doc/html/gail*
|
||||
|
1
debian/libgtk-3-0-udeb.install
vendored
Normal file
1
debian/libgtk-3-0-udeb.install
vendored
Normal file
@ -0,0 +1 @@
|
||||
usr/lib/*/libg?k*.so.*
|
1
debian/libgtk-3-0-udeb.install.in
vendored
1
debian/libgtk-3-0-udeb.install.in
vendored
@ -1 +0,0 @@
|
||||
debian/install/shared_udeb/@LIBDIR@/libg?k*.so.* @LIBDIR@
|
12
debian/libgtk-3-0.install.in
vendored
12
debian/libgtk-3-0.install.in
vendored
@ -1,6 +1,6 @@
|
||||
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
|
||||
debian/install/shared/@MODULES_BASE_PATH@/printbackends/*.so @MODULES_BASE_PATH@/printbackends
|
||||
debian/install/shared/@LIBDIR@/libgtk*.so.* @LIBDIR@
|
||||
debian/install/shared/@LIBDIR@/libgdk*.so.* @LIBDIR@
|
||||
usr/bin/gtk-query-immodules-3.0 @LIBDIR@/@SHARED_PKG@
|
||||
usr/bin/gtk-update-icon-cache @LIBDIR@/@SHARED_PKG@
|
||||
@MODULES_BASE_PATH@/immodules/*.so
|
||||
@MODULES_BASE_PATH@/printbackends/*.so
|
||||
@LIBDIR@/libgtk*.so.*
|
||||
@LIBDIR@/libgdk*.so.*
|
||||
|
2
debian/libgtk-3-bin.install
vendored
Normal file
2
debian/libgtk-3-bin.install
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
usr/share/man/man1/gtk-update-icon-cache.1
|
||||
usr/share/man/man1/gtk-query-immodules-3.0.1
|
3
debian/libgtk-3-bin.install.in
vendored
3
debian/libgtk-3-bin.install.in
vendored
@ -1,3 +0,0 @@
|
||||
debian/install/shared/usr/share/man/man1/gtk-update-icon-cache.1 usr/share/man/man1
|
||||
debian/install/shared/usr/share/man/man1/gtk-query-immodules-3.0.1 usr/share/man/man1
|
||||
debian/update-icon-caches usr/sbin
|
10
debian/libgtk-3-common.install.in
vendored
10
debian/libgtk-3-common.install.in
vendored
@ -1,5 +1,5 @@
|
||||
debian/install/shared/@CONFDIR@/im-multipress.conf @CONFDIR@
|
||||
debian/install/shared/usr/share/locale usr/share
|
||||
debian/install/shared/usr/share/themes usr/share
|
||||
debian/install/shared/usr/share/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml usr/share/glib-2.0/schemas
|
||||
debian/install/shared/usr/share/glib-2.0/schemas/org.gtk.Settings.ColorChooser.gschema.xml usr/share/glib-2.0/schemas
|
||||
@CONFDIR@/im-multipress.conf
|
||||
usr/share/locale
|
||||
usr/share/themes
|
||||
usr/share/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml
|
||||
usr/share/glib-2.0/schemas/org.gtk.Settings.ColorChooser.gschema.xml
|
||||
|
5
debian/libgtk-3-dev.install
vendored
Normal file
5
debian/libgtk-3-dev.install
vendored
Normal file
@ -0,0 +1,5 @@
|
||||
usr/include/gtk*
|
||||
usr/lib/*/libg?k*.so
|
||||
usr/lib/*/pkgconfig/g?k*
|
||||
usr/share/aclocal
|
||||
usr/share/gir-1.0
|
5
debian/libgtk-3-dev.install.in
vendored
5
debian/libgtk-3-dev.install.in
vendored
@ -1,5 +0,0 @@
|
||||
debian/install/shared/usr/include/gtk* usr/include
|
||||
debian/install/shared/@LIBDIR@/libg?k*.so @LIBDIR@
|
||||
debian/install/shared/@LIBDIR@/pkgconfig/g?k* @LIBDIR@/pkgconfig
|
||||
debian/install/shared/usr/share/aclocal usr/share
|
||||
debian/install/shared/usr/share/gir-1.0 usr/share
|
1
debian/libgtk-3-doc.docs
vendored
Normal file
1
debian/libgtk-3-doc.docs
vendored
Normal file
@ -0,0 +1 @@
|
||||
docs/*.txt
|
6
debian/libgtk-3-doc.install.in
vendored
6
debian/libgtk-3-doc.install.in
vendored
@ -1,4 +1,2 @@
|
||||
debian/install/shared/usr/share/gtk-doc/html/gtk* usr/share/doc/@DOC_PKG@
|
||||
debian/install/shared/usr/share/gtk-doc/html/gdk* usr/share/doc/@DOC_PKG@
|
||||
# from the source
|
||||
docs/*.txt usr/share/doc/@DOC_PKG@
|
||||
usr/share/gtk-doc/html/gtk* usr/share/doc/@DOC_PKG@
|
||||
usr/share/gtk-doc/html/gdk* usr/share/doc/@DOC_PKG@
|
||||
|
8
debian/rules
vendored
8
debian/rules
vendored
@ -50,6 +50,8 @@ BIN_PKG := libgtk-$(APIVER)-bin
|
||||
DEBUG_PKG := $(SHARED_PKG)-dbg
|
||||
EXAMPLES_PKG := gtk-$(APIVER)-examples
|
||||
|
||||
DEB_DH_INSTALL_ARGS += --sourcedir=debian/install/shared
|
||||
DEB_DH_INSTALL_ARGS_$(UDEB_PKG) += --sourcedir=debian/install/shared_udeb
|
||||
|
||||
DEB_CONFIGURE_EXTRA_FLAGS = \
|
||||
--libdir=/$(LIBDIR) \
|
||||
@ -121,12 +123,14 @@ 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-3.0
|
||||
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-3.0.1
|
||||
debian/$(BIN_PKG)/usr/share/man/man1/gtk-update-icon-cache-3.0.1
|
||||
install -m 0755 -D debian/update-icon-caches \
|
||||
debian/$(BIN_PKG)/usr/sbin/update-icon-caches
|
||||
|
||||
list-missing:
|
||||
# FIXME: remove this when CDBS' list-missing works with multiple flavors
|
||||
|
Loading…
Reference in New Issue
Block a user