diff -Nru systemtap-1.6/debian/changelog systemtap-1.6/debian/changelog
--- systemtap-1.6/debian/changelog	2011-07-29 12:33:10.000000000 +0200
+++ systemtap-1.6/debian/changelog	2011-12-17 12:18:05.000000000 +0100
@@ -1,3 +1,18 @@
+systemtap (1.6-1ubuntu1) precise; urgency=low
+
+  * Merge from debian unstable (LP: #876855).  Remaining changes:
+    - Refreshed no-werror.patch. Remove -Werror from CFLAGS to avoid
+      new variable-set-but-not-used errors when building.
+  * Drop changes:
+    - Updated-__ip_sock_daddr-for-2.6.38-kernels.patch it was a patch picked
+      from upstream, and this version has those changes
+    - debian/patches/fix-compile-warning: Fix for failure to compile tapsets
+      due to kernel change. Now in upstream.
+    - adding-ifdef-CLONE_STOPPED-to-stop-module-compilatio.patch patch was
+      taken from upstream.
+
+ -- Leo Iannacone <l3on@ubuntu.com>  Sat, 17 Dec 2011 02:59:13 +0100
+
 systemtap (1.6-1) unstable; urgency=low
 
   [ Lucas Nussbaum ]
@@ -11,6 +26,32 @@
 
  -- Ritesh Raj Sarraf <rrs@debian.org>  Fri, 29 Jul 2011 15:59:14 +0530
 
+systemtap (1.4-1ubuntu2) oneiric; urgency=low
+
+  * debian/patches/fix-compile-warning: Apply upstream fix for failure to
+    compile tapsets due to kernel change.  (LP: #838205)
+  * debian/patches/no-werror.patch: Remove -Werror from CFLAGS to avoid
+    new variable-set-but-not-used errors when building.
+
+ -- Ubuntu <ubuntu@domU-12-31-39-14-F0-B3.compute-1.internal>  Wed, 31 Aug 2011 16:06:54 +0000
+
+systemtap (1.4-1ubuntu1) oneiric; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    debian/patches/Updated-__ip_sock_daddr-for-2.6.38-kernels.patch,
+    debian/patches/adding-ifdef-CLONE_STOPPED-to-stop-module-compilatio.patch:
+    patches taken from upstream.
+  * Dropped changes, included in Debian:
+    - debian/rules, debian/systemtap-runtime.postinst: restrict executable 
+      access to group stapusr to match upstream intent.
+  * Dropped changes, superseded upstream:
+    - Added upstream patches for kernels 2.6.37/2.6.38, identified after
+      running testsuite
+    - debian/patches/CVE-2010-4170+CVE-2010-4171.patch: staprun module
+      loading/unloading security fixes.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sat, 18 Jun 2011 00:09:15 +0000
+
 systemtap (1.4-1) unstable; urgency=low
 
   * New Upstream Release 
@@ -22,6 +63,23 @@
 
  -- Ritesh Raj Sarraf <rrs@debian.org>  Fri, 25 Feb 2011 03:23:16 +0530
 
+systemtap (1.3-2ubuntu2) natty; urgency=low
+
+  * Added upstream patches for kernels 2.6.37/2.6.38, identified after
+    running testsuite (LP: #721771)
+
+ -- Frederic Turgis <f-turgis@ti.com>  Thu, 17 Mar 2011 12:25:48 +0000
+
+systemtap (1.3-2ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable. (LP: #721702) Remaining changes:
+    - debian/patches/CVE-2010-4170+CVE-2010-4171.patch: staprun module 
+      loading/unloading security fixes.
+    - debian/rules, debian/systemtap-runtime.postinst: restrict executable 
+      access to group stapusr to match upstream intent.
+
+ -- Mahyuddin Susanto <udienz@ubuntu.com>  Sat, 19 Feb 2011 16:25:38 +0700
+
 systemtap (1.3-2) unstable; urgency=low
 
   * Add dependency on package adduser. Thanks to the piuparts
@@ -31,6 +89,21 @@
 
  -- Ritesh Raj Sarraf <rrs@debian.org>  Thu, 10 Feb 2011 20:30:26 +0530
 
+systemtap (1.3-1ubuntu2) natty; urgency=low
+
+  [ Lorenzo De Liso ]
+  * SECURITY UPDATE: staprun module loading/unloading security fixes
+    (LP: #677226)
+    - debian/patches/CVE-2010-4170+CVE-2010-4171.patch
+    - CVE 2010-4170
+    - CVE 2010-4171
+
+  [ Steve Beattie ]
+  * debian/rules, debian/systemtap-runtime.postinst: restrict
+    executable access to group stapusr to match upstream intent
+
+ -- Steve Beattie <sbeattie@ubuntu.com>  Fri, 19 Nov 2010 15:32:49 -0800
+
 systemtap (1.2-2) unstable; urgency=low
 
   * Update README.Debian about kernel dependency
diff -Nru systemtap-1.6/debian/control systemtap-1.6/debian/control
--- systemtap-1.6/debian/control	2011-07-29 12:33:10.000000000 +0200
+++ systemtap-1.6/debian/control	2011-12-17 12:21:48.000000000 +0100
@@ -1,7 +1,8 @@
 Source: systemtap
 Section: devel
 Priority: optional
-Maintainer: Ritesh Raj Sarraf <rrs@debian.org> 
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Ritesh Raj Sarraf <rrs@debian.org> 
 Uploaders: Lucas Nussbaum <lucas@debian.org>
 Build-Depends: debhelper (>= 7.0.50~), libelf-dev (>= 0.141),
  libdw-dev (>= 0.141), libsqlite3-dev, texlive-latex-base, texlive-latex-recommended,
diff -Nru systemtap-1.6/debian/patches/no-werror.patch systemtap-1.6/debian/patches/no-werror.patch
--- systemtap-1.6/debian/patches/no-werror.patch	1970-01-01 01:00:00.000000000 +0100
+++ systemtap-1.6/debian/patches/no-werror.patch	2011-12-17 12:20:19.000000000 +0100
@@ -0,0 +1,127 @@
+Description: remove -Werror from CFLAGS to avoid build failures
+ due to some variables being set but not used.
+Author: Serge Hallyn <serge.hallyn@canonical.com>
+Forwarded: no
+---
+ Makefile.am                 |    4 ++--
+ Makefile.in                 |    4 ++--
+ configure                   |    4 ++--
+ configure.ac                |    4 ++--
+ grapher/Makefile.am         |    2 +-
+ grapher/Makefile.in         |    2 +-
+ runtime/bench2/Makefile     |    2 +-
+ runtime/staprun/Makefile.am |    4 ++--
+ runtime/staprun/Makefile.in |    4 ++--
+ 9 files changed, 15 insertions(+), 15 deletions(-)
+
+--- systemtap-1.6-1ubuntu1.orig/configure
++++ systemtap-1.6-1ubuntu1/configure
+@@ -8685,8 +8685,8 @@ if test "x$enable_ssp" != xno; then :
+ 
+    save_CFLAGS="$CFLAGS"
+    save_CXXFLAGS="$CXXFLAGS"
+-   CXXFLAGS="$CXXFLAGS -Werror -fstack-protector-all -D_FORTIFY_SOURCE=2"
+-   CFLAGS="$CFLAGS -Werror -fstack-protector-all -D_FORTIFY_SOURCE=2"
++   CXXFLAGS="$CXXFLAGS  -fstack-protector-all -D_FORTIFY_SOURCE=2"
++   CFLAGS="$CFLAGS  -fstack-protector-all -D_FORTIFY_SOURCE=2"
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ int something ();
+--- systemtap-1.6-1ubuntu1.orig/configure.ac
++++ systemtap-1.6-1ubuntu1/configure.ac
+@@ -68,8 +68,8 @@ AC_ARG_ENABLE([ssp],
+ AS_IF([test "x$enable_ssp" != xno],[
+    save_CFLAGS="$CFLAGS"
+    save_CXXFLAGS="$CXXFLAGS"
+-   CXXFLAGS="$CXXFLAGS -Werror -fstack-protector-all -D_FORTIFY_SOURCE=2"
+-   CFLAGS="$CFLAGS -Werror -fstack-protector-all -D_FORTIFY_SOURCE=2"
++   CXXFLAGS="$CXXFLAGS  -fstack-protector-all -D_FORTIFY_SOURCE=2"
++   CFLAGS="$CFLAGS  -fstack-protector-all -D_FORTIFY_SOURCE=2"
+    AC_COMPILE_IFELSE([AC_LANG_SOURCE([int something ();])], [
+        AC_MSG_NOTICE([Compiling with gcc -fstack-protector-all et al.])
+ 	CFLAGS="$save_CFLAGS -fstack-protector-all -D_FORTIFY_SOURCE=2"
+--- systemtap-1.6-1ubuntu1.orig/grapher/Makefile.am
++++ systemtap-1.6-1ubuntu1/grapher/Makefile.am
+@@ -6,7 +6,7 @@ man_MANS = stapgraph.1
+ # "superset" of the gtkmm_CFLAGS/gtkmm_LIBS variabes, we'll just use
+ # the libglade ones.
+ stapgraph_CPPFLAGS = -DPKGDATADIR='"${pkgdatadir}"'
+-stapgraph_CXXFLAGS = $(libglade_CFLAGS) -Wall -Werror
++stapgraph_CXXFLAGS = $(libglade_CFLAGS) -Wall
+ stapgraph_SOURCES = grapher.cxx StapParser.cxx Graph.cxx GraphWidget.cxx CairoWidget.cxx GraphStyle.cxx
+ stapgraph_LDADD = $(libglade_LIBS)
+ stapgraph_LDFLAGS = -Wl,--as-needed
+--- systemtap-1.6-1ubuntu1.orig/grapher/Makefile.in
++++ systemtap-1.6-1ubuntu1/grapher/Makefile.in
+@@ -275,7 +275,7 @@ top_srcdir = @top_srcdir@
+ # "superset" of the gtkmm_CFLAGS/gtkmm_LIBS variabes, we'll just use
+ # the libglade ones.
+ @BUILD_GRAPHER_TRUE@stapgraph_CPPFLAGS = -DPKGDATADIR='"${pkgdatadir}"'
+-@BUILD_GRAPHER_TRUE@stapgraph_CXXFLAGS = $(libglade_CFLAGS) -Wall -Werror
++@BUILD_GRAPHER_TRUE@stapgraph_CXXFLAGS = $(libglade_CFLAGS) -Wall
+ @BUILD_GRAPHER_TRUE@stapgraph_SOURCES = grapher.cxx StapParser.cxx Graph.cxx GraphWidget.cxx CairoWidget.cxx GraphStyle.cxx
+ @BUILD_GRAPHER_TRUE@stapgraph_LDADD = $(libglade_LIBS)
+ @BUILD_GRAPHER_TRUE@dist_pkgdata_DATA = graph-dialog.glade stap-start.glade processwindow.glade
+--- systemtap-1.6-1ubuntu1.orig/Makefile.am
++++ systemtap-1.6-1ubuntu1/Makefile.am
+@@ -14,8 +14,8 @@ AM_CPPFLAGS = -DBINDIR='"$(bindir)"' \
+ 	      -DLOCALEDIR='"$(localedir)"' \
+ 	      -I$(srcdir)/includes -I$(builddir)/includes/sys
+ 
+-AM_CFLAGS = -D_GNU_SOURCE -fexceptions -Wall -Werror -Wunused -Wformat=2 -W
+-AM_CXXFLAGS = -Wall -Werror
++AM_CFLAGS = -D_GNU_SOURCE -fexceptions -Wall  -Wunused -Wformat=2 -W
++AM_CXXFLAGS = -Wall
+ 
+ man_MANS = stapprobes.3stap stapfuncs.3stap stapvars.3stap stapex.3stap \
+ dtrace.1 stap-merge.1\
+--- systemtap-1.6-1ubuntu1.orig/Makefile.in
++++ systemtap-1.6-1ubuntu1/Makefile.in
+@@ -415,8 +415,8 @@ AM_CPPFLAGS = -DBINDIR='"$(bindir)"' \
+ 	      -DLOCALEDIR='"$(localedir)"' \
+ 	      -I$(srcdir)/includes -I$(builddir)/includes/sys
+ 
+-AM_CFLAGS = -D_GNU_SOURCE -fexceptions -Wall -Werror -Wunused -Wformat=2 -W
+-AM_CXXFLAGS = -Wall -Werror
++AM_CFLAGS = -D_GNU_SOURCE -fexceptions -Wall  -Wunused -Wformat=2 -W
++AM_CXXFLAGS = -Wall
+ man_MANS = stapprobes.3stap stapfuncs.3stap stapvars.3stap \
+ 	stapex.3stap dtrace.1 stap-merge.1 stappaths.7 $(am__append_2) \
+ 	$(am__append_5)
+--- systemtap-1.6-1ubuntu1.orig/runtime/staprun/Makefile.am
++++ systemtap-1.6-1ubuntu1/runtime/staprun/Makefile.am
+@@ -1,7 +1,7 @@
+ # Makefile.am --- automake input file for systemtap runtime tools
+ 
+-AM_CFLAGS = -Wall -Werror -Wunused -W -Wformat=2 -Wno-format-nonliteral
+-AM_CXXFLAGS = -Wall -Werror -Wunused -W -Wformat=2 -Wno-format-nonliteral
++AM_CFLAGS = -Wall  -Wunused -W -Wformat=2 -Wno-format-nonliteral
++AM_CXXFLAGS = -Wall  -Wunused -W -Wformat=2 -Wno-format-nonliteral
+ AM_CPPFLAGS = -D_GNU_SOURCE
+ AM_CPPFLAGS += -I$(srcdir)/../../includes
+ AM_CPPFLAGS += -I$(builddir)/../../includes/sys
+--- systemtap-1.6-1ubuntu1.orig/runtime/staprun/Makefile.in
++++ systemtap-1.6-1ubuntu1/runtime/staprun/Makefile.in
+@@ -249,9 +249,9 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-AM_CFLAGS = -Wall -Werror -Wunused -W -Wformat=2 \
++AM_CFLAGS = -Wall  -Wunused -W -Wformat=2 \
+ 	-Wno-format-nonliteral @PIECFLAGS@
+-AM_CXXFLAGS = -Wall -Werror -Wunused -W -Wformat=2 \
++AM_CXXFLAGS = -Wall  -Wunused -W -Wformat=2 \
+ 	-Wno-format-nonliteral @PIECXXFLAGS@
+ AM_CPPFLAGS = -D_GNU_SOURCE -I$(srcdir)/../../includes \
+ 	-I$(builddir)/../../includes/sys -DBINDIR='"$(bindir)"' \
+--- systemtap-1.6-1ubuntu1.orig/runtime/bench2/Makefile
++++ systemtap-1.6-1ubuntu1/runtime/bench2/Makefile
+@@ -1,7 +1,7 @@
+ all: itest
+ 
+ itest: itest.c
+-	gcc -D_GNU_SOURCE -Wall -Wextra -Wstrict-prototypes -Werror -O3 -o itest itest.c -lpthread
++	gcc -D_GNU_SOURCE -Wall -Wextra -Wstrict-prototypes -O3 -o itest itest.c -lpthread
+ 
+ clean:
+ 	/bin/rm -f itest
diff -Nru systemtap-1.6/debian/patches/series systemtap-1.6/debian/patches/series
--- systemtap-1.6/debian/patches/series	2011-07-29 12:33:10.000000000 +0200
+++ systemtap-1.6/debian/patches/series	2011-12-17 12:21:12.000000000 +0100
@@ -4,3 +4,4 @@
 vim-filetype-override.diff
 grapher-libs.diff
 debversion.diff
+no-werror.patch