[Pkg-chromium-commit] [pkg-chromium] 03/04: handle new files in chromium 34

[Michael Gilbert]

This is an automated email from the git hooks/post-receive script.

mgilbert pushed a commit to branch wheezy
in repository pkg-chromium.

commit 629af3ddc937b19c68b32b8d8b122a380b4206a7
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sun Apr 13 16:15:31 2014 -0400

    handle new files in chromium 34
    
    Conflicts:
    	debian/chromium.install
    	debian/rules
---
 debian/chromium.install | 15 ++++++++-------
 debian/rules            |  3 +++
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/debian/chromium.install b/debian/chromium.install
index bee8972..b63c534 100644
--- a/debian/chromium.install
+++ b/debian/chromium.install
@@ -1,21 +1,22 @@
 debian/tmp/etc
 debian/tmp/usr/bin
-debian/tmp/usr/lib/chromium/chrom*
+debian/tmp/usr/lib/chromium/chromium
+debian/tmp/usr/lib/chromium/chrome-sandbox
 debian/tmp/usr/lib/chromium/*.pak
 debian/tmp/usr/lib/chromium/resources/extension/demo/library.js
 debian/tmp/usr/lib/chromium/content_resources.pak
 debian/tmp/usr/lib/chromium/locales/*
 debian/tmp/usr/lib/chromium/remoting_locales
-#debian/tmp/usr/lib/chromium/ffmpegsumo_nolink
-#debian/tmp/usr/lib/chromium/libppGoogleNaClPluginChrome.so
 debian/tmp/usr/lib/chromium/lib*
-#debian/tmp/usr/lib/chromium/ssl_false_start_blacklist_process
-#debian/tmp/usr/lib/chromium/nacl_irt_*
 debian/tmp/usr/lib/chromium/mksnapshot.*
 debian/tmp/usr/lib/chromium/pseudo_locales/fake-bidi.pak
-#debian/tmp/usr/lib/chromium/remoting_locales/en-US.pak
+debian/tmp/usr/lib/chromium/icudtl.dat
+
 debian/chromium.desktop usr/share/applications
+
 debian/chromium.xml usr/share/gnome-control-center/default-apps
-debian/master_preferences etc/chromium
+
 debian/initial_bookmarks.html etc/chromium
+debian/master_preferences etc/chromium
+
 debian/presubj usr/share/bug/chromium
diff --git a/debian/rules b/debian/rules
index 0f093e6..3c4f253 100755
--- a/debian/rules
+++ b/debian/rules
@@ -525,6 +525,9 @@ endif
 	strip debian/tmp/usr/lib/chromium/nacl_irt_x86_32.nexe || true
 	strip debian/tmp/usr/lib/chromium/nacl_irt_x86_64.nexe || true
 
+	# remove unnecessary file
+	rm -f $(CURDIR)/debian/tmp/$(LIB_DIR)/.landmines
+
 binary-install/$(DEBIAN_NAME)::
 	mkdir -p $(CURDIR)/debian/$(DEBIAN_NAME)/usr/share/pixmaps
 	cp -a src/chrome/app/theme/chromium/product_logo_48.png $(CURDIR)/debian/$(DEBIAN_NAME)/usr/share/pixmaps/$(DEBIAN_NAME).png

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-chromium/pkg-chromium.git