14 files changed, 33 insertions, 33 deletions
diff --git a/Makefile.am b/Makefile.am
index 3081461..5d5d59c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 SUBDIRS = src
 ACLOCAL_AMFLAGS = -I m4
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libmedia.pc libsubdev.pc
+pkgconfig_DATA = libmediactl.pc libv4l2subdev.pc
 
diff --git a/configure.in b/configure.in
index 81b53bb..3f4f35b 100644
--- a/configure.in
+++ b/configure.in
@@ -57,8 +57,8 @@ AC_CHECK_FUNCS([memset strerror strrchr strtoul])
 AC_CONFIG_FILES([
  Makefile
  src/Makefile
- libmedia.pc
- libsubdev.pc
+ libmediactl.pc
+ libv4l2subdev.pc
 ])
 
 AC_OUTPUT
diff --git a/debian/control b/debian/control
index 80d83c6..ef9c636 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 7.0.50~),
 Standards-Version: 3.8.4
 Section: utils
 
-Package: libmedia
+Package: libmediactl
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -18,27 +18,27 @@ Depends: ${shlibs:Depends},
 Description: Media controller library
  This library aims to simplify media controller setup.
 
-Package: libmedia-dev
+Package: libmediactl-dev
 Section: libdevel
 Architecture: any
-Depends: libmedia (= ${binary:Version})
+Depends: libmediactl (= ${binary:Version})
 Description: Development headers for media controller library
  Development headers to be used when developing software which
  uses media controller library.
 
-Package: libsubdev
+Package: libv4l2subdev
 Section: libs
 Architecture: any
-Depends: libmedia,
+Depends: libmediactl,
          ${shlibs:Depends},
          ${misc:Depends}
 Description: V4L2 subdevice library
  This library aims to simplify setup and use of V4L2 subdevice nodes.
 
-Package: libsubdev-dev
+Package: libv4l2subdev-dev
 Section: libdevel
 Architecture: any
-Depends: libsubdev (= ${binary:Version})
+Depends: libv4l2subdev (= ${binary:Version})
 Description: Development headers for V4L2 subdevice library
  Development headers to be used when developing software which
  uses V4L2 subdevice library.
@@ -46,8 +46,8 @@ Description: Development headers for V4L2 subdevice library
 Package: media-ctl
 Section: utils
 Architecture: any
-Depends: libmedia,
-         libsubdev,
+Depends: libmediactl,
+         libv4l2subdev,
          ${shlibs:Depends},
          ${misc:Depends}
 Description: Media controller control application
diff --git a/debian/libmedia-dev.install b/debian/libmedia-dev.install
deleted file mode 100644
index 34a9753..0000000
--- a/debian/libmedia-dev.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/include/mediactl/media.h
-usr/lib/libmedia.a
-usr/lib/libmedia.so
-usr/lib/libmedia.la
-usr/lib/pkgconfig/libmedia.pc
diff --git a/debian/libmedia.install b/debian/libmedia.install
deleted file mode 100644
index e72fbe2..0000000
--- a/debian/libmedia.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libmedia.so.*
diff --git a/debian/libmediactl-dev.install b/debian/libmediactl-dev.install
new file mode 100644
index 0000000..002caa4
--- /dev/null
+++ b/debian/libmediactl-dev.install
@@ -0,0 +1,5 @@
+usr/include/mediactl/media.h
+usr/lib/libmediactl.a
+usr/lib/libmediactl.so
+usr/lib/libmediactl.la
+usr/lib/pkgconfig/libmediactl.pc
diff --git a/debian/libmediactl.install b/debian/libmediactl.install
new file mode 100644
index 0000000..989e855
--- /dev/null
+++ b/debian/libmediactl.install
@@ -0,0 +1 @@
+usr/lib/libmediactl.so.*
diff --git a/debian/libsubdev-dev.install b/debian/libsubdev-dev.install
deleted file mode 100644
index 1c5ad4e..0000000
--- a/debian/libsubdev-dev.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/include/mediactl/subdev.h
-usr/lib/libsubdev.a
-usr/lib/libsubdev.so
-usr/lib/libsubdev.la
-usr/lib/pkgconfig/libsubdev.pc
diff --git a/debian/libsubdev.install b/debian/libsubdev.install
deleted file mode 100644
index 27973d5..0000000
--- a/debian/libsubdev.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libsubdev.so.*
diff --git a/debian/libv4l2subdev-dev.install b/debian/libv4l2subdev-dev.install
new file mode 100644
index 0000000..b7dde11
--- /dev/null
+++ b/debian/libv4l2subdev-dev.install
@@ -0,0 +1,5 @@
+usr/include/mediactl/subdev.h
+usr/lib/libv4l2subdev.a
+usr/lib/libv4l2subdev.so
+usr/lib/libv4l2subdev.la
+usr/lib/pkgconfig/libv4l2subdev.pc
diff --git a/debian/libv4l2subdev.install b/debian/libv4l2subdev.install
new file mode 100644
index 0000000..4692189
--- /dev/null
+++ b/debian/libv4l2subdev.install
@@ -0,0 +1 @@
+usr/lib/libv4l2subdev.so.*
diff --git a/libmedia.pc.in b/libmediactl.pc.in
index 171550a..dab2ff0 100644
--- a/libmedia.pc.in
+++ b/libmediactl.pc.in
@@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: libmedia
+Name: libmediactl
 Description: Media controller library.
 Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}
-Libs: -L${libdir} -lmedia
+Libs: -L${libdir} -lmediactl
diff --git a/libsubdev.pc.in b/libv4l2subdev.pc.in
index 666cefd..a601b78 100644
--- a/libsubdev.pc.in
+++ b/libv4l2subdev.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: libsubdev
+Name: libv4l2subdev
 Description: V4L2 subdevice library.
-Requires: libmedia
+Requires: libmediactl
 Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}
-Libs: -L${libdir} -lsubdev
+Libs: -L${libdir} -lv4l2subdev
diff --git a/src/Makefile.am b/src/Makefile.am
index 5937f41..267ea83 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,10 @@
-lib_LTLIBRARIES = libmedia.la libsubdev.la
-libmedia_la_SOURCES = media.c
-libsubdev_la_SOURCES = subdev.c
+lib_LTLIBRARIES = libmediactl.la libv4l2subdev.la
+libmediactl_la_SOURCES = media.c
+libv4l2subdev_la_SOURCES = subdev.c
 mediactl_includedir=$(includedir)/mediactl
 mediactl_include_HEADERS = media.h subdev.h
 
 bin_PROGRAMS = media-ctl
 media_ctl_SOURCES = main.c options.c options.h tools.h
-media_ctl_LDADD = libmedia.la libsubdev.la
+media_ctl_LDADD = libmediactl.la libv4l2subdev.la