summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChengwei Yang <chengwei.yang@intel.com>2013-08-25 10:15:07 +0800
committerChengwei Yang <chengwei.yang@intel.com>2013-08-25 10:15:07 +0800
commit85226992adddbf01d081ffc70639cb7238b5454f (patch)
treeb25e08f4579661d23c2970955090b78d1fd182c2
parent0124d2c72f0c2c83182b088072ec2b4ce7d452d7 (diff)
downloadbundle-85226992adddbf01d081ffc70639cb7238b5454f.tar.gz
bundle-85226992adddbf01d081ffc70639cb7238b5454f.tar.bz2
bundle-85226992adddbf01d081ffc70639cb7238b5454f.zip
Change-Id: I29fee6667c19d60fe61cab9eee76cdd791c25680 Signed-off-by: Chengwei Yang <chengwei.yang@intel.com>
-rw-r--r--CMakeLists.txt11
-rw-r--r--debian/changelog239
-rw-r--r--debian/compat1
-rwxr-xr-xdebian/control24
-rw-r--r--debian/libbundle-0.install.in1
-rw-r--r--debian/libbundle-dev.install.in2
-rwxr-xr-xdebian/rules126
-rw-r--r--packaging/bundle.changes3
8 files changed, 6 insertions, 401 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a123924..539e9fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,12 +1,6 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
PROJECT(bundle C)
-### Get VERSION from debian/changelog
-file(STRINGS debian/changelog version_line LIMIT_COUNT 1 REGEX "(.*)")
-string(REGEX REPLACE ".*\\(\([0-9]+:\)*\([0-9a-zA-Z.]*\).*\\).*" "\\2" VERSION ${version_line}) # Get version
-string(REGEX REPLACE "^\([0-9]+\)\\..*" "\\1" VERSION_MAJOR ${VERSION}) # Get major version
-message(STATUS "Version from debian/changelog: ${VERSION}, Major version: ${VERSION_MAJOR}")
-
### Required packages
INCLUDE(FindPkgConfig)
pkg_check_modules(pkgs REQUIRED glib-2.0 dlog)
@@ -26,8 +20,9 @@ add_library(bundle SHARED
src/keyval.c
src/keyval_array.c
)
-set_target_properties(bundle PROPERTIES SOVERSION ${VERSION_MAJOR})
-set_target_properties(bundle PROPERTIES VERSION ${VERSION})
+set_target_properties(bundle PROPERTIES SOVERSION "0")
+set_target_properties(bundle PROPERTIES VERSION "0.1.31")
+message(STATUS "Version from debian/changelog: ${VERSION}, Major version: ${VERSION_MAJOR}")
target_link_libraries(bundle ${pkgs_LDFLAGS})
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index 40dcfae..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,239 +0,0 @@
-bundle (0.1.22) unstable; urgency=low
-
- * Checksum added to encode/decode to enhance stability and svace defects fixed.
- * Git: 165.213.180.234:slp/pkgs/b/bundle
- * Tag: bundle_0.1.22
-
- -- Jaeho Lee <jaeho81.lee@samsung.com> Fri, 17 Feb 2012 16:45:12 +0900
-
-bundle (0.1.21) unstable; urgency=low
-
- * Updated changelog
- * Git: 165.213.180.234:slp/pkgs/b/bundle
- * Tag: bundle_0.1.21
-
- -- Sewook Park <sewook7.park@samsung.com> Mon, 05 Dec 2011 15:58:05 +0900
-
-bundle (0.1.20) unstable; urgency=low
-
- * Changed Boilerplate as per the guideline
- * Git: 165.213.180.234:slp/pkgs/b/bundle
- * Tag: bundle_0.1.20
-
- -- Jaeho Lee <jaeho81.lee@samsung.com> Mon, 07 Nov 2011 09:57:20 +0900
-
-bundle (0.1.19) unstable; urgency=low
-
- * Support array
- * Git: 165.213.180.234:slp/pkgs/b/bundle
- * Tag: bundle_0.1.19
-
- -- Jaeho Lee <jaeho81.lee@samsung.com> Thu, 06 Oct 2011 14:53:57 +0900
-
-bundle (0.1.18) unstable; urgency=low
-
- * Modify TC Makefile
- * Git: 165.213.180.234:slp/pkgs/b/bundle
- * Tag: bundle_0.1.18
-
- -- Jaeho Lee <jaeho81.lee@samsung.com> Tue, 16 Aug 2011 14:53:16 +0900
-
-bundle (0.1.17) unstable; urgency=low
-
- * Fix Apply code cleanup
- * Git: 165.213.180.234:slp/pkgs/b/bundle
- * Tag: bundle_0.1.17
-
- -- Sewook Park <sewook7.park@samsung.com> Tue, 02 Aug 2011 19:11:59 +0900
-
-bundle (0.1.16) unstable; urgency=low
-
- * Fix Boilerplate module name
- * Git: 165.213.180.234:slp/pkgs/b/bundle
- * Tag: bundle_0.1.16
-
- -- Sewook Park <sewook7.park@samsung.com> Sat, 16 Jul 2011 13:33:11 +0900
-
-bundle (0.1.15) unstable; urgency=low
-
- * Apply Boilerplate
- * Git: 165.213.180.234:slp/pkgs/b/bundle
- * Tag: bundle_0.1.15
-
- -- Sewook Park <sewook7.park@samsung.com> Wed, 13 Jul 2011 17:36:38 +0900
-
-bundle (0.1.14) unstable; urgency=low
-
- * Rollback to bundle_0.1.12
- * Git: 165.213.180.234:slp/pkgs/b/bundle
- * Tag: bundle_0.1.14
-
- -- Sewook Park <sewook7.park@samsung.com> Thu, 07 Jul 2011 15:25:40 +0900
-
-bundle (0.1.13) unstable; urgency=low
-
- * Check ENOMEM when adding a value in a bundle
- * Git: 165.213.180.234:slp/pkgs/b/bundle
- * Tag: bundle_0.1.13
-
- -- Youmin Ha <youmin.ha@samsung.com> Thu, 21 Apr 2011 10:52:49 +0900
-
-bundle (0.1.12) unstable; urgency=low
-
- * Add bundle_export_to_argv(), bundle_import_from-argv()
- * Git: 165.213.180.234:slp/pkgs/b/bundle
- * Tag: bundle_0.1.12
-
- -- Youmin Ha <youmin.ha@samsung.com> Mon, 28 Feb 2011 09:33:57 +0900
-
-bundle (0.1.11-3) unstable; urgency=low
-
- * reupload
- * Git: 165.213.180.234:slp/pkgs/b/bundle
- * Tag: bundle_0.1.11-3
-
- -- Youmin Ha <youmin.ha@samsung.com> Wed, 19 Jan 2011 11:13:57 +0900
-
-bundle (0.1.11-2) unstable; urgency=low
-
- * fix git path
- * Git: 165.213.180.234:slp/pkgs/b/bundle
- * Tag: bundle_0.1.11-2
-
- -- Youmin Ha <youmin.ha@samsung.com> Wed, 19 Jan 2011 10:38:28 +0900
-
-bundle (0.1.11-1) unstable; urgency=low
-
- * add {0, NULL} as last item to the tclist
- * Git: 165.213.180.234:/git/slp/pkgs/bundle
- * Tag: bundle_0.1.11-1
-
- -- Youmin Ha <youmin.ha@samsung.com> Wed, 19 Jan 2011 08:36:04 +0900
-
-bundle (0.1.11) unstable; urgency=low
-
- * remove garbages from src pkg
- * Git: 165.213.180.234:/git/slp/pkgs/bundle
- * Tag: bundle_0.1.11
-
- -- Youmin Ha <youmin.ha@samsung.com> Wed, 24 Nov 2010 17:48:57 +0900
-
-bundle (0.1.10-1) unstable; urgency=low
-
- * Add doxygen
- * Git: 165.213.180.234:/git/slp/pkgs/bundle
- * Tag: bundle_0.1.10-1
-
- -- Youmin Ha <youmin.ha@samsung.com> Fri, 05 Nov 2010 14:13:58 +0900
-
-bundle (0.1.10) unstable; urgency=low
-
- * Add doxygen
- * Git: 165.213.180.234:/git/slp/pkgs/bundle
- * Tag: bundle_0.1.10
-
- -- Youmin Ha <youmin.ha@samsung.com> Tue, 02 Nov 2010 16:57:33 +0900
-
-bundle (0.1.9) unstable; urgency=low
-
- * Apply SOVERSION + VERSION automatically
- * Git: 165.213.180.234:/git/slp/pkgs/bundle
- * Tag: bundle_0.1.9
-
- -- Youmin Ha <youmin.ha@samsung.com> Wed, 20 Oct 2010 19:24:28 +0900
-
-bundle (0.1.8-3) unstable; urgency=low
-
- * Fix doxygen
- * Git: 165.213.180.234:/git/slp/pkgs/bundle
- * Tag: bundle_0.1.8-3
-
- -- Youmin Ha <youmin.ha@samsung.com> Mon, 18 Oct 2010 19:58:08 +0900
-
-bundle (0.1.8-2) unstable; urgency=low
-
- * Fix doxygen
- * Git: 165.213.180.234:/git/slp/pkgs/bundle
- * Tag: bundle_0.1.8-2
-
- -- Youmin Ha <youmin.ha@samsung.com> Mon, 18 Oct 2010 11:05:06 +0900
-
-bundle (0.1.8-1) unstable; urgency=low
-
- * Add libglib2.0-dev to build-dep
- * Git: 165.213.180.234:/git/slp/pkgs/bundle
- * Tag: bundle_0.1.8-1
-
- -- Youmin Ha <youmin.ha@samsung.com> Sat, 18 Sep 2010 17:16:52 +0900
-
-bundle (0.1.8) unstable; urgency=low
-
- * Use base64 encoding/decoding with bundle_encode(), bundle_decode()
- * Git: 165.213.180.234:/git/slp/pkgs/bundle
- * Tag: bundle_0.1.8
-
- -- Youmin Ha <youmin.ha@samsung.com> Sat, 18 Sep 2010 16:47:29 +0900
-
-bundle (0.1.7) unstable; urgency=low
-
- * add TC
- * Git: 165.213.180.234:/git/slp/pkgs/bundle
- * Tag: bundle_0.1.7
-
- -- Youmin Ha <youmin.ha@samsung.com> Wed, 08 Sep 2010 17:22:15 +0900
-
-bundle (0.1.6) unstable; urgency=low
-
- * Include PG into dev package
- * Git: 165.213.180.234:/git/slp/pkgs/bundle
- * Tag: bundle_0.1.6
-
- -- Youmin Ha <youmin.ha@samsung.com> Fri, 27 Aug 2010 15:26:31 +0900
-
-bundle (0.1.5) unstable; urgency=low
-
- * add programming guide into doxygen
- * Git: 165.213.180.234:/git/slp/pkgs/bundle
- * Tag: bundle_0.1.5
-
- -- Youmin Ha <youmin.ha@samsung.com> Tue, 24 Aug 2010 19:04:10 +0900
-
-bundle (0.1.4) unstable; urgency=low
-
- * add bundle_dup() function
- * Git: 165.213.180.234:/git/slp/pkgs/bundle
- * Tag: bundle_0.1.4
-
- -- Youmin Ha <youmin.ha@samsung.com> Tue, 27 Jul 2010 14:04:52 +0900
-
-bundle (0.1.3) unstable; urgency=low
-
- * add bundle_del() function, and many tests for wrong uses
- * Git: 165.213.180.234:/git/slp/pkgs/bundle
- * Tag: bundle_0.1.3
-
- -- Youmin Ha <youmin.ha@samsung.com> Fri, 23 Jul 2010 11:21:32 +0900
-
-bundle (0.1.2) unstable; urgency=low
-
- * Create libbundle.so.0 and its symlink libbundle.so
- * Git: 165.213.180.234:/git/slp/pkgs/bundle
- * Tag: bundle_0.1.2
-
- -- Youmin Ha <youmin.ha@samsung.com> Thu, 22 Jul 2010 11:22:13 +0900
-
-bundle (0.1.1) unstable; urgency=low
-
- * Fix CMakeList.txt : add @ONLY option to the command generating pc file
- * Git: 165.213.180.234:/git/slp/pkgs/bundle
- * Tag: bundle_0.1.1
-
- -- Youmin Ha <youmin.ha@samsung.com> Thu, 22 Jul 2010 09:49:54 +0900
-
-bundle (0.1.0) unstable; urgency=low
-
- * Initial release.
- * Git: 165.213.180.234:/git/slp/pkgs/bundle
- * Tag: bundle_0.1.0
-
- -- Youmin Ha <youmin.ha@samsung.com> Wed, 21 Jul 2010 17:04:19 +0900
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 7ed6ff8..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/debian/control b/debian/control
deleted file mode 100755
index 9db2a05..0000000
--- a/debian/control
+++ /dev/null
@@ -1,24 +0,0 @@
-Source: bundle
-Section: devel
-Priority: extra
-Maintainer: Garima <garima.s@samsung.com>, Jayoun Lee <airjany@samsung.com>, Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
-Build-Depends: debhelper (>= 4.0.0), libglib2.0-dev, dlog-dev
-Standards-Version: 0.1.0
-
-Package: libbundle-0
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Simple string key-val dictionary ADT
-
-Package: libbundle-dev
-Architecture: any
-Depends: libbundle-0 (= ${Source-Version})
-Description: Dev package for libbundle-0
-XB-Generate-Docs: yes
-
-Package: libbundle-dbg
-Section: debug
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libbundle-0 (= ${Source-Version})
-Description: Debug symbols for libbundle-0
-
diff --git a/debian/libbundle-0.install.in b/debian/libbundle-0.install.in
deleted file mode 100644
index bf766f0..0000000
--- a/debian/libbundle-0.install.in
+++ /dev/null
@@ -1 +0,0 @@
-@PREFIX@/lib/*.so*
diff --git a/debian/libbundle-dev.install.in b/debian/libbundle-dev.install.in
deleted file mode 100644
index 0f2a4da..0000000
--- a/debian/libbundle-dev.install.in
+++ /dev/null
@@ -1,2 +0,0 @@
-@PREFIX@/include/*
-@PREFIX@/lib/pkgconfig/*.pc
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index a868b66..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_GNU_OS)
-
-CFLAGS ?= -Wall -g
-LDFLAGS ?=
-PREFIX ?= /usr
-DATADIR ?= /opt
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-# architecture is not arm
-ifneq (, $(findstring arm, $(DEB_HOST_ARCH)))
- # do something here
-else
- # do something here for arm
-endif
-
-CFLAGS += -fvisibility=hidden -fPIC
-LDFLAGS += -Wl,--rpath=$(PREFIX)/lib -Wl,--as-needed
-
-CMAKE_TMP_DIR = $(CURDIR)/cmake_tmp
-
-config.status:
-
-configure: configure-stamp
-
-configure-stamp:
- dh_testdir
- mkdir -p $(CMAKE_TMP_DIR);
- export LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):$(CMAKE_TMP_DIR) && cd $(CMAKE_TMP_DIR); CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" cmake .. -DCMAKE_INSTALL_PREFIX=$(PREFIX)
- touch configure-stamp
-
-build: build-stamp
-
-build-stamp: configure-stamp
- dh_testdir
- # Add here commands to compile the package.
- cd $(CMAKE_TMP_DIR) && $(MAKE) all
-
- for f in `find $(CURDIR)/debian/ -name "*.in"`; do \
- cat $$f > $${f%.in}; \
- sed -i -e "s#@PREFIX@#$(PREFIX)#g" $${f%.in}; \
- sed -i -e "s#@DATADIR@#$(DATADIR)#g" $${f%.in}; \
- done
-
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f *-stamp
-
- rm -rf $(CMAKE_TMP_DIR)
-
- for f in `find $(CURDIR)/debian/ -name "*.in"`; do \
- rm -f $${f%.in}; \
- done
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/ncurses.
- cd $(CMAKE_TMP_DIR) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
- dh_install --list-missing --sourcedir=debian/tmp
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_python
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip --dbg-package=libbundle-dbg
- dh_compress
- dh_fixperms
-# dh_perl
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
diff --git a/packaging/bundle.changes b/packaging/bundle.changes
index 7f9e669..c63b8bc 100644
--- a/packaging/bundle.changes
+++ b/packaging/bundle.changes
@@ -1,3 +1,6 @@
+* Sun Aug 25 2013 Chengwei Yang <chengwei.yang@intel.com>
+- Remove debian packaging stuff
+
* Fri Jan 18 2013 Anas Nashif <anas.nashif@intel.com> accepted/trunk/20130116.003550@4ecb922
- Support installation in /usr/lib64