From 74f16064ff73f55e3762604b6eea3745b911a943 Mon Sep 17 00:00:00 2001 From: Pavel Charvat Date: Fri, 6 Dec 2013 22:47:22 +0100 Subject: [PATCH] Packages: Several fixes in debian packages. --- debian/config | 2 ++ debian/control.in | 20 ++++++++++++++------ debian/rules | 1 + images/Makefile | 14 +++++++++----- ucw/Makefile | 5 +++-- 5 files changed, 29 insertions(+), 13 deletions(-) diff --git a/debian/config b/debian/config index c343f7aa..d84eb825 100644 --- a/debian/config +++ b/debian/config @@ -9,5 +9,7 @@ Set("CONFIG_DOC"); Set("CONFIG_CHARSET"); Set("CONFIG_XML"); Set("CONFIG_IMAGES"); +UnSet("CONFIG_IMAGES_LIBUNGIF"); +Set("CONFIG_IMAGES_LIBGIF"); 1; diff --git a/debian/control.in b/debian/control.in index 88047b83..676bc246 100644 --- a/debian/control.in +++ b/debian/control.in @@ -1,21 +1,29 @@ Source: libucw -Section: apps Priority: optional -Maintainer: Pavel Charvat -Build-Depends: debhelper (>= 7) +Maintainer: LibUCW developers +Build-Depends: debhelper (>= 7), devscripts, bash, pkg-config, libjpeg-dev, libpng-dev, libgif-dev, asciidoc Standards-Version: 3.8.0 Package: libucw-@UCW_ABI_VERSION@ +Section: libs Architecture: any -Depends: ${shlib:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: LibUCW library Package: libucw-dev +Section: libdevel Architecture: any -Depends: libucw-@UCW_ABI_VERSION@ (= @VER@), ${shlib:Depends}, ${misc:Depends} +Depends: libucw-@UCW_ABI_VERSION@ (= @VER@), ${shlibs:Depends}, ${misc:Depends} Description: LibUCW development files +Package: libucw-utils +Section: misc +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: LibUCW utilities + Package: libucw-doc +Section: doc Architecture: all -Depends: ${shlib:Depends}, ${misc:Depeneds} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: LibUCW documentation diff --git a/debian/rules b/debian/rules index 88441da9..e4a2bad4 100755 --- a/debian/rules +++ b/debian/rules @@ -29,6 +29,7 @@ install: build dh_installdirs $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-$(UCW_ABI_VERSION) $(addprefix install-,libucw libucw-charset libucw-xml libucw-images) $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-dev $(addprefix install-,$(addsuffix -api,libucw libucw-charset libucw-xml libucw-images)) + $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-utils install-ucw-utils install-ucw-shell install-libucw-images-utils $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-doc install-libucw-docs binary-indep: build install diff --git a/images/Makefile b/images/Makefile index bbf9be16..35cfbd10 100644 --- a/images/Makefile +++ b/images/Makefile @@ -92,12 +92,10 @@ $(o)/images/.include-stamp: $(addprefix $(s)/images/,$(LIBIMAGES_INCLUDES)) $(o)/images/.include-stamp: IDST=images run/lib/pkgconfig/libucw-images.pc: $(o)/images/libucw-images.pc -INSTALL_TARGETS+=install-libucw-images install-libucw-images-api +INSTALL_TARGETS+=install-libucw-images install-libucw-images-api install-libucw-images-utils install-libucw-images: - install -d -m 755 $(addprefix $(DESTDIR),$(INSTALL_BIN_DIR) $(INSTALL_LIB_DIR) $(INSTALL_CONFIG_DIR)) - install -m 755 $(LIBIMAGES_PROGS) $(DESTDIR)$(INSTALL_BIN_DIR) - install -m 644 $(addprefix run/$(CONFIG_DIR)/,$(LIBIMAGES_CONFIGS)) $(DESTDIR)$(INSTALL_CONFIG_DIR) + install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR) install -m 644 run/lib/libucw-images.so.$(UCW_ABI_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR) install-libucw-images-api: @@ -107,5 +105,11 @@ install-libucw-images-api: ln -sf libucw-images.so.$(UCW_ABI_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-images.so install -m 644 run/lib/libucw-images.a $(DESTDIR)$(INSTALL_LIB_DIR) install -m 644 run/lib/libucw-images-pic.a $(DESTDIR)$(INSTALL_LIB_DIR) + #install -d -m 755 $(DESTDIR)$(INSTALL_CONFIG_DIR) + #install -m 644 $(addprefix run/$(CONFIG_DIR)/,$(LIBIMAGES_CONFIGS)) $(DESTDIR)$(INSTALL_CONFIG_DIR) + +install-libucw-images-utils: + install -d -m 755 $(DESTDIR)$(INSTALL_BIN_DIR) + install -m 755 $(LIBIMAGES_PROGS) $(DESTDIR)$(INSTALL_BIN_DIR) -.PHONY: install-libucw-images install-libucw-images-api +.PHONY: install-libucw-images install-libucw-images-api install-libucw-images-utils diff --git a/ucw/Makefile b/ucw/Makefile index 95731ba8..2cd12eb7 100644 --- a/ucw/Makefile +++ b/ucw/Makefile @@ -187,9 +187,8 @@ CONFIGS+=libucw INSTALL_TARGETS+=install-libucw install-libucw-api install-libucw: - install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_CONFIG_DIR) + install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR) install -m 644 run/lib/libucw.so.$(UCW_ABI_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR)/ - install -m 644 run/$(CONFIG_DIR)/libucw $(DESTDIR)$(INSTALL_CONFIG_DIR) install-libucw-api: install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw/ $(DESTDIR)$(INSTALL_PKGCONFIG_DIR) @@ -198,5 +197,7 @@ install-libucw-api: ln -sf libucw.so.$(UCW_ABI_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw.so install -m 644 run/lib/libucw.a $(DESTDIR)$(INSTALL_LIB_DIR) install -m 644 run/lib/libucw-pic.a $(DESTDIR)$(INSTALL_LIB_DIR) + #install -d -m 755 $(DESTDIR)$(INSTALL_CONFIG_DIR) + #install -m 644 run/$(CONFIG_DIR)/libucw $(DESTDIR)$(INSTALL_CONFIG_DIR) .PHONY: install-libucw install-libucw-api -- 2.39.5