diff -Nru postgresql-hll-2.7/debian/changelog postgresql-hll-2.7/debian/changelog
--- postgresql-hll-2.7/debian/changelog	2014-10-30 11:31:18.000000000 +0800
+++ postgresql-hll-2.7/debian/changelog	2014-10-30 11:29:10.000000000 +0800
@@ -1,3 +1,12 @@
+postgresql-hll (2.7-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Don't include postgresql-common makefile (Closes: 738376)
+  * Add inline with _forceinline.
+  * Use source format 3.
+
+ -- YunQiang Su <syq@debian.org>  Thu, 30 Oct 2014 11:06:48 +0800
+
 postgresql-hll (2.7-2) unstable; urgency=low
 
   * Removed useless sentence in the package description (Closes: #705300).
diff -Nru postgresql-hll-2.7/debian/patches/inline.diff postgresql-hll-2.7/debian/patches/inline.diff
--- postgresql-hll-2.7/debian/patches/inline.diff	1970-01-01 08:00:00.000000000 +0800
+++ postgresql-hll-2.7/debian/patches/inline.diff	2014-10-30 11:27:53.000000000 +0800
@@ -0,0 +1,45 @@
+--- postgresql-hll-2.7.orig/hll.c
++++ postgresql-hll-2.7/hll.c
+@@ -27,6 +27,7 @@
+ #include "catalog/pg_type.h"
+ 
+ #include "MurmurHash3.h"
++#include "utils/int8.h"
+ 
+ #ifdef PG_MODULE_MAGIC
+ PG_MODULE_MAGIC;
+--- postgresql-hll-2.7.orig/MurmurHash3.cpp
++++ postgresql-hll-2.7/MurmurHash3.cpp
+@@ -57,12 +57,12 @@ inline uint64_t rotl64 ( uint64_t x, int
+ // Block read - if your platform needs to do endian-swapping or can only
+ // handle aligned reads, do the conversion here
+ 
+-FORCE_INLINE uint32_t getblock ( const uint32_t * p, int i )
++FORCE_INLINE inline uint32_t getblock ( const uint32_t * p, int i )
+ {
+   return p[i];
+ }
+ 
+-FORCE_INLINE uint64_t getblock ( const uint64_t * p, int i )
++FORCE_INLINE inline uint64_t getblock ( const uint64_t * p, int i )
+ {
+   return p[i];
+ }
+@@ -70,7 +70,7 @@ FORCE_INLINE uint64_t getblock ( const u
+ //-----------------------------------------------------------------------------
+ // Finalization mix - force all bits of a hash block to avalanche
+ 
+-FORCE_INLINE uint32_t fmix ( uint32_t h )
++FORCE_INLINE inline uint32_t fmix ( uint32_t h )
+ {
+   h ^= h >> 16;
+   h *= 0x85ebca6b;
+@@ -83,7 +83,7 @@ FORCE_INLINE uint32_t fmix ( uint32_t h
+ 
+ //----------
+ 
+-FORCE_INLINE uint64_t fmix ( uint64_t k )
++FORCE_INLINE inline uint64_t fmix ( uint64_t k )
+ {
+   k ^= k >> 33;
+   k *= BIG_CONSTANT(0xff51afd7ed558ccd);
diff -Nru postgresql-hll-2.7/debian/patches/series postgresql-hll-2.7/debian/patches/series
--- postgresql-hll-2.7/debian/patches/series	1970-01-01 08:00:00.000000000 +0800
+++ postgresql-hll-2.7/debian/patches/series	2014-10-30 11:28:20.000000000 +0800
@@ -0,0 +1 @@
+inline.diff
diff -Nru postgresql-hll-2.7/debian/source/format postgresql-hll-2.7/debian/source/format
--- postgresql-hll-2.7/debian/source/format	1970-01-01 08:00:00.000000000 +0800
+++ postgresql-hll-2.7/debian/source/format	2014-04-07 03:44:53.000000000 +0800
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru postgresql-hll-2.7/hll.c postgresql-hll-2.7/hll.c
--- postgresql-hll-2.7/hll.c	2014-10-30 11:31:18.000000000 +0800
+++ postgresql-hll-2.7/hll.c	2013-02-21 23:00:28.000000000 +0800
@@ -27,7 +27,6 @@
 #include "catalog/pg_type.h"
 
 #include "MurmurHash3.h"
-#include "utils/int8.h"
 
 #ifdef PG_MODULE_MAGIC
 PG_MODULE_MAGIC;
diff -Nru postgresql-hll-2.7/MurmurHash3.cpp postgresql-hll-2.7/MurmurHash3.cpp
--- postgresql-hll-2.7/MurmurHash3.cpp	2014-10-30 11:31:18.000000000 +0800
+++ postgresql-hll-2.7/MurmurHash3.cpp	2013-02-21 23:00:28.000000000 +0800
@@ -57,12 +57,12 @@
 // Block read - if your platform needs to do endian-swapping or can only
 // handle aligned reads, do the conversion here
 
-FORCE_INLINE inline uint32_t getblock ( const uint32_t * p, int i )
+FORCE_INLINE uint32_t getblock ( const uint32_t * p, int i )
 {
   return p[i];
 }
 
-FORCE_INLINE inline uint64_t getblock ( const uint64_t * p, int i )
+FORCE_INLINE uint64_t getblock ( const uint64_t * p, int i )
 {
   return p[i];
 }
@@ -70,7 +70,7 @@
 //-----------------------------------------------------------------------------
 // Finalization mix - force all bits of a hash block to avalanche
 
-FORCE_INLINE inline uint32_t fmix ( uint32_t h )
+FORCE_INLINE uint32_t fmix ( uint32_t h )
 {
   h ^= h >> 16;
   h *= 0x85ebca6b;
@@ -83,7 +83,7 @@
 
 //----------
 
-FORCE_INLINE inline uint64_t fmix ( uint64_t k )
+FORCE_INLINE uint64_t fmix ( uint64_t k )
 {
   k ^= k >> 33;
   k *= BIG_CONSTANT(0xff51afd7ed558ccd);