Package: babl Followup-For: Bug #541170 Hi, it would be nice to have 0.1.4 in experimental to test the new gimp beta releases. I prepared a small patch set to update the packaging to the new upstream version:
[PATCH 1/8] bumb soname, add dbg package ---------------------------------------- bump soname from 0.0 to 0.1, add libbabl-0.1-0-dbg package [PATCH 2/8] switch to 3.0 (quilt) --------------------------------- use 3.0 (quilt) source format, add local-options with abort-on-upstream-changes and unapply-patches [PATCH 3/8] remove .la files ---------------------------- remove all .la files after build [PATCH 4/8] add symbols file ---------------------------- add a symbols file for libbabl-0.1.so.0 [PATCH 5/8] add gir1.2-babl-0.1, use dh-autoreconf -------------------------------------------------- add package for GIRepository, Makefile.am needs a patch from upstream's git, use dh-autoreconf [PATCH 6/8] use © instead of (C) in copyright --------------------------------------------- lintian complains about (C) in copyright [PATCH 7/8] exclude /usr/lib/babl-0.1 from dh_makeshlibs -------------------------------------------------------- exclude libraries in /u/l/babl-0.1 from dh_makeshlibs [PATCH 8/8] use dh_installdocs exclude instead of rm ---------------------------------------------------- use dh_installdocs --exclude=Makefile instead of rm Thanks, Daniel Schaal -- System Information: Debian Release: wheezy/sid APT prefers unstable APT policy: (990, 'unstable'), (102, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 3.1.0 (SMP w/2 CPU cores) Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
>From eb273382b916972ae4601cf32a333457fafaf34d Mon Sep 17 00:00:00 2001 From: Daniel Schaal <farb...@web.de> Date: Sun, 9 Oct 2011 08:35:57 +0200 Subject: [PATCH 1/8] bumb soname, add dbg package Closes: #503674 --- debian/TODO | 1 - debian/compat | 2 +- debian/control | 25 +++++++++++++++++++------ debian/libbabl-0.0-0-dev.install | 3 --- debian/libbabl-0.0-0.install | 2 -- debian/libbabl-0.0-doc.docs | 4 ---- debian/libbabl-0.1-0-dev.install | 3 +++ debian/libbabl-0.1-0.install | 2 ++ debian/libbabl-0.1-doc.docs | 4 ++++ debian/rules | 2 +- 10 files changed, 30 insertions(+), 18 deletions(-) delete mode 100644 debian/TODO delete mode 100644 debian/libbabl-0.0-0-dev.install delete mode 100644 debian/libbabl-0.0-0.install delete mode 100644 debian/libbabl-0.0-doc.docs create mode 100644 debian/libbabl-0.1-0-dev.install create mode 100644 debian/libbabl-0.1-0.install create mode 100644 debian/libbabl-0.1-doc.docs diff --git a/debian/TODO b/debian/TODO deleted file mode 100644 index 0196c44..0000000 --- a/debian/TODO +++ /dev/null @@ -1 +0,0 @@ -Add -dbg package diff --git a/debian/compat b/debian/compat index 7ed6ff8..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +7 diff --git a/debian/control b/debian/control index dc402e7..1825e53 100644 --- a/debian/control +++ b/debian/control @@ -2,10 +2,10 @@ Source: babl Section: libs Priority: optional Maintainer: Ross Burton <r...@debian.org> -Build-Depends: debhelper (>= 5), cdbs, autotools-dev -Standards-Version: 3.7.3 +Build-Depends: debhelper (>= 7), cdbs, autotools-dev +Standards-Version: 3.9.2 -Package: libbabl-0.0-0 +Package: libbabl-0.1-0 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Dynamic, any to any, pixel format conversion library @@ -14,10 +14,23 @@ Description: Dynamic, any to any, pixel format conversion library stored in. Babl doesn't only help with existing pixel formats, but also facilitates creation of new and uncommon ones. -Package: libbabl-0.0-0-dev +Package: libbabl-0.1-0-dbg +Architecture: any +Priority: extra +Section: debug +Depends: libbabl-0.1-0 (= ${binary:Version}), ${misc:Depends} +Description: Dynamic, any to any, pixel format conversion library (Debug symbols) + Babl is a dynamic, any to any, pixel format conversion library. It + provides conversions between the myriad of buffer types images can be + stored in. Babl doesn't only help with existing pixel formats, but + also facilitates creation of new and uncommon ones. + . + This package contains the debugging symbols. + +Package: libbabl-0.1-0-dev Architecture: any Section: libdevel -Depends: ${misc:Depends}, libbabl-0.0-0 (= ${binary:Version}) +Depends: ${misc:Depends}, libbabl-0.1-0 (= ${binary:Version}) Description: Dynamic, any to any, pixel format conversion library (development files) Babl is a dynamic, any to any, pixel format conversion library. It provides conversions between the myriad of buffer types images can be @@ -26,7 +39,7 @@ Description: Dynamic, any to any, pixel format conversion library (development f . This package contains the development files. -Package: libbabl-0.0-doc +Package: libbabl-0.1-doc Architecture: all Section: doc Depends: ${misc:Depends} diff --git a/debian/libbabl-0.0-0-dev.install b/debian/libbabl-0.0-0-dev.install deleted file mode 100644 index 625887e..0000000 --- a/debian/libbabl-0.0-0-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -debian/tmp/usr/include/ -debian/tmp/usr/lib/libbabl*.so -debian/tmp/usr/lib/pkgconfig/ diff --git a/debian/libbabl-0.0-0.install b/debian/libbabl-0.0-0.install deleted file mode 100644 index 2aa2767..0000000 --- a/debian/libbabl-0.0-0.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/lib/babl-*/ -debian/tmp/usr/lib/libbabl*.so.* diff --git a/debian/libbabl-0.0-doc.docs b/debian/libbabl-0.0-doc.docs deleted file mode 100644 index 4144316..0000000 --- a/debian/libbabl-0.0-doc.docs +++ /dev/null @@ -1,4 +0,0 @@ -docs/index.html -docs/Babl*.html -docs/babl.css -docs/graphics/ diff --git a/debian/libbabl-0.1-0-dev.install b/debian/libbabl-0.1-0-dev.install new file mode 100644 index 0000000..4628b22 --- /dev/null +++ b/debian/libbabl-0.1-0-dev.install @@ -0,0 +1,3 @@ +usr/include/ +usr/lib/libbabl*.so +usr/lib/pkgconfig/ diff --git a/debian/libbabl-0.1-0.install b/debian/libbabl-0.1-0.install new file mode 100644 index 0000000..a2646a6 --- /dev/null +++ b/debian/libbabl-0.1-0.install @@ -0,0 +1,2 @@ +usr/lib/babl-*/ +usr/lib/libbabl*.so.* diff --git a/debian/libbabl-0.1-doc.docs b/debian/libbabl-0.1-doc.docs new file mode 100644 index 0000000..4144316 --- /dev/null +++ b/debian/libbabl-0.1-doc.docs @@ -0,0 +1,4 @@ +docs/index.html +docs/Babl*.html +docs/babl.css +docs/graphics/ diff --git a/debian/rules b/debian/rules index 12cb6cd..488af55 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,7 @@ include /usr/share/cdbs/1/rules/utils.mk export LDFLAGS += -Wl,--as-needed -binary-install/libbabl-0.0-doc:: +binary-install/libbabl-0.1-doc:: rm -f debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/graphics/Makefile* common-binary-predeb-arch:: list-missing -- 1.7.7.1
>From 59de781ce908fbab8249d21c824bca75f876913d Mon Sep 17 00:00:00 2001 From: Daniel Schaal <farb...@web.de> Date: Sun, 9 Oct 2011 08:45:54 +0200 Subject: [PATCH 2/8] switch to 3.0 (quilt) --- debian/source/format | 1 + debian/source/local-options | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) create mode 100644 debian/source/format create mode 100644 debian/source/local-options diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/local-options b/debian/source/local-options new file mode 100644 index 0000000..9cdfca9 --- /dev/null +++ b/debian/source/local-options @@ -0,0 +1,2 @@ +unapply-patches +abort-on-upstream-changes -- 1.7.7.1
>From 42204a4c139bbd8e0fcf52375103ed4b4eb5d152 Mon Sep 17 00:00:00 2001 From: Daniel Schaal <farb...@web.de> Date: Sun, 9 Oct 2011 09:50:07 +0200 Subject: [PATCH 3/8] remove .la files --- debian/rules | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/debian/rules b/debian/rules index 488af55..d969518 100755 --- a/debian/rules +++ b/debian/rules @@ -9,4 +9,8 @@ export LDFLAGS += -Wl,--as-needed binary-install/libbabl-0.1-doc:: rm -f debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/graphics/Makefile* +common-post-build-arch:: + find debian/tmp -name "*.la" -delete + common-binary-predeb-arch:: list-missing + -- 1.7.7.1
>From 7c9c30003207af971678f299b508365b49147200 Mon Sep 17 00:00:00 2001 From: Daniel Schaal <farb...@web.de> Date: Sun, 9 Oct 2011 10:00:52 +0200 Subject: [PATCH 4/8] add symbols file --- debian/libbabl-0.1-0.symbols | 129 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 129 insertions(+), 0 deletions(-) create mode 100644 debian/libbabl-0.1-0.symbols diff --git a/debian/libbabl-0.1-0.symbols b/debian/libbabl-0.1-0.symbols new file mode 100644 index 0000000..facf46b --- /dev/null +++ b/debian/libbabl-0.1-0.symbols @@ -0,0 +1,129 @@ +libbabl-0.1.so.0 libbabl-0.1-0 #MINVER# + babl_backtrack@Base 0.1.4 + babl_base_destroy@Base 0.1.4 + babl_base_init@Base 0.1.4 + babl_base_model_gray@Base 0.1.4 + babl_base_model_rgb@Base 0.1.4 + babl_base_model_ycbcr@Base 0.1.4 + babl_base_type_float@Base 0.1.4 + babl_base_type_u16@Base 0.1.4 + babl_base_type_u32@Base 0.1.4 + babl_base_type_u8@Base 0.1.4 + babl_calloc@Base 0.1.4 + babl_class_name@Base 0.1.4 + babl_component@Base 0.1.4 + babl_component_class_for_each@Base 0.1.4 + babl_component_db@Base 0.1.4 + babl_component_from_id@Base 0.1.4 + babl_component_new@Base 0.1.4 + babl_conversion@Base 0.1.4 + babl_conversion_class_for_each@Base 0.1.4 + babl_conversion_cost@Base 0.1.4 + babl_conversion_db@Base 0.1.4 + babl_conversion_error@Base 0.1.4 + babl_conversion_find@Base 0.1.4 + babl_conversion_from_id@Base 0.1.4 + babl_conversion_new@Base 0.1.4 + babl_conversion_process@Base 0.1.4 + babl_core_init@Base 0.1.4 + babl_cpu_accel_get_support@Base 0.1.4 + babl_cpu_accel_set_use@Base 0.1.4 + babl_db_count@Base 0.1.4 + babl_db_each@Base 0.1.4 + babl_db_exist@Base 0.1.4 + babl_db_exist_by_id@Base 0.1.4 + babl_db_exist_by_name@Base 0.1.4 + babl_db_find@Base 0.1.4 + babl_db_init@Base 0.1.4 + babl_db_insert@Base 0.1.4 + babl_die@Base 0.1.4 + babl_dup@Base 0.1.4 + babl_exit@Base 0.1.4 + babl_extender@Base 0.1.4 + babl_extension@Base 0.1.4 + babl_extension_base@Base 0.1.4 + babl_extension_class_for_each@Base 0.1.4 + babl_extension_db@Base 0.1.4 + babl_extension_deinit@Base 0.1.4 + babl_extension_from_id@Base 0.1.4 + babl_extension_load_dir_list@Base 0.1.4 + babl_extension_quiet_log@Base 0.1.4 + babl_fish@Base 0.1.4 + babl_fish_class_for_each@Base 0.1.4 + babl_fish_db@Base 0.1.4 + babl_fish_get_id@Base 0.1.4 + babl_fish_path@Base 0.1.4 + babl_fish_reference@Base 0.1.4 + babl_fish_reference_process@Base 0.1.4 + babl_fish_simple@Base 0.1.4 + babl_fish_stats@Base 0.1.4 + babl_format@Base 0.1.4 + babl_format_class_for_each@Base 0.1.4 + babl_format_db@Base 0.1.4 + babl_format_from_id@Base 0.1.4 + babl_format_get_bytes_per_pixel@Base 0.1.4 + babl_format_get_n_components@Base 0.1.4 + babl_format_get_type@Base 0.1.4 + babl_format_has_alpha@Base 0.1.4 + babl_format_loss@Base 0.1.4 + babl_format_mutex@Base 0.1.4 + babl_format_n@Base 0.1.4 + babl_format_new@Base 0.1.4 + babl_format_with_model_as_type@Base 0.1.4 + babl_formats_count@Base 0.1.4 + babl_formats_init@Base 0.1.4 + babl_free@Base 0.1.4 + babl_get_name@Base 0.1.4 + babl_get_version@Base 0.1.4 + babl_hash_by_int@Base 0.1.4 + babl_hash_by_str@Base 0.1.4 + babl_hash_table_find@Base 0.1.4 + babl_hash_table_init@Base 0.1.4 + babl_hash_table_insert@Base 0.1.4 + babl_hash_table_size@Base 0.1.4 + babl_hmpf_on_name_lookups@Base 0.1.4 + babl_image_from_linear@Base 0.1.4 + babl_image_new@Base 0.1.4 + babl_init@Base 0.1.4 + babl_internal_destroy@Base 0.1.4 + babl_internal_init@Base 0.1.4 + babl_introspect@Base 0.1.4 + babl_list_copy@Base 0.1.4 + babl_list_each@Base 0.1.4 + babl_list_init@Base 0.1.4 + babl_list_init_with_size@Base 0.1.4 + babl_list_insert_last@Base 0.1.4 + babl_list_remove_last@Base 0.1.4 + babl_malloc@Base 0.1.4 + babl_model@Base 0.1.4 + babl_model_class_for_each@Base 0.1.4 + babl_model_db@Base 0.1.4 + babl_model_from_id@Base 0.1.4 + babl_model_is_symmetric@Base 0.1.4 + babl_model_new@Base 0.1.4 + babl_mutex_destroy@Base 0.1.4 + babl_mutex_lock@Base 0.1.4 + babl_mutex_new@Base 0.1.4 + babl_mutex_unlock@Base 0.1.4 + babl_process@Base 0.1.4 + babl_process_cost@Base 0.1.4 + babl_realloc@Base 0.1.4 + babl_rel_avg_error@Base 0.1.4 + babl_sampling@Base 0.1.4 + babl_sampling_class_for_each@Base 0.1.4 + babl_sampling_class_init@Base 0.1.4 + babl_sanity@Base 0.1.4 + babl_set_destructor@Base 0.1.4 + babl_set_extender@Base 0.1.4 + babl_set_free@Base 0.1.4 + babl_set_malloc@Base 0.1.4 + babl_sizeof@Base 0.1.4 + babl_strcat@Base 0.1.4 + babl_strdup@Base 0.1.4 + babl_ticks@Base 0.1.4 + babl_type@Base 0.1.4 + babl_type_class_for_each@Base 0.1.4 + babl_type_db@Base 0.1.4 + babl_type_from_id@Base 0.1.4 + babl_type_is_symmetric@Base 0.1.4 + babl_type_new@Base 0.1.4 -- 1.7.7.1
>From 54589215062ebd365cbc2f1810c9f500ff774243 Mon Sep 17 00:00:00 2001 From: Daniel Schaal <farb...@web.de> Date: Sat, 22 Oct 2011 12:25:54 +0200 Subject: [PATCH 5/8] add gir1.2-babl-0.1, use dh-autoreconf --- debian/control | 16 +++++++++++++++- debian/gir1.2-babl-0.1.install | 2 ++ debian/patches/fix-introspection.patch | 17 +++++++++++++++++ debian/patches/series | 1 + debian/rules | 1 + 5 files changed, 36 insertions(+), 1 deletions(-) create mode 100644 debian/gir1.2-babl-0.1.install create mode 100644 debian/patches/fix-introspection.patch create mode 100644 debian/patches/series diff --git a/debian/control b/debian/control index 1825e53..b475bcf 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: babl Section: libs Priority: optional Maintainer: Ross Burton <r...@debian.org> -Build-Depends: debhelper (>= 7), cdbs, autotools-dev +Build-Depends: debhelper (>= 7), cdbs, dh-autoreconf, pkg-config, gobject-introspection, libgirepository1.0-dev Standards-Version: 3.9.2 Package: libbabl-0.1-0 @@ -50,3 +50,17 @@ Description: Dynamic, any to any, pixel format conversion library (documentation also facilitates creation of new and uncommon ones. . This package contains the API documentation. + +Package: gir1.2-babl-0.1 +Architecture: any +Depends: ${misc:Depends}, + libbabl-0.1-0 (= ${binary:Version}), + ${gir:Depends} +Description: Typelib file for libbabl-0.1 + Babl is a dynamic, any to any, pixel format conversion library. It + provides conversions between the myriad of buffer types images can be + stored in. Babl doesn't only help with existing pixel formats, but + also facilitates creation of new and uncommon ones. + . + This package can be used by other packages using the GIRepository format to + generate dynamic bindings for libbabl-0.1. diff --git a/debian/gir1.2-babl-0.1.install b/debian/gir1.2-babl-0.1.install new file mode 100644 index 0000000..2b1644b --- /dev/null +++ b/debian/gir1.2-babl-0.1.install @@ -0,0 +1,2 @@ +usr/lib/girepository-1.0/Babl-0.1.typelib +usr/share/gir-1.0/Babl-0.1.gir diff --git a/debian/patches/fix-introspection.patch b/debian/patches/fix-introspection.patch new file mode 100644 index 0000000..4024a64 --- /dev/null +++ b/debian/patches/fix-introspection.patch @@ -0,0 +1,17 @@ +Description: Remove --pkg babl option to g-ir-scanner + --pkg is intended for dependencies. Babl does not depend on Babl + This lead to g-ir-scanner barfing if Babl was not already installed. +Origin: upstream +Applied-Upstream: d96973bc348b860b214e19f6cdefd24a78c745c6 +Last-Update: 2011-10-23 + +--- a/babl/Makefile.am ++++ b/babl/Makefile.am +@@ -95,7 +95,6 @@ + --library=babl-$(BABL_API_VERSION) \ + --libtool="$(LIBTOOL)" \ + --output $@ \ +- --pkg babl \ + -DBABL_IS_BEING_COMPILED \ + -I$(top_srcdir) \ + -I$(top_builddir) \ diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..415cd3f --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +fix-introspection.patch diff --git a/debian/rules b/debian/rules index d969518..cf95d7d 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/rules/autoreconf.mk export LDFLAGS += -Wl,--as-needed -- 1.7.7.1
>From 5ea1e0e23431b94229497c2dff01fc627416fa6f Mon Sep 17 00:00:00 2001 From: Daniel Schaal <farb...@web.de> Date: Sun, 23 Oct 2011 12:49:03 +0200 Subject: [PATCH 6/8] =?UTF-8?q?use=20=C2=A9=20instead=20of=20(C)=20in=20copy?= =?UTF-8?q?right?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/copyright | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/debian/copyright b/debian/copyright index 05ea87d..0c3f70d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -26,5 +26,5 @@ License: On Debian GNU/Linux systems, the complete text of the GNU Lesser General Public License can be found in `/usr/share/common-licenses/LGPL'. -The Debian packaging is (C) 2007, Étienne Bersac <bersac...@laposte.net> and +The Debian packaging is © 2007, Étienne Bersac <bersac...@laposte.net> and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. -- 1.7.7.1
>From 3d77f9424030ea67db0791f531fa00fc9e2aeb78 Mon Sep 17 00:00:00 2001 From: Daniel Schaal <farb...@web.de> Date: Mon, 24 Oct 2011 18:48:09 +0200 Subject: [PATCH 7/8] exclude /usr/lib/babl-0.1 from dh_makeshlibs --- debian/rules | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/debian/rules b/debian/rules index cf95d7d..c789389 100755 --- a/debian/rules +++ b/debian/rules @@ -7,6 +7,8 @@ include /usr/share/cdbs/1/rules/autoreconf.mk export LDFLAGS += -Wl,--as-needed +DEB_DH_MAKESHLIBS_ARGS_libbabl-0.1-0 = "--exclude=/usr/lib/babl-0.1" + binary-install/libbabl-0.1-doc:: rm -f debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/graphics/Makefile* -- 1.7.7.1
>From c409238f7a8c1050405f4fcd25f55a690fe72b56 Mon Sep 17 00:00:00 2001 From: Daniel Schaal <farb...@web.de> Date: Tue, 25 Oct 2011 07:12:42 +0200 Subject: [PATCH 8/8] use dh_installdocs exclude instead of rm --- debian/rules | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/debian/rules b/debian/rules index c789389..82b7e1b 100755 --- a/debian/rules +++ b/debian/rules @@ -8,9 +8,7 @@ include /usr/share/cdbs/1/rules/autoreconf.mk export LDFLAGS += -Wl,--as-needed DEB_DH_MAKESHLIBS_ARGS_libbabl-0.1-0 = "--exclude=/usr/lib/babl-0.1" - -binary-install/libbabl-0.1-doc:: - rm -f debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/graphics/Makefile* +DEB_DH_INSTALLDOCS_ARGS_libbabl-0.1-doc = "--exclude=Makefile" common-post-build-arch:: find debian/tmp -name "*.la" -delete -- 1.7.7.1