[Python-modules-commits] r19766 - in packages/python-qt4/trunk/debian (copyright rules)

[kitterman at users.alioth.debian.org]

    Date: Wednesday, December 28, 2011 @ 18:54:03
  Author: kitterman
Revision: 19766

rules/copyright fixups.

Modified:
  packages/python-qt4/trunk/debian/copyright
  packages/python-qt4/trunk/debian/rules

Modified: packages/python-qt4/trunk/debian/copyright
===================================================================
--- packages/python-qt4/trunk/debian/copyright	2011-12-28 18:21:37 UTC (rev 19765)
+++ packages/python-qt4/trunk/debian/copyright	2011-12-28 18:54:03 UTC (rev 19766)
@@ -144,11 +144,10 @@
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+// along with this program; if not, write to the Free Software Foundation,
+// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-
-The Debian packaging is (C) 2006-2008, Torsten Marek <shlomme at debian.org>
+The Debian packaging is © 2006-2008, Torsten Marek <shlomme at debian.org>
 and licensed under the GPL.
 
   This program is free software; you can redistribute it and/or modify

Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules	2011-12-28 18:21:37 UTC (rev 19765)
+++ packages/python-qt4/trunk/debian/rules	2011-12-28 18:54:03 UTC (rev 19766)
@@ -102,6 +102,7 @@
 	dh_prep -a
 	dh_installdirs -a
 	sed -i -e '/strip/ d' $(CURDIR)/build-$(DEFAULT_PYTHON)/designer/Makefile
+	rm -f $(CURDIR)/debian/python-qt4-dbus.install
 	# This is needed to enforce that the install-arch-% rules are
 	# not run in parallel. Both rules install into the same directory,
 	# and therefore might try to access the same files at the same time.
@@ -220,6 +221,9 @@
 endif
 	dh_python2 --no-dbg-cleaning
 	dh_python3 --no-dbg-cleaning
+	rm -rf $(CURDIR)/debian/python-qt4-dbus/usr/share/pyshared/dbus/mainloop/
+	rm -rf $(CURDIR)/debian/python3-pyqt4-dbg/usr/bin
+	rm -rf $(CURDIR)/debian/python3-pyqt4-dbg/usr/share/sip
 	dh_fixperms
 	dh_compress -X.py -X.bmp -X.ui -X.sql -X.xml
 	dh_installdeb