diff -Nru flufl.enum-3.3.1/debian/changelog flufl.enum-3.3.1/debian/changelog
--- flufl.enum-3.3.1/debian/changelog	2012-01-26 22:24:44.000000000 +0000
+++ flufl.enum-3.3.1/debian/changelog	2012-03-25 20:16:40.000000000 +0000
@@ -1,3 +1,24 @@
+flufl.enum (3.3.1-2) unstable; urgency=low
+
+  * Team upload
+
+  [ Barry Warsaw ]
+  * debian/rules:
+    - Build and install Python 3 versions via % expansion targets instead
+      of for loops in override targets.
+    - Remove test target debugging output when DEB_BUILD_OPTIONS=nocheck.
+    - Remove questionable workaround for bug 618367.
+    - Better override_dh_auto_clean rule so that the package can be built
+      twice in a row.  (Closes: #658259)
+
+  [ Scott Kitterman ]
+  * Rename flufl.enum-docs to the more usual flufl.enum-doc without
+    adding transitional packages since it has never been in a stable release
+  * Add DM-Upload-Allowed
+  * Bump standards-version to 3.9.3 without further changes
+
+ -- Scott Kitterman <scott@kitterman.com>  Sun, 25 Mar 2012 16:09:31 -0400
+
 flufl.enum (3.3.1-1) unstable; urgency=low
 
   [ Jakub Wilk ]
diff -Nru flufl.enum-3.3.1/debian/control flufl.enum-3.3.1/debian/control
--- flufl.enum-3.3.1/debian/control	2012-01-28 05:03:31.000000000 +0000
+++ flufl.enum-3.3.1/debian/control	2012-03-25 20:16:40.000000000 +0000
@@ -14,13 +14,16 @@
                python3-all,
                python3-setuptools,
                python3-pkg-resources
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/flufl.enum/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/flufl.enum/trunk/
+DM-Upload-Allowed: yes
 
-Package: python-flufl.enum-docs
+Package: python-flufl.enum-doc
 Architecture: all
 Section: doc
+Breaks: python-flufl.enum-docs
+Replaces: python-flufl.enum-docs
 Depends: ${sphinxdoc:Depends}, ${misc:Depends}
 Description: yet another Python enumeration package (common documentation)
  This package provides a Python enumeration, with an emphasis on simple,
@@ -33,7 +36,7 @@
 Package: python-flufl.enum
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}
-Suggests: python-flufl.enum-docs
+Suggests: python-flufl.enum-doc
 Description: yet another Python enumeration package (Python 2)
  This package provides a Python enumeration, with an emphasis on simple,
  specific, concise semantics in an easy to read and write syntax.
@@ -43,7 +46,7 @@
 Package: python3-flufl.enum
 Architecture: all
 Depends: ${python3:Depends}, ${misc:Depends}
-Suggests: python-flufl.enum-docs
+Suggests: python-flufl.enum-doc
 Description: yet another Python enumeration package (Python 3)
  This package provides a Python enumeration, with an emphasis on simple,
  specific, concise semantics in an easy to read and write syntax.
diff -Nru flufl.enum-3.3.1/debian/rules flufl.enum-3.3.1/debian/rules
--- flufl.enum-3.3.1/debian/rules	2012-01-26 22:24:44.000000000 +0000
+++ flufl.enum-3.3.1/debian/rules	2012-03-25 20:16:40.000000000 +0000
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+#DH_VERBOSE=1
+
 PYTHON2=$(shell pyversions -vr)
 PYTHON3=$(shell py3versions -vr)
 
@@ -11,23 +13,19 @@
 	python$* setup.py test -vv
 
 override_dh_auto_test: $(PYTHON2:%=test-python%) $(PYTHON3:%=test-python%)
-else
-	@echo "nocheck set, skipping tests"
 endif
 
-override_dh_auto_build:
+build-python%:
+	python$* setup.py build
+
+override_dh_auto_build: $(PYTHON3:%=build-python%)
 	dh_auto_build
-	set -ex; for py in $(PYTHON3) ; do \
-		python$$py setup.py build; \
-	done;
 
-override_dh_auto_install:
+install-python%:
+	python$* setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
+
+override_dh_auto_install: $(PYTHON3:%=install-python%)
 	dh_auto_install
-	set -ex; for py in $(PYTHON3) ; do \
-		python$$py setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
-	done;
-	# Debian bug #618367
-	rm -rf debian/*/usr/lib/python*/*-packages/flufl.enum.egg-info
 
 override_dh_installchangelogs:
 	dh_installchangelogs -k flufl/enum/NEWS.rst
@@ -38,5 +36,5 @@
 
 override_dh_auto_clean:
 	dh_auto_clean
-	rm -rf build/sphinx
+	rm -rf build
 	rm -rf *.egg-info