* resync with pkg-citadel

diff --git a/libcitadel/debian/control b/libcitadel/debian/control
index 18ebe2c56cf2c28bb79d8c82fdb3e5198176800a..f0168ebd39be902a596b1498bb7157ec1f38be98 100644 (file)
--- a/libcitadel/debian/control
+++ b/libcitadel/debian/control
@@ -1,23 +1,23 @@
 Source: libcitadel
 Section: libs
-Priority: optional
+Priority: extra
 Maintainer: Citadel Team <room_citadel_development@uncensored.citadel.org>
 Uploaders: Wilfried Goesgens <w.goesgens@outgesourced.org>, Alexander Wirt <formorer@debian.org>
 Build-Depends: debhelper (>= 5), zlib1g-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Homepage: http://citadel.org
 
-Package: libcitadel1
+Package: libcitadel2
 Architecture: any
 Depends: ${shlibs:Depends}, shared-mime-info
 Description: Citadel toolbox
  This library contains the commonly used routines for the citadel suite.
 
-Package: libcitadel1-dbg
+Package: libcitadel2-dbg
 Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}, libcitadel1 (= ${Source-Version})
-Description: Debugging symbols for libcitadel1
+Depends: ${shlibs:Depends}, libcitadel2 (= ${binary:Version})
+Description: Debugging symbols for libcitadel2
  This library contains the commonly used routines for the citadel suite.
  .
  This package provides the debugging symbols.
@@ -26,8 +26,8 @@ Package: libcitadel-dev
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends}, pkg-config,
- libcitadel1 (= ${Source-Version})
-Description: Development files for libcitadel1
+ libcitadel2 (= ${binary:Version})
+Description: Development files for libcitadel2
  This library contains the commonly used routines for the citadel suite.
  .
  This package provides development files and static libraries.

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

diff --git a/libcitadel/debian/libcitadel2.install b/libcitadel/debian/libcitadel2.install
new file mode 100644 (file)
index 0000000..093956b
--- /dev/null
+++ b/libcitadel/debian/libcitadel2.install
@@ -0,0 +1 @@
+usr/lib/*.so.*

diff --git a/libcitadel/debian/rules b/libcitadel/debian/rules
index f2977731ade2d869358413dffb6e202ed8538182..10af4c02b02b9423f275b0b7ba8f50afc1f4b352 100755 (executable)
--- a/libcitadel/debian/rules
+++ b/libcitadel/debian/rules
@@ -27,7 +27,6 @@ build: build-stamp
 build-stamp:
        dh_testdir
 
-# ./configure
        CFLAGS="$(CFLAGS)"; LDFLAGS="$(LDFLAGS)";  ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
                $(EXTRA_ARGS) \
                --prefix=/usr
@@ -42,7 +41,7 @@ clean:
        dh_testroot
        rm -f build-stamp install*-stamp
 
-       -$(MAKE) distclean
+       [ ! -f Makefile ] || $(MAKE) distclean
 
        dh_clean
 
@@ -78,14 +77,14 @@ binary-indep: build install
 binary-arch: build install
        dh_testdir -a
        dh_testroot -a
-#      dh_installdocs -plibcitadel1
-       dh_installchangelogs -plibcitadel
+       dh_installchangelogs -a -plibcitadel2
+       dh_installdocs -a
        dh_install -a --sourcedir=debian/tmp
        dh_link -a
-       dh_strip -a --dbg-package=libcitadel1-dbg
+       dh_strip -a --dbg-package=libcitadel2-dbg
        dh_compress -a
        dh_fixperms -a
-       dh_makeshlibs -a -V 'libcitadel1'
+       dh_makeshlibs -a -V
        dh_installdeb -a
        dh_shlibdeps -a
        dh_gencontrol -a