[libreoffice] 144/152: remove some more debhelper hackery which seems to mess up launchpad

[Rene Engelhard]

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

rene pushed a commit to tag libreoffice_3.5.0_rc3-0ubuntu2
in repository libreoffice.

commit 11b341ce3f701293515871ec747aa467453ae530
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Thu Jan 26 10:33:45 2017 +0100

    remove some more debhelper hackery which seems to mess up launchpad
---
 changelog |  6 +++---
 rules     | 66 +++++++++++++++++++++++++++++++--------------------------------
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/changelog b/changelog
index 19c3e7a..05d6cf1 100644
--- a/changelog
+++ b/changelog
@@ -1,10 +1,10 @@
-libreoffice (1:5.3.0~rc2-2ubuntu1~zesty3) zesty; urgency=medium
+libreoffice (1:5.3.0~rc2-2ubuntu1~zesty4) zesty; urgency=medium
 
   * go full gtk3
   * remove remaining BUILD_DBG_PACKAGE parts
-  * remove some debhelper hackery which seems to mess up launchpad
+  * remove some more debhelper hackery which seems to mess up launchpad
 
- -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Wed, 25 Jan 2017 22:53:33 +0100
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Thu, 26 Jan 2017 10:32:01 +0100
 
 libreoffice (1:5.3.0~rc2-1) experimental; urgency=medium
 
diff --git a/rules b/rules
index e07fcd4..68cdc3d 100755
--- a/rules
+++ b/rules
@@ -2982,44 +2982,44 @@ $(STAMP_DIR)/binary-arch: $(STAMP_DIR)/install-arch debian/control $(STAMP_DIR)/
 	dh_bugfiles -a -A
 	dh_link -a -X.desktop
 ifeq "$(BUILD_DBGSYM_PACKAGES)" "y"
-	rm -rf debian/$(URE_DBG_ROOT) debian/$(CORE_DBG_ROOT) debian/$(WRITER_DBG_ROOT)
+#	rm -rf debian/$(URE_DBG_ROOT) debian/$(CORE_DBG_ROOT) debian/$(WRITER_DBG_ROOT)
 	dh_strip -a -Nure -Nuno-libs3 $(DH_STRIP_DBG_OPTION_LO)
 	dh_strip -pure $(DH_STRIP_DBG_OPTION_URE)
 	dh_strip -puno-libs3 $(DH_STRIP_DBG_OPTION_UNO_LIBS)
 	# dh_strip --dbg-package= is not idempotent, force copying of the binaries
 	# again...
-	rm -f $(STAMP_DIR)/install-common
-	mkdir -p debian/$(CORE_DBG_ROOT)/usr/share/gdb/auto-load/$(OODIR)
-	mv $(CURDIR)/debian/tmp/usr/share/gdb/auto-load/$(OODIR)/program \
-		debian/$(CORE_DBG_ROOT)/usr/share/gdb/auto-load/$(OODIR)
-	# I think a -dbg-common is overkill. Although this means that this all only
-	# will work if libreoffice-dbg is installed..
-	mkdir -p debian/$(CORE_DBG_ROOT)/usr/share/libreoffice/gdb
-	mv $(CURDIR)/debian/tmp/usr/share/libreoffice/gdb/libreoffice \
-		debian/$(CORE_DBG_ROOT)/usr/share/libreoffice/gdb
-	mkdir -p debian/$(WRITER_DBG_ROOT)/usr/share/gdb/auto-load/$(OODIR)/program
-	mkdir -p debian/$(WRITER_DBG_ROOT)/usr/share/libreoffice/gdb/libreoffice/
-	for i in sw writerfilter; do \
-		if [ -f debian/$(CORE_DBG_ROOT)/usr/share/gdb/auto-load/$(OODIR)/program/lib$${i}lo.so-gdb.py ]; then \
-		mv debian/$(CORE_DBG_ROOT)/usr/share/gdb/auto-load/$(OODIR)/program/lib$${i}lo.so-gdb.py \
-				debian/$(WRITER_DBG_ROOT)/usr/share/gdb/auto-load/$(OODIR)/program/; \
-		fi; \
-		mv debian/$(CORE_DBG_ROOT)/usr/share/libreoffice/gdb/libreoffice/$$i.py \
-			debian/$(WRITER_DBG_ROOT)/usr/share/libreoffice/gdb/libreoffice; \
-	done
-
-	# FIXME: or better ure-dbg (ure/lib?). Then again ure is a link which is in -common
-	# anyways...
-	mkdir -p debian/$(UNO_LIBS_DBG_ROOT)/usr/share/gdb/auto-load/$(OODIR)/program
-	mv debian/$(CORE_DBG_ROOT)/usr/share/gdb/auto-load/$(OODIR)/program/libuno_cppu.so.3-gdb.py \
-		debian/$(UNO_LIBS_DBG_ROOT)/usr/share/gdb/auto-load/$(OODIR)/program
-	mv debian/$(CORE_DBG_ROOT)/usr/share/gdb/auto-load/$(OODIR)/program/libuno_sal.so.3-gdb.py \
-		debian/$(UNO_LIBS_DBG_ROOT)/usr/share/gdb/auto-load/$(OODIR)/program
-	mkdir -p debian/$(UNO_LIBS_DBG_ROOT)/usr/share/libreoffice/gdb/libreoffice
-	mv debian/$(CORE_DBG_ROOT)/usr/share/libreoffice/gdb/libreoffice/cppu.py \
-		debian/$(UNO_LIBS_DBG_ROOT)/usr/share/libreoffice/gdb/libreoffice
-	mv debian/$(CORE_DBG_ROOT)/usr/share/libreoffice/gdb/libreoffice/sal.py \
-		debian/$(UNO_LIBS_DBG_ROOT)/usr/share/libreoffice/gdb/libreoffice
+#	rm -f $(STAMP_DIR)/install-common
+#	mkdir -p debian/$(CORE_DBG_ROOT)/usr/share/gdb/auto-load/$(OODIR)
+#	mv $(CURDIR)/debian/tmp/usr/share/gdb/auto-load/$(OODIR)/program \
+#		debian/$(CORE_DBG_ROOT)/usr/share/gdb/auto-load/$(OODIR)
+#	# I think a -dbg-common is overkill. Although this means that this all only
+#	# will work if libreoffice-dbg is installed..
+#	mkdir -p debian/$(CORE_DBG_ROOT)/usr/share/libreoffice/gdb
+#	mv $(CURDIR)/debian/tmp/usr/share/libreoffice/gdb/libreoffice \
+#		debian/$(CORE_DBG_ROOT)/usr/share/libreoffice/gdb
+#	mkdir -p debian/$(WRITER_DBG_ROOT)/usr/share/gdb/auto-load/$(OODIR)/program
+#	mkdir -p debian/$(WRITER_DBG_ROOT)/usr/share/libreoffice/gdb/libreoffice/
+#	for i in sw writerfilter; do \
+#		if [ -f debian/$(CORE_DBG_ROOT)/usr/share/gdb/auto-load/$(OODIR)/program/lib$${i}lo.so-gdb.py ]; then \
+#		mv debian/$(CORE_DBG_ROOT)/usr/share/gdb/auto-load/$(OODIR)/program/lib$${i}lo.so-gdb.py \
+#				debian/$(WRITER_DBG_ROOT)/usr/share/gdb/auto-load/$(OODIR)/program/; \
+#		fi; \
+#		mv debian/$(CORE_DBG_ROOT)/usr/share/libreoffice/gdb/libreoffice/$$i.py \
+#			debian/$(WRITER_DBG_ROOT)/usr/share/libreoffice/gdb/libreoffice; \
+#	done
+#
+#	# FIXME: or better ure-dbg (ure/lib?). Then again ure is a link which is in -common
+#	# anyways...
+#	mkdir -p debian/$(UNO_LIBS_DBG_ROOT)/usr/share/gdb/auto-load/$(OODIR)/program
+#	mv debian/$(CORE_DBG_ROOT)/usr/share/gdb/auto-load/$(OODIR)/program/libuno_cppu.so.3-gdb.py \
+#		debian/$(UNO_LIBS_DBG_ROOT)/usr/share/gdb/auto-load/$(OODIR)/program
+#	mv debian/$(CORE_DBG_ROOT)/usr/share/gdb/auto-load/$(OODIR)/program/libuno_sal.so.3-gdb.py \
+#		debian/$(UNO_LIBS_DBG_ROOT)/usr/share/gdb/auto-load/$(OODIR)/program
+#	mkdir -p debian/$(UNO_LIBS_DBG_ROOT)/usr/share/libreoffice/gdb/libreoffice
+#	mv debian/$(CORE_DBG_ROOT)/usr/share/libreoffice/gdb/libreoffice/cppu.py \
+#		debian/$(UNO_LIBS_DBG_ROOT)/usr/share/libreoffice/gdb/libreoffice
+#	mv debian/$(CORE_DBG_ROOT)/usr/share/libreoffice/gdb/libreoffice/sal.py \
+#		debian/$(UNO_LIBS_DBG_ROOT)/usr/share/libreoffice/gdb/libreoffice
 else
 	dh_strip -a
 endif

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