THRIFT-1825 Debian Packaging: cpp libs no longer included since 0.8

Initial Patch: Marco Matarazzo
Folder move and deletion of contrib/create-debian-packages.sh by roger ;-r

diff --git a/contrib/create-debian-packages.sh b/contrib/create-debian-packages.sh
deleted file mode 100644 (file)
index e8906f1..0000000
--- a/contrib/create-debian-packages.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-set -e
-
-ln -s contrib/debian debian
-
-dpkg-buildpackage -rfakeroot -tc
-
-# results
-ls ../*.deb ../*.dsc ../*.tar.gz ../*.changes
-
-# cleanup
-rm debian
-

diff --git a/contrib/debian/libthrift0.install b/contrib/debian/libthrift0.install
deleted file mode 100644 (file)
index ddaa8cd..0000000
--- a/contrib/debian/libthrift0.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libthrift*.so.*

diff --git a/contrib/debian/changelog b/debian/changelog
old mode 100644 (file)
new mode 100755 (executable)
similarity index 91%
rename from contrib/debian/changelog
rename to debian/changelog
index a889fc2..f2da232
--- a/contrib/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+thrift (1.0.0-dev) stable; urgency=low
+  * update version
+  * fix libthrift0.install
+
+ -- Roger Meier <roger@apache.org>  Tue, 08 Jan 2013 22:40:12 +0100
+
 thrift (0.9.0) stable; urgency=low
 
   * update to 0.9.0

diff --git a/contrib/debian/compat b/debian/compat
similarity index 100%
rename from contrib/debian/compat
rename to debian/compat

diff --git a/contrib/debian/control b/debian/control
similarity index 100%
rename from contrib/debian/control
rename to debian/control

diff --git a/contrib/debian/copyright b/debian/copyright
similarity index 100%
rename from contrib/debian/copyright
rename to debian/copyright

diff --git a/contrib/debian/dirs b/debian/dirs
similarity index 100%
rename from contrib/debian/dirs
rename to debian/dirs

diff --git a/contrib/debian/docs b/debian/docs
similarity index 100%
rename from contrib/debian/docs
rename to debian/docs

diff --git a/contrib/debian/libthrift-dev.install b/debian/libthrift-dev.install
similarity index 100%
rename from contrib/debian/libthrift-dev.install
rename to debian/libthrift-dev.install

diff --git a/debian/libthrift0.install b/debian/libthrift0.install
new file mode 100755 (executable)
index 0000000..ec74efc
--- /dev/null
+++ b/debian/libthrift0.install
@@ -0,0 +1,5 @@
+usr/lib/libthrift.so*
+usr/lib/libthrift-*.so*
+usr/lib/libthriftnb*.so*
+usr/lib/libthriftqt*.so*
+usr/lib/libthriftz*.so*

diff --git a/contrib/debian/php5-thrift.dirs b/debian/php5-thrift.dirs
similarity index 100%
rename from contrib/debian/php5-thrift.dirs
rename to debian/php5-thrift.dirs

diff --git a/contrib/debian/rules b/debian/rules
similarity index 100%
rename from contrib/debian/rules
rename to debian/rules

diff --git a/contrib/debian/substvars b/debian/substvars
similarity index 100%
rename from contrib/debian/substvars
rename to debian/substvars

diff --git a/contrib/debian/thrift-doc.docs b/debian/thrift-doc.docs
similarity index 100%
rename from contrib/debian/thrift-doc.docs
rename to debian/thrift-doc.docs

diff --git a/contrib/debian/thrift-doc.install b/debian/thrift-doc.install
similarity index 100%
rename from contrib/debian/thrift-doc.install
rename to debian/thrift-doc.install