stv0g/libsml
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

several tweaks for debian packaging

Browse source
This commit is contained in:
Steffen Vogel 2011-09-01 22:25:17 +02:00
parent 9072a52018
commit decd2b638f
7 changed files with 228 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
debian/changelog vendored
View file

@ -1,3 +1,19 @@
libsml (0.1-3~wip) unstable; urgency=low
* fixed invalid destination for libs
* added SONAME to shared library
-- Steffen Vogel <info@steffenvogel.de> Thu, 01 Sep 2011 21:05:40 +0200
libsml (0.1-2~wip) unstable; urgency=low
* Added information for pkg-config
* Eased dependency for libuuid from version 2.17 to 2.16
as there were no changes in the symbols
* Changed architecture for developement files to 'all'
-- Steffen Vogel <info@steffenvogel.de> Thu, 01 Sep 2011 12:06:39 +0200
libsml (0.1-1~wip) unstable; urgency=low
* Work in Progress of current git commit

15
debian/control vendored
View file

@ -1,25 +1,26 @@
Source: libsml
Priority: extra
Maintainer: Steffen Vogel <info@steffenvogel.de>
Build-Depends: debhelper (>= 7.0.50~)
Build-Depends: debhelper (>= 7.0.50~), uuid-dev (>= 2.16)
Standards-Version: 3.9.1
Section: libs
Homepage: http://www.dai-labor.de
Homepage: http://github.com/dailab/libsml
Vcs-Git: git://github.com/dailab/libsml.git
Vcs-Browser: https://github.com/dailab/libsml
Vcs-Browser: http://github.com/dailab/libsml
Package: libsml-dev
Section: libdevel
Architecture: any
Depends: libsml1 (= ${binary:Version}), ${misc:Depends}, uuid-dev (>= 2.17)
Depends: libsml1 (= ${binary:Version}), uuid-dev (>= 2.16)
Description: Header files for libSML
Implementation in C of the Smart Messaging Language (SML) protocol
This package includes header include files
and an example for libSML
Package: libsml1
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Library for the Smart Message Language
Depends: ${shlibs:Depends}
Description: Library for the Smart Messaging Language (SML)
libSML is a library which implements the Smart Messaging Language (SML)
protocol specified by VDE's Forum Netztechnik/Netzbetrieb (FNN).
It can be utilized to communicate to FNN specified Smart Meters

1
debian/libsml-dev.install vendored
View file

@ -1 +1,2 @@
sml/include/* /usr/include
sml.pc /usr/lib/pkgconfig

2
debian/libsml1.install vendored
View file

@ -1 +1 @@
sml/lib/libsml.* /usr/lib/sml
sml/lib/libsml.* /usr/lib

134
debian/patches/debian-changes-0.1-2~wip vendored Normal file
View file

@ -0,0 +1,134 @@
Description: Upstream changes introduced in version 0.1-2~wip
This patch has been created by dpkg-source during the package build.
Here's the last changelog entry, hopefully it gives details on why
those changes were made:
.
libsml (0.1-2~wip) unstable; urgency=low
.
* Added information for pkg-config
* Eased dependency for libuuid from version 2.17 to 2.16
as there were no changes in the symbols
* Changed architecture for developement files to 'all'
.
The person named in the Author field signed this changelog entry.
Author: Steffen Vogel <info@steffenvogel.de>
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- /dev/null
+++ libsml-0.1/sml.pc
@@ -0,0 +1,13 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: libSML
+Description: Library for the Smart Messaging Language (SML)
+Version: 0.1
+URL: http://github.com/dailab/libsml
+Requires: uuid >= 2.16
+Libs: -L${libdir} -lsml
+Libs.private: -luuid
+Cflags: -I${includedir}/sml
--- libsml-0.1.orig/test/Makefile
+++ libsml-0.1/test/Makefile
@@ -1,10 +1,11 @@
UNAME := $(shell uname)
CFLAGS += -I../sml/include/ -Wall
+LIBSML = ../sml/lib/libsml.a
+LIBS = -luuid
+
ifeq ($(UNAME), Linux)
LIBS = -luuid
endif
-LIBSML = ../sml/lib/libsml.a
-
UNITY = \
unity/unity.o \
@@ -30,22 +31,18 @@ test_run: libsml test
@./test
test : $(UNITY) $(OBJS) $(LIBSML)
- $(CC) $(CFLAGS) $(LIBS) $(LIBSML) $^ test_main.c -o test
+ $(CC) $(CFLAGS) $(LIBS) $^ test_main.c -o test
.PHONY: code
libsml :
@$(MAKE) -C ../sml
%.o : %.c
- $(CC) $(CFLAGS) $(LIBS) -c $^ -o $@
+ $(CC) $(CFLAGS) -c $^ -o $@
.PHONY: clean
clean :
@rm -f unity/*.o
@rm -f src/*.o
-
-
-
-
-
+ @rm -f test
--- libsml-0.1.orig/sml/Makefile
+++ libsml-0.1/sml/Makefile
@@ -4,6 +4,10 @@ CFLAGS += -I./include/ -fPIC -g -Wall
# Available Flags:
# _NO_UUID_LIB - compile without uuid lib
+ifeq ($(UNAME), Linux)
+LIBS = -luuid
+endif
+
LIB_DIR=./lib
OBJ_LIB=$(LIB_DIR)/libsml.o
DYN_LIB=$(LIB_DIR)/libsml.so
@@ -45,7 +49,7 @@ libsml: $(ST_LIB) $(OBJ_LIB)
endif
$(DYN_LIB): $(OBJS)
- $(LD) -shared -o $@ $^
+ $(LD) $(LIBS) -shared -o $@ $^
$(OBJ_LIB): $(OBJS)
$(LD) -r -o $@ $^
--- libsml-0.1.orig/examples/Makefile
+++ libsml-0.1/examples/Makefile
@@ -1,17 +1,17 @@
UNAME := $(shell uname)
CFLAGS += -I../sml/include/ -g -Wall
OBJS = sml_server.o
+LIBSML = ../sml/lib/libsml.a
ifeq ($(UNAME), Linux)
-LIBS = -L../sml/lib/ ../sml/lib/libsml.o -luuid
-endif
-ifeq ($(UNAME), Darwin)
-LIBS = -L../sml/lib/ ../sml/lib/libsml.o
+LIBS = -luuid
endif
+sml_server : $(OBJS) $(LIBSML)
+ $(CC) $(CFLAGS) $(OBJS) $(LIBS) $(LIBSML) -o sml_server
-sml_server : $(OBJS)
- $(CC) $(CFLAGS) $(LIBS) -o sml_server $(OBJS)
+%.o : %.c
+ $(CC) $(CFLAGS) -c $^ -o $@
.PHONY: clean
clean:

66
debian/patches/debian-changes-0.1-3~wip vendored Normal file
View file

@ -0,0 +1,66 @@
Description: Upstream changes introduced in version 0.1-3~wip
This patch has been created by dpkg-source during the package build.
Here's the last changelog entry, hopefully it gives details on why
those changes were made:
.
libsml (0.1-3~wip) unstable; urgency=low
.
* fixed invalid destination for libs
* added SONAME to shared library
.
The person named in the Author field signed this changelog entry.
Author: Steffen Vogel <info@steffenvogel.de>
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- libsml-0.1.orig/sml/Makefile
+++ libsml-0.1/sml/Makefile
@@ -5,13 +5,17 @@ CFLAGS += -I./include/ -fPIC -g -Wall
# _NO_UUID_LIB - compile without uuid lib
ifeq ($(UNAME), Linux)
-LIBS = -luuid
+LIBS=-luuid
endif
+NAME=libsml
+SOVERSION=1
+SONAME=$(NAME).so.$(SOVERSION)
+
LIB_DIR=./lib
-OBJ_LIB=$(LIB_DIR)/libsml.o
-DYN_LIB=$(LIB_DIR)/libsml.so
-ST_LIB=$(LIB_DIR)/libsml.a
+OBJ_LIB=$(LIB_DIR)/$(NAME).o
+DYN_LIB=$(LIB_DIR)/$(SONAME)
+ST_LIB=$(LIB_DIR)/$(NAME).a
OBJS = \
src/sml_file.o \
@@ -49,7 +53,7 @@ libsml: $(ST_LIB) $(OBJ_LIB)
endif
$(DYN_LIB): $(OBJS)
- $(LD) $(LIBS) -shared -o $@ $^
+ $(LD) $(LIBS) -shared -soname $(SONAME) -o $@ $^
$(OBJ_LIB): $(OBJS)
$(LD) -r -o $@ $^
@@ -60,5 +64,5 @@ $(ST_LIB): $(OBJS)
.PHONY: clean
clean:
@rm -f src/*.o
- @rm -f $(LIB_DIR)/*.so $(LIB_DIR)/*.a $(LIB_DIR)/*.o
+ @rm -f $(DYN_LIB) $(OBJ_LIB) $(ST_LIB)

3
debian/patches/series vendored
View file

@ -1 +1,2 @@
debian-changes-0.1-1
debian-changes-0.1-2~wip
debian-changes-0.1-3~wip