r50630 - in /desktop/unstable/brasero/debian: brasero-cdrkit.install brasero.install changelog compat control control.in docs libbrasero-media3-1.install libbrasero-media3-dev.install patches/allow-overriding-plugin-directory.patch patches/series rules
jbicha-guest at users.alioth.debian.org
jbicha-guest at users.alioth.debian.org
Thu Sep 15 09:48:38 UTC 2016
Author: jbicha-guest
Date: Thu Sep 15 09:48:38 2016
New Revision: 50630
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=50630
Log:
onvert from cdbs to dh
* Bump dh compat to 10
* Add debian/docs to install AUTHORS, NEWS, README
* Add debian/patches/allow-overriding-plugin-directory.patch:
- Allow overriding plugin install directory with environment variable
* Enable all hardening flags
Added:
desktop/unstable/brasero/debian/docs
desktop/unstable/brasero/debian/patches/allow-overriding-plugin-directory.patch
Modified:
desktop/unstable/brasero/debian/brasero-cdrkit.install
desktop/unstable/brasero/debian/brasero.install
desktop/unstable/brasero/debian/changelog
desktop/unstable/brasero/debian/compat
desktop/unstable/brasero/debian/control
desktop/unstable/brasero/debian/control.in
desktop/unstable/brasero/debian/libbrasero-media3-1.install
desktop/unstable/brasero/debian/libbrasero-media3-dev.install
desktop/unstable/brasero/debian/patches/series
desktop/unstable/brasero/debian/rules
Modified: desktop/unstable/brasero/debian/brasero-cdrkit.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/brasero-cdrkit.install?rev=50630&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/brasero-cdrkit.install [utf-8] (original)
+++ desktop/unstable/brasero/debian/brasero-cdrkit.install [utf-8] Thu Sep 15 09:48:38 2016
@@ -1,6 +1,6 @@
-usr/lib/brasero*/plugins/libbrasero-dvdauthor.so
-usr/lib/brasero*/plugins/libbrasero-vob.so
-usr/lib/brasero*/plugins/libbrasero-genisoimage.so
-usr/lib/brasero*/plugins/libbrasero-wodim.so
-usr/lib/brasero*/plugins/libbrasero-readom.so
-usr/lib/brasero*/plugins/libbrasero-growisofs.so
+usr/lib/*/brasero*/plugins/libbrasero-dvdauthor.so
+usr/lib/*/brasero*/plugins/libbrasero-vob.so
+usr/lib/*/brasero*/plugins/libbrasero-genisoimage.so
+usr/lib/*/brasero*/plugins/libbrasero-wodim.so
+usr/lib/*/brasero*/plugins/libbrasero-readom.so
+usr/lib/*/brasero*/plugins/libbrasero-growisofs.so
Modified: desktop/unstable/brasero/debian/brasero.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/brasero.install?rev=50630&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/brasero.install [utf-8] (original)
+++ desktop/unstable/brasero/debian/brasero.install [utf-8] Thu Sep 15 09:48:38 2016
@@ -2,4 +2,4 @@
usr/share/appdata
usr/share/applications
usr/share/man
-usr/lib/nautilus/*/*.so
+usr/lib/*/nautilus/*/*.so
Modified: desktop/unstable/brasero/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/changelog?rev=50630&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/changelog [utf-8] (original)
+++ desktop/unstable/brasero/debian/changelog [utf-8] Thu Sep 15 09:48:38 2016
@@ -1,3 +1,14 @@
+brasero (3.12.1-3) UNRELEASED; urgency=medium
+
+ * Convert from cdbs to dh
+ * Bump dh compat to 10
+ * Add debian/docs to install AUTHORS, NEWS, README
+ * Add debian/patches/allow-overriding-plugin-directory.patch:
+ - Allow overriding plugin install directory with environment variable
+ * Enable all hardening flags
+
+ -- Jeremy Bicha <jbicha at ubuntu.com> Thu, 15 Sep 2016 05:06:45 -0400
+
brasero (3.12.1-2) unstable; urgency=medium
[ Michael Biebl ]
Modified: desktop/unstable/brasero/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/compat?rev=50630&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/compat [utf-8] (original)
+++ desktop/unstable/brasero/debian/compat [utf-8] Thu Sep 15 09:48:38 2016
@@ -1 +1 @@
-8
+10
Modified: desktop/unstable/brasero/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/control?rev=50630&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/control [utf-8] (original)
+++ desktop/unstable/brasero/debian/control [utf-8] Thu Sep 15 09:48:38 2016
@@ -8,9 +8,6 @@
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
Build-Depends: debhelper (>= 8),
- autotools-dev,
- dh-autoreconf,
- cdbs,
gnome-pkg-tools (>= 0.7),
yelp-tools,
gtk-doc-tools (>= 1.12),
@@ -76,6 +73,7 @@
Package: brasero-common
Architecture: all
+Multi-Arch: foreign
Depends: ${misc:Depends}
Replaces: brasero (<< 2.26)
Breaks: brasero (<< 2.26)
@@ -87,6 +85,7 @@
Package: brasero-cdrkit
Architecture: any
+Multi-Arch: same
Depends: ${shlibs:Depends},
${misc:Depends},
libbrasero-media3-1 (= ${binary:Version}),
@@ -109,6 +108,7 @@
Package: libbrasero-media3-1
Architecture: any
+Multi-Arch: same
Section: libs
Depends: ${shlibs:Depends},
${misc:Depends},
@@ -125,6 +125,7 @@
Package: libbrasero-media3-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
Depends: libbrasero-media3-1 (= ${binary:Version}),
gir1.2-brasero-3.0 (= ${binary:Version}),
@@ -141,6 +142,7 @@
Package: gir1.2-brasero-3.0
Architecture: any
+Multi-Arch: same
Section: introspection
Depends: ${gir:Depends},
${misc:Depends},
Modified: desktop/unstable/brasero/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/control.in?rev=50630&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/control.in [utf-8] (original)
+++ desktop/unstable/brasero/debian/control.in [utf-8] Thu Sep 15 09:48:38 2016
@@ -4,9 +4,6 @@
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>= 8),
- autotools-dev,
- dh-autoreconf,
- cdbs,
gnome-pkg-tools (>= 0.7),
yelp-tools,
gtk-doc-tools (>= 1.12),
@@ -72,6 +69,7 @@
Package: brasero-common
Architecture: all
+Multi-Arch: foreign
Depends: ${misc:Depends}
Replaces: brasero (<< 2.26)
Breaks: brasero (<< 2.26)
@@ -83,6 +81,7 @@
Package: brasero-cdrkit
Architecture: any
+Multi-Arch: same
Depends: ${shlibs:Depends},
${misc:Depends},
libbrasero-media3-1 (= ${binary:Version}),
@@ -105,6 +104,7 @@
Package: libbrasero-media3-1
Architecture: any
+Multi-Arch: same
Section: libs
Depends: ${shlibs:Depends},
${misc:Depends},
@@ -121,6 +121,7 @@
Package: libbrasero-media3-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
Depends: libbrasero-media3-1 (= ${binary:Version}),
gir1.2-brasero-3.0 (= ${binary:Version}),
@@ -137,6 +138,7 @@
Package: gir1.2-brasero-3.0
Architecture: any
+Multi-Arch: same
Section: introspection
Depends: ${gir:Depends},
${misc:Depends},
Added: desktop/unstable/brasero/debian/docs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/docs?rev=50630&op=file
==============================================================================
--- desktop/unstable/brasero/debian/docs (added)
+++ desktop/unstable/brasero/debian/docs [utf-8] Thu Sep 15 09:48:38 2016
@@ -0,0 +1,3 @@
+AUTHORS
+NEWS
+README
Modified: desktop/unstable/brasero/debian/libbrasero-media3-1.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/libbrasero-media3-1.install?rev=50630&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/libbrasero-media3-1.install [utf-8] (original)
+++ desktop/unstable/brasero/debian/libbrasero-media3-1.install [utf-8] Thu Sep 15 09:48:38 2016
@@ -1,14 +1,14 @@
-usr/lib/*.so.*
-usr/lib/brasero*/plugins/libbrasero-checksum.so
-usr/lib/brasero*/plugins/libbrasero-audio2cue.so
-usr/lib/brasero*/plugins/libbrasero-normalize.so
-usr/lib/brasero*/plugins/libbrasero-dvdrwformat.so
-usr/lib/brasero*/plugins/libbrasero-dvdcss.so
-usr/lib/brasero*/plugins/libbrasero-burn-uri.so
-usr/lib/brasero*/plugins/libbrasero-libburn.so
-usr/lib/brasero*/plugins/libbrasero-checksum-file.so
-usr/lib/brasero*/plugins/libbrasero-transcode.so
-usr/lib/brasero*/plugins/libbrasero-local-track.so
-usr/lib/brasero*/plugins/libbrasero-cdrdao.so
-usr/lib/brasero*/plugins/libbrasero-libisofs.so
-usr/lib/brasero*/plugins/libbrasero-vcdimager.so
+usr/lib/*/*.so.*
+usr/lib/*/brasero*/plugins/libbrasero-checksum.so
+usr/lib/*/brasero*/plugins/libbrasero-audio2cue.so
+usr/lib/*/brasero*/plugins/libbrasero-normalize.so
+usr/lib/*/brasero*/plugins/libbrasero-dvdrwformat.so
+usr/lib/*/brasero*/plugins/libbrasero-dvdcss.so
+usr/lib/*/brasero*/plugins/libbrasero-burn-uri.so
+usr/lib/*/brasero*/plugins/libbrasero-libburn.so
+usr/lib/*/brasero*/plugins/libbrasero-checksum-file.so
+usr/lib/*/brasero*/plugins/libbrasero-transcode.so
+usr/lib/*/brasero*/plugins/libbrasero-local-track.so
+usr/lib/*/brasero*/plugins/libbrasero-cdrdao.so
+usr/lib/*/brasero*/plugins/libbrasero-libisofs.so
+usr/lib/*/brasero*/plugins/libbrasero-vcdimager.so
Modified: desktop/unstable/brasero/debian/libbrasero-media3-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/libbrasero-media3-dev.install?rev=50630&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/libbrasero-media3-dev.install [utf-8] (original)
+++ desktop/unstable/brasero/debian/libbrasero-media3-dev.install [utf-8] Thu Sep 15 09:48:38 2016
@@ -1,5 +1,5 @@
-usr/lib/pkgconfig
-usr/lib/*.so
+usr/lib/*/pkgconfig
+usr/lib/*/*.so
usr/include
usr/share/gtk-doc
usr/share/gir-1.0
Added: desktop/unstable/brasero/debian/patches/allow-overriding-plugin-directory.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/patches/allow-overriding-plugin-directory.patch?rev=50630&op=file
==============================================================================
--- desktop/unstable/brasero/debian/patches/allow-overriding-plugin-directory.patch (added)
+++ desktop/unstable/brasero/debian/patches/allow-overriding-plugin-directory.patch [utf-8] Thu Sep 15 09:48:38 2016
@@ -0,0 +1,15 @@
+Description: Allow overriding plugin install directory
+Author: Jeremy Bicha <jbicha at ubuntu.com>
+Index: brasero-3.12.1/configure.ac
+===================================================================
+--- brasero-3.12.1.orig/configure.ac
++++ brasero-3.12.1/configure.ac
+@@ -295,7 +295,7 @@ AM_CONDITIONAL(BUILD_NAUTILUS, test x"$b
+ # Installation path for plugins
+ #
+
+-BRASERO_PLUGIN_DIRECTORY=${libdir}/brasero3/plugins
++BRASERO_PLUGIN_DIRECTORY=${BRASERO_PLUGIN_DIRECTORY:-'${libdir}/brasero3/plugins'}
+ AC_SUBST(BRASERO_PLUGIN_DIRECTORY)
+
+ dnl ****************check for libburn (optional)**************
Modified: desktop/unstable/brasero/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/patches/series?rev=50630&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/patches/series [utf-8] (original)
+++ desktop/unstable/brasero/debian/patches/series [utf-8] Thu Sep 15 09:48:38 2016
@@ -0,0 +1 @@
+allow-overriding-plugin-directory.patch
Modified: desktop/unstable/brasero/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/rules?rev=50630&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/rules [utf-8] (original)
+++ desktop/unstable/brasero/debian/rules [utf-8] Thu Sep 15 09:48:38 2016
@@ -1,31 +1,39 @@
#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
-include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
SOVERSION := $(shell sed -rn 's/^Package:[[:space:]]*libbrasero-media([0-9-]+)[[:space:]]*$$/\1/p' debian/control)
SHLIBS := 3.0.0
-DEB_DH_MAKESHLIBS_ARGS_libbrasero-media$(SOVERSION) += -V 'libbrasero-media$(SOVERSION) (>= $(SHLIBS))' -Xplugins -- -c4
-DEB_DH_MAKESHLIBS_ARGS_brasero += --no-act
-DEB_DH_MAKESHLIBS_ARGS_brasero-cdrkit += --no-act
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+# 3.12.1 fails to build with -z defs
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,--as-needed
-DEB_CONFIGURE_EXTRA_FLAGS += \
- --disable-cdrtools \
- --disable-caches \
- --enable-search \
- --enable-introspection \
- --enable-gtk-doc
-
-DEB_MAKE_EXTRA_ARGS += BRASERO_PLUGIN_DIRECTORY=/usr/lib/brasero$(SOVERSION)/plugins
+export BRASERO_PLUGIN_DIRECTORY = /usr/lib/${DEB_HOST_MULTIARCH}/brasero$(SOVERSION)/plugins
ifneq ($(DEB_BUILD_ARCH_OS), linux)
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-inotify
+CONFFLAGS += --disable-inotify
endif
-# List any files which are not installed
-common-binary-post-install-arch:: list-missing
+%:
+ dh $@ --with gir,gnome
+
+override_dh_autoreconf:
+ dh_autoreconf --as-needed
+
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ --disable-cdrtools \
+ --disable-caches \
+ --enable-search \
+ --enable-introspection \
+ --enable-gtk-doc \
+ $(CONFFLAGS)
+
+override_dh_install:
+ find . -name "*.la" -delete
+ dh_install --fail-missing
+
+override_dh_makeshlibs:
+ dh_makeshlibs -plibbrasero-media$(SOVERSION) -V 'libbrasero-media$(SOVERSION) (>= $(SHLIBS))' -Xplugins -- -c4
+ dh_makeshlibs -pbrasero --no-act
+ dh_makeshlibs -pbrasero-cdrkit --no-act
More information about the pkg-gnome-commits
mailing list