diff -Nru taglibs-standard-1.2.5/debian/changelog taglibs-standard-1.2.5/debian/changelog
--- taglibs-standard-1.2.5/debian/changelog	2016-07-31 10:31:06.000000000 +0000
+++ taglibs-standard-1.2.5/debian/changelog	2016-07-31 16:01:32.000000000 +0000
@@ -1,9 +1,9 @@
-taglibs-standard (1.2.5-1ubuntu1) yakkety; urgency=medium
+taglibs-standard (1.2.5-2) unstable; urgency=medium
 
-  * Fix typo in debian/control that causes a FTBFS on Ubuntu buildds:
-    'Package: and Architecture: do not alternate in debian/control'
+  * Team upload.
+  * Correct typo in debian/control. (Closes: #833058)
 
- -- Graham Inggs <ginggs@ubuntu.com>  Sun, 31 Jul 2016 12:28:05 +0200
+ -- tony mancill <tmancill@debian.org>  Sun, 31 Jul 2016 09:00:57 -0700
 
 taglibs-standard (1.2.5-1) unstable; urgency=medium
 
diff -Nru taglibs-standard-1.2.5/debian/control taglibs-standard-1.2.5/debian/control
--- taglibs-standard-1.2.5/debian/control	2016-07-31 10:30:38.000000000 +0000
+++ taglibs-standard-1.2.5/debian/control	2016-07-31 16:01:32.000000000 +0000
@@ -1,8 +1,7 @@
 Source: taglibs-standard
 Section: java
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Emmanuel Bourg <ebourg@apache.org>
 Build-Depends:
  debhelper (>= 9),
diff -Nru taglibs-standard-1.2.5/debian/maven.cleanIgnoreRules taglibs-standard-1.2.5/debian/maven.cleanIgnoreRules
--- taglibs-standard-1.2.5/debian/maven.cleanIgnoreRules	2016-07-31 10:24:46.000000000 +0000
+++ taglibs-standard-1.2.5/debian/maven.cleanIgnoreRules	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-
diff -Nru taglibs-standard-1.2.5/debian/maven.publishedRules taglibs-standard-1.2.5/debian/maven.publishedRules
--- taglibs-standard-1.2.5/debian/maven.publishedRules	2016-07-31 10:24:46.000000000 +0000
+++ taglibs-standard-1.2.5/debian/maven.publishedRules	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-
diff -Nru taglibs-standard-1.2.5/debian/maven.rules taglibs-standard-1.2.5/debian/maven.rules
--- taglibs-standard-1.2.5/debian/maven.rules	2016-07-31 10:24:46.000000000 +0000
+++ taglibs-standard-1.2.5/debian/maven.rules	2016-07-31 16:01:32.000000000 +0000
@@ -1,6 +1,5 @@
 
 junit junit jar s/4\..*/4.x/ * *
-s/easymock/org.easymock/ easymock * s/.*/debian/ * *
 javax.el s/el-api/javax.el-api/ * s/.*/3.0/ * *
 javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * *
 javax.servlet.jsp s/jsp-api/javax.servlet.jsp-api/ * s/.*/2.3/ * *