From 5c2330f7661f524199813fd4d48acb6b6d78bc08 Mon Sep 17 00:00:00 2001 From: William King Date: Thu, 19 Apr 2012 19:38:32 -0700 Subject: [PATCH] Resolve a missing build-dep. Resolve a handful of lintian warnings and errors. Cleanup in prep for 1.2 release packaging. --resolve FS-3449 --- debian/READ_BEFORE_CHANGING_ANYTHING_IN_HERE | 29 -------------------- debian/changelog | 7 +++++ debian/control | 4 +-- debian/rules | 15 ++++------ debian/substvars | 0 5 files changed, 14 insertions(+), 41 deletions(-) delete mode 100644 debian/READ_BEFORE_CHANGING_ANYTHING_IN_HERE delete mode 100644 debian/substvars diff --git a/debian/READ_BEFORE_CHANGING_ANYTHING_IN_HERE b/debian/READ_BEFORE_CHANGING_ANYTHING_IN_HERE deleted file mode 100644 index 17480db19e..0000000000 --- a/debian/READ_BEFORE_CHANGING_ANYTHING_IN_HERE +++ /dev/null @@ -1,29 +0,0 @@ -Please do not change the maintainer (as found in the control file). - -Please DO send me a note before changing anything here. Also, PLEASE DO MAKE A -JIRA FIRST !!!! - -This request is the result of far too many sleepless nights and far too many -people breaking this far too often. So, HANDS OFF FOR NOW !!!! - -Again, to be perfectly clear: -1. Do not make any changes before verifying that they are OK with the current -maintainer (yes, that is me*). - -2. Before the mere idea of making a change crosses your mind, create a ticket in -Jira and assign it to the current maintainer. - -3. As current maintainer, I have other obligations besides fixing things people -break in the Debian build. So, please be patient; it can sometimes take a -bit for me to respond. - -4. Creating and maintaining this packages has been a lot of work. Please help -me maintain it by not fixing it to death. - -5. The maintainer is always right. - -6. If you believe the maintainer is wrong, please see item #5. - - - -* Michal Bielicki diff --git a/debian/changelog b/debian/changelog index abfe17e081..6643790933 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +freeswitch (1.1.head-git.master.20120419.1-1) unstable; urgency=low + + * Fixing FS-3449 as well as a bit of cleanup in prep for 1.2 release + packaging. Also a handful of lintian errors/warnings are now fixed. + + -- William King Thu, 19 Apr 2012 19:23:18 -0700 + freeswitch (1.0.head-git.master.20110530.1-1) unstable; urgency=low * added mod_cdr_sqlite diff --git a/debian/control b/debian/control index 193833700c..7b1f3e2a78 100644 --- a/debian/control +++ b/debian/control @@ -7,9 +7,9 @@ Build-Depends: debhelper (>= 7), wget, automake (>=1.9), autoconf, libtool, unixodbc-dev, libasound2-dev, libcurl3-openssl-dev|libcurl4-openssl-dev, libssl-dev, ncurses-dev, libogg-dev, libvorbis-dev, libperl-dev, libgdbm-dev, libdb-dev, libgnutls-dev, libtiff4-dev, python-dev, libx11-dev, uuid-dev, - libc6-dev + libc6-dev (>= 2), bison, gawk Homepage: http://freeswitch.org/ -Standards-Version: 3.9.1 +Standards-Version: 3.9.3 Vcs-Git: git://git.freeswitch.org/freeswitch.git Vcs-Browser: http://fisheye.freeswitch.org/browse/freeswitch.git diff --git a/debian/rules b/debian/rules index 2227a76552..044815a0fa 100755 --- a/debian/rules +++ b/debian/rules @@ -177,14 +177,9 @@ config.status: configure for i in $(MODULES); do echo $$i >> modules.conf; done ./configure --prefix=/opt/freeswitch --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) ${FEATURES} -configure: bootstrap.sh # .pc/applied-patches - dh_testdir - test -e /usr/share/misc/config.sub && cp -f /usr/share/misc/config.sub build/config/config.sub - test -e /usr/share/misc/config.guess && cp -f /usr/share/misc/config.guess build/config/config.guess - AUTOCONF=${AUTOCONF} ./bootstrap.sh - - -build: build-stamp +build: build-arch build-indep +build-arch: build-stamp +build-indep: build-stamp build-stamp: config.status dh_testdir @@ -197,8 +192,8 @@ clean: # .pc/applied-patches dh_testroot rm -f build-stamp - -$(MAKE) update-clean - rm -f configure config.status + [ ! -f Makefile ] || $(MAKE) distclean + rm -f config.status rm -f */*/config.status rm -f */*/*/config.status dh_clean diff --git a/debian/substvars b/debian/substvars deleted file mode 100644 index e69de29bb2..0000000000