r49403 - in /desktop/unstable/nautilus/debian: changelog control control.in docs gir1.2-nautilus-3.0.install libnautilus-extension-dev.install libnautilus-extension1a.install nautilus.install rules
jbicha-guest at users.alioth.debian.org
jbicha-guest at users.alioth.debian.org
Thu Aug 4 03:56:29 UTC 2016
Author: jbicha-guest
Date: Thu Aug 4 03:56:28 2016
New Revision: 49403
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=49403
Log:
* Convert from cdbs to dh
* Add debian/docs to explicitly install AUTHORS, NEWS, and THANKS
* Partially multiarchify but still install nautilus extensions to
/usr/lib/nautilus/extensions-3.0/ (from Ubuntu)
* Update homepage
Added:
desktop/unstable/nautilus/debian/docs
Modified:
desktop/unstable/nautilus/debian/changelog
desktop/unstable/nautilus/debian/control
desktop/unstable/nautilus/debian/control.in
desktop/unstable/nautilus/debian/gir1.2-nautilus-3.0.install
desktop/unstable/nautilus/debian/libnautilus-extension-dev.install
desktop/unstable/nautilus/debian/libnautilus-extension1a.install
desktop/unstable/nautilus/debian/nautilus.install
desktop/unstable/nautilus/debian/rules
Modified: desktop/unstable/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/changelog?rev=49403&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog [utf-8] (original)
+++ desktop/unstable/nautilus/debian/changelog [utf-8] Thu Aug 4 03:56:28 2016
@@ -1,3 +1,13 @@
+nautilus (3.20.1-4) UNRELEASED; urgency=medium
+
+ * Convert from cdbs to dh
+ * Add debian/docs to explicitly install AUTHORS, NEWS, and THANKS
+ * Partially multiarchify but still install nautilus extensions to
+ /usr/lib/nautilus/extensions-3.0/ (from Ubuntu)
+ * Update homepage
+
+ -- Jeremy Bicha <jbicha at ubuntu.com> Fri, 22 Jul 2016 00:02:47 -0400
+
nautilus (3.20.1-3) unstable; urgency=medium
* debian/nautilus.install: Move nautilus-autostart.desktop back to
Modified: desktop/unstable/nautilus/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/control?rev=49403&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/control [utf-8] (original)
+++ desktop/unstable/nautilus/debian/control [utf-8] Thu Aug 4 03:56:28 2016
@@ -10,7 +10,6 @@
Build-Depends: debhelper (>= 9.20160114),
dpkg-dev (>= 1.17.14),
dh-autoreconf,
- cdbs (>= 0.4.90),
gnome-pkg-tools (>= 0.13),
libglib2.0-dev (>= 2.45.7),
libatk1.0-dev (>= 1.32.0),
@@ -34,7 +33,7 @@
libgirepository1.0-dev (>= 0.10.7-1~),
libglib2.0-doc,
libgtk-3-doc
-Homepage: http://www.gnome.org/projects/nautilus/
+Homepage: https://wiki.gnome.org/action/show/Apps/Nautilus
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/nautilus/
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/nautilus/
Standards-Version: 3.9.8
@@ -70,6 +69,7 @@
Package: libnautilus-extension1a
Architecture: any
+Multi-Arch: same
Section: libs
Depends: ${misc:Depends},
${shlibs:Depends}
@@ -81,6 +81,7 @@
Package: libnautilus-extension-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
Depends: libnautilus-extension1a (= ${binary:Version}),
gir1.2-nautilus-3.0 (= ${binary:Version}),
@@ -97,6 +98,7 @@
Package: gir1.2-nautilus-3.0
Architecture: any
+Multi-Arch: same
Section: introspection
Depends: ${gir:Depends},
${shlibs:Depends},
@@ -110,6 +112,7 @@
Package: nautilus-data
Architecture: all
+Multi-Arch: foreign
Depends: ${misc:Depends}
Recommends: nautilus
Description: data files for nautilus
Modified: desktop/unstable/nautilus/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/control.in?rev=49403&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/control.in [utf-8] (original)
+++ desktop/unstable/nautilus/debian/control.in [utf-8] Thu Aug 4 03:56:28 2016
@@ -6,7 +6,6 @@
Build-Depends: debhelper (>= 9.20160114),
dpkg-dev (>= 1.17.14),
dh-autoreconf,
- cdbs (>= 0.4.90),
gnome-pkg-tools (>= 0.13),
libglib2.0-dev (>= 2.45.7),
libatk1.0-dev (>= 1.32.0),
@@ -30,7 +29,7 @@
libgirepository1.0-dev (>= 0.10.7-1~),
libglib2.0-doc,
libgtk-3-doc
-Homepage: http://www.gnome.org/projects/nautilus/
+Homepage: https://wiki.gnome.org/action/show/Apps/Nautilus
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/nautilus/
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/nautilus/
Standards-Version: 3.9.8
@@ -66,6 +65,7 @@
Package: libnautilus-extension1a
Architecture: any
+Multi-Arch: same
Section: libs
Depends: ${misc:Depends},
${shlibs:Depends}
@@ -77,6 +77,7 @@
Package: libnautilus-extension-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
Depends: libnautilus-extension1a (= ${binary:Version}),
gir1.2-nautilus-3.0 (= ${binary:Version}),
@@ -93,6 +94,7 @@
Package: gir1.2-nautilus-3.0
Architecture: any
+Multi-Arch: same
Section: introspection
Depends: ${gir:Depends},
${shlibs:Depends},
@@ -106,6 +108,7 @@
Package: nautilus-data
Architecture: all
+Multi-Arch: foreign
Depends: ${misc:Depends}
Recommends: nautilus
Description: data files for nautilus
Added: desktop/unstable/nautilus/debian/docs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/docs?rev=49403&op=file
==============================================================================
--- desktop/unstable/nautilus/debian/docs (added)
+++ desktop/unstable/nautilus/debian/docs [utf-8] Thu Aug 4 03:56:28 2016
@@ -0,0 +1,3 @@
+AUTHORS
+NEWS
+THANKS
Modified: desktop/unstable/nautilus/debian/gir1.2-nautilus-3.0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/gir1.2-nautilus-3.0.install?rev=49403&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/gir1.2-nautilus-3.0.install [utf-8] (original)
+++ desktop/unstable/nautilus/debian/gir1.2-nautilus-3.0.install [utf-8] Thu Aug 4 03:56:28 2016
@@ -1 +1 @@
-usr/lib/girepository-1.0/Nautilus-3.0.typelib
+usr/lib/*/girepository-1.0/Nautilus-3.0.typelib
Modified: desktop/unstable/nautilus/debian/libnautilus-extension-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/libnautilus-extension-dev.install?rev=49403&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/libnautilus-extension-dev.install [utf-8] (original)
+++ desktop/unstable/nautilus/debian/libnautilus-extension-dev.install [utf-8] Thu Aug 4 03:56:28 2016
@@ -1,5 +1,5 @@
-usr/lib/libnautilus-extension*.so
+usr/lib/*/libnautilus-extension*.so
usr/include
-usr/lib/pkgconfig
+usr/lib/*/pkgconfig
usr/share/gir-1.0/Nautilus-3.0.gir
usr/share/gtk-doc
Modified: desktop/unstable/nautilus/debian/libnautilus-extension1a.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/libnautilus-extension1a.install?rev=49403&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/libnautilus-extension1a.install [utf-8] (original)
+++ desktop/unstable/nautilus/debian/libnautilus-extension1a.install [utf-8] Thu Aug 4 03:56:28 2016
@@ -1 +1 @@
-usr/lib/libnautilus-extension*.so.*
+usr/lib/*/libnautilus-extension*.so.*
Modified: desktop/unstable/nautilus/debian/nautilus.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/nautilus.install?rev=49403&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/nautilus.install [utf-8] (original)
+++ desktop/unstable/nautilus/debian/nautilus.install [utf-8] Thu Aug 4 03:56:28 2016
@@ -1,5 +1,5 @@
usr/bin
-usr/lib/nautilus/extensions-3.0/*.so
+usr/lib/nautilus/extensions-3.0/*.so
usr/share/appdata
usr/share/applications
usr/share/dbus-1
Modified: desktop/unstable/nautilus/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/rules?rev=49403&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/rules [utf-8] (original)
+++ desktop/unstable/nautilus/debian/rules [utf-8] Thu Aug 4 03:56:28 2016
@@ -1,12 +1,8 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/autoreconf.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/utils.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-version.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
ENABLE_TRACKER := --enable-tracker
@@ -20,16 +16,36 @@
ENABLE_SELINUX := --disable-selinux
endif
-DEB_CONFIGURE_EXTRA_FLAGS += --libexecdir=/usr/lib/nautilus \
- --disable-update-mimedb \
- --enable-packagekit \
- --enable-introspection \
- $(ENABLE_SELINUX) \
- $(ENABLE_TRACKER)
-LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-DEB_DH_MAKESHLIBS_ARGS_libnautilus-extension1a += -V 'libnautilus-extension1a (>= 2.91)'
-DEB_DH_MAKESHLIBS_ARGS_nautilus += -Xusr/lib/nautilus/extensions-3.0/
+%:
+ dh $@ --with autoreconf,gir,gnome
-DEB_DH_STRIP_ARGS = --dbgsym-migration='nautilus-dbg (<< 3.20.0-1~)'
+override_dh_autoreconf:
+ dh_autoreconf --as-needed
-common-binary-post-install-arch:: list-missing
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ --libdir=/usr/lib \
+ --libexecdir=/usr/lib/nautilus \
+ --disable-update-mimedb \
+ --enable-packagekit \
+ --enable-introspection \
+ $(ENABLE_SELINUX) \
+ $(ENABLE_TRACKER)
+
+override_dh_makeshlibs:
+ dh_makeshlibs -plibnautilus-extension1a -V 'libnautilus-extension1a (>= 2.91)'
+ dh_makeshlibs -pnautilus -Xusr/lib/nautilus/extensions-3.0/
+
+override_dh_strip:
+ dh_strip --dbgsym-migration='nautilus-dbg (<< 3.20.0-1~)'
+
+override_dh_auto_test:
+# We run autopkgtest instead
+
+# Multiarchify except for the nautilus extensions directory
+override_dh_install:
+ mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
+ mv debian/tmp/usr/lib/lib*a debian/tmp/usr/lib/lib*.so* \
+ debian/tmp/usr/lib/girepository-1.0 debian/tmp/usr/lib/pkgconfig \
+ debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
+ dh_install --list-missing
More information about the pkg-gnome-commits
mailing list