[SCM] caja-dropbox Debian package branch, master, updated. 424f1b2b50dccbee0e8d48c02694233d5ab3a428

Mike Gabriel sunweaver at moszumanska.debian.org
Mon Sep 29 13:09:05 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-mate/caja-dropbox.git;a=commitdiff;h=424f1b2

The following commit has been merged in the master branch:
commit 424f1b2b50dccbee0e8d48c02694233d5ab3a428
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Sep 29 15:09:00 2014 +0200

    debian/rules: Build using autogen.sh. Properly clear up static library before dh_install.
---
 debian/control |  1 +
 debian/rules   | 13 ++++++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index 01afc36..dbfc6eb 100644
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-mate/caja-dropbox.git
 Package: caja-dropbox
 Architecture: i386 amd64
 Depends: procps,
+         python,
          python-gtk2 (>= 2.12),
          python-gpgme,
          policykit-1,
diff --git a/debian/rules b/debian/rules
index dff73ae..523542b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,24 +6,23 @@ DHFLAGS=--parallel
 	dh $@ $(DHFLAGS)
 
 override_dh_auto_configure:
-	dh_autoreconf
+	NOCONFIGURE=1 ./autogen.sh
 	dh_auto_configure $(DHFLAGS) -- \
-		--disable-silent-rules
+	                             --disable-silent-rules
 
 override_dh_makeshlibs:
 	# Don't generate a shlibs file for the plugin
 	dh_makeshlibs -X/usr/lib/caja/
 
-override_dh_auto_install:
-	dh_auto_install
-	dh_install --fail-missing
+override_dh_install:
 	# Drop useless files
-	rm -f debian/caja-dropbox/usr/lib/caja/extensions-*/libcaja-dropbox.a
-	rm -f debian/caja-dropbox/usr/lib/caja/extensions-*/libcaja-dropbox.la
+	rm -f debian/caja-dropbox/usr/lib/*/caja/extensions-*/libcaja-dropbox.a
+	rm -f debian/caja-dropbox/usr/lib/*/caja/extensions-*/libcaja-dropbox.la
 	rm -f debian/caja-dropbox/usr/bin/dropbox
 	rm -f debian/caja-dropbox/usr/share/applications/dropbox.desktop
 	rm -rf debian/caja-dropbox/usr/share/icons/*
 	rm -rf debian/caja-dropbox/usr/share/man/*
+	dh_install --fail-missing
 
 override_dh_auto_clean:
 	dh_auto_clean

-- 
caja-dropbox Debian package



More information about the pkg-mate-commits mailing list