From 2f07126a7a7fe65f61dfc93ce7fa6457671c0ae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 3 Jun 2017 10:28:47 +0200 Subject: Use the automatic debug symbol packages --- debian/changelog | 3 +++ debian/control | 18 ------------------ debian/rules | 13 +------------ 3 files changed, 4 insertions(+), 30 deletions(-) diff --git a/debian/changelog b/debian/changelog index 99fa248..25a73d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ shotwell (0.26.2-1) UNRELEASED; urgency=medium - debian/control: Add new appstream-util, libappstream-glib-dev and libgdata-dev to Build-Depends. * New debian/DEVELOP.debian. + * Use the automatic debug symbol packages: + - Remove shotwell-dbg section from debian/control. + - Remove override_dh_strip and some lines on dh_install from debian/rules. -- Jörg Frings-Fürst Wed, 22 Mar 2017 06:51:19 +0100 diff --git a/debian/control b/debian/control index 02d320a..84843fb 100644 --- a/debian/control +++ b/debian/control @@ -69,21 +69,3 @@ Description: digital photo organizer - common files to manage a lot of image formats such as JPEG, PNG, BMP, TIFF and Raw CR2. . This package provides image files and documentation for Shotwell. - -Package: shotwell-dbg -Priority: extra -Section: debug -Architecture: linux-any -Depends: ${misc:Depends}, - shotwell (= ${binary:Version}) -Description: digital photo organizer - debugging symbols - Shotwell is a digital photo organizer designed for the GNOME desktop - environment. It allows you to import photos, pictures, images and videos - from disk or camera. Shotwell can organize them in collections and in other - various ways. The viewer shows them in full-window or fullscreen mode and - presents them as galleries or slideshows. The integrated editor can rotate, - flip, crop and tag the photos, adjust the colors und remove red eyes. Export - is possible to facebook, Flickr or Youtube to share with others. It is able - to manage a lot of image formats such as JPEG, PNG, BMP, TIFF and Raw CR2. - . - This package contains the debugging symbols for Shotwell. diff --git a/debian/rules b/debian/rules index f8d940b..4b0e1b1 100755 --- a/debian/rules +++ b/debian/rules @@ -10,18 +10,10 @@ B_DATE:=$(shell LC_ALL=C date --utc -d "$(CHDATE)") dh $@ override_dh_auto_configure: - ./configure --prefix=/usr --libexec=/usr/lib --disable-schemas-compile + ./configure --prefix=/usr --libexec=/usr/lib --disable-schemas-compile override_dh_install: dh_install - # Touch the generated C files with mtime of debian/changelog, - # find -type f -name '*.c' -exec touch -r $(CURDIR)/debian/changelog {} \; - # then install these C files required for debugging into the shotwell-dbg package. - mkdir -p debian/shotwell-dbg/usr/share/doc/shotwell-dbg/temp-source - find -type f -name '*.c' -exec cp --parent '{}' debian/shotwell-dbg/usr/share/doc/shotwell-dbg/temp-source/ ';' - cd debian/shotwell-dbg/usr/share/doc/shotwell-dbg && \ - tar --mode=go=rX,u+rw,a-s --mtime="$(B_DATE)" -cJf temp-source.tar.xz temp-source - rm -fr debian/shotwell-dbg/usr/share/doc/shotwell-dbg/temp-source # Remove unwanted la files rm -f debian/shotwell/usr/lib/shotwell/plugins/builtin/*.la rm -f debian/shotwell/usr/lib/*.la @@ -29,9 +21,6 @@ override_dh_install: override_dh_installchangelogs: dh_installchangelogs NEWS -override_dh_strip: - dh_strip --dbg-package=shotwell-dbg - override_dh_compress: dh_compress -X.tar.xz -- cgit v1.2.3