Revert various debian related changes

The debian related changes were not meant to be comitted and
were local experiments. The changes should go through Jan and
not this way.

Revert "more changes"
This reverts commit 96ba20cb44e602abb292b53c9e4f92aa59998df1.

Revert "debian: Updates to fix lintian errors"
This reverts commit b670c86edd704d45b572b87111f3224abecc4767.

Revert "debian: Switch to the 3.0(quilt) format to play with launchpad"
This reverts commit 7a91d6071d1ef15e5a05f5feb7f79a06c279c673.

Revert "debian: Add new changelog entry for the shlib:Depends change"
This reverts commit 54b8c4e0edb2f0f0cde7d28c1715810dd5c6a4b1.

Revert "debian: dpkg-buildpackage complains about this here"
This reverts commit 4284307ead92f35e844e452c0ff9c73a61038096.

Revert "debian: Add a new changelog entry"
This reverts commit ae9b220d166dac277a9b9078add20650415d1cb2.

diff --git a/debian/changelog b/debian/changelog
index 109e741..20a0493 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-libosmocore (0.3.4) natty; urgency=low
-
-  * New upstream release 
-
- -- Holger Hans Peter Freyther <zecke@selfish.org>  Wed, 13 Jul 2011 21:10:33 +0200
-
 libosmocore (0.3.0) natty; urgency=low
 
   * New upstream version of libosmocore
@@ -18,6 +12,6 @@ libosmocore (0.1.27) natty; urgency=low
 
 libosmocore (0.1.17-1) unstable; urgency=low
 
-  * Initial release.
+  * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
 
  -- Harald Welte <laforge@gnumonks.org>  Tue, 24 Aug 2010 10:55:04 +0200

diff --git a/debian/control b/debian/control
index f07ac3a..3f92875 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Harald Welte <laforge@gnumonks.org>
 Build-Depends: debhelper (>= 7.0.50~), autotools-dev, autoconf, automake, libtool, dh-autoreconf
-Standards-Version: 3.9.1
+Standards-Version: 3.8.4
 Homepage: http://bb.osmocom.org/trac/wiki/libosmocore
 Vcs-Git: git://git.osmocom.org/libosmocore.git
 Vcs-Browser: http://git.osmocom.org/gitweb?p=libosmocore.git;a=summary
@@ -13,14 +13,12 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Open Source MObile COMmunications CORE library
- A helper library for mobile communication.
 
 Package: libosmocore-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libosmocore
+Depends: ${shlibs:Depends}, ${misc:Depends}, libosmocore
 Description: Development headers for Open Source MObile COMmunications CORE library
- A helper library for mobile communication.
 
 #Package: libosmocore-dbg
 #Section: libdevel

diff --git a/debian/copyright b/debian/copyright
index 6e3ebd7..c450be5 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -41,5 +41,14 @@ The Debian packaging is:
 
     Copyright (C) 2010 Harald Welte <laforge@gnumonks.org>
 
+# Please chose a license for your packaging work. If the program you package
+# uses a mainstream license, using the same license is the safest choice.
+# Please avoid to pick license terms that are more restrictive than the
+# packaged work, as it may make Debian's contributions unacceptable upstream.
+# If you just want it to be GPL version 3, leave the following lines in.
+
 and is licensed under the GPL version 3,
 see "/usr/share/common-licenses/GPL-3".
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.

diff --git a/debian/libosmocore-dbg.debhelper.log b/debian/libosmocore-dbg.debhelper.log
new file mode 100644 (file)
index 0000000..2742cb4
--- /dev/null
+++ b/debian/libosmocore-dbg.debhelper.log
@@ -0,0 +1,6 @@
+dh_auto_configure
+dh_auto_build
+dh_auto_test
+dh_prep
+dh_installdirs
+dh_auto_install

diff --git a/debian/source/format b/debian/source/format
index 163aaf8..af745b3 100644 (file)
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (quilt)
+3.0 (git)