[debian-edu-commits] debian-edu/ 06/08: Do packaging with CDBS.

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository slbackup-php.

commit 1940841b7a892dea51d7eaf0510091ccefcfd771
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jan 5 15:01:44 2014 +0100

    Do packaging with CDBS.
---
 debian/changelog         |  1 +
 debian/control           |  5 +++--
 debian/postinst          | 12 ++++------
 debian/rules             | 57 +++++-------------------------------------------
 debian/slbackup-php.docs |  1 +
 5 files changed, 14 insertions(+), 62 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 75d64f3..f2853e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 slbackup-php (0.4.5-1) UNRELEASED; urgency=low
 
   * New upstream release. (Closes: #712533).
+  * Do packaging with CDBS.
   * /debian/control:
     + Alioth-canonicalize Vcs-Git: field.
     + Vcs location has moved into debian-edu/pkg-team/ subfolder.
diff --git a/debian/control b/debian/control
index b8a46ce..d43ab42 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Standards-Version: 3.9.5
 Build-Depends:
  debhelper (>= 7.0.50~),
  po-debconf,
+ cdbs,
 Homepage: http://anonscm.debian.org/gitweb/?p=debian-edu/upstream/slbackup-php.git;a=summary
 Vcs-Git: git://anonscm.debian.org/debian-edu/pkg-team/slbackup-php.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-edu/pkg-team/slbackup-php.git;a=summary
@@ -17,14 +18,14 @@ Architecture: all
 Depends:
  ${misc:Depends},
  libapache2-mod-php5 | php5-cgi,
+ apache2 | httpd,
  ssh,
  php5-cli,
  smarty3,
  smarty-gettext (>= 1.0b1-7),
-Recommends:
- apache2 | httpd,
 Suggests:
  x-www-browser,
+ slbackup,
 Description: Web-based administration tool for slbackup
  Slbackup-php provides the necessary functions to maintain a slbackup
  repository.
diff --git a/debian/postinst b/debian/postinst
index f87858c..b98aa63 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -7,14 +7,10 @@ set -e
 db_get slbackup-php/use-ssl || true
 
 if [ "$RET" = "true" ]; then
-		if  [ -x /usr/sbin/a2enmod ]; then
-				a2enmod rewrite > /dev/null
-				if [ -x /usr/sbin/invoke-rc.d ] ; then
-						invoke-rc.d apache2 force-reload || :
-				else
-						[ -x /etc/init.d/apache2 ] && /etc/init.d/apache2 force-reload || :
-				fi
-		fi
+	if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+		. /usr/share/apache2/apache2-maintscript-helper
+		apache2_invoke enmod rewrite || exit $?
+	fi
 fi
 
 mkdir -p /var/spool/slbackup-php
diff --git a/debian/rules b/debian/rules
index f40befb..3e4f9ea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,58 +1,11 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+DEB_MAKE_INSTALL_TARGET=install DESTDIR=$(CURDIR)/debian/slbackup-php prefix=/usr
+DEB_MAKE_BUILD_TARGET=mo-files DESTDIR=$(CURDIR)/debian/slbackup-php prefix=/usr
 
-build: build-arch build-indep
+include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
 
-build-arch:
-# nothing to do for build-arch
-
-build-indep: build-stamp
-
-build-stamp:
-	debconf-updatepo
-
-build-stamp:  
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	[ ! -f Makefile ] || $(MAKE) clean
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean
-	-$(MAKE) mo-files
-	dh_installdirs
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/slbackup-php prefix=/usr
-	dh_install
-
-binary-arch: 
-
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs ./ChangeLog 
+binary-install/slbackup-php::
 	mv $(CURDIR)/debian/slbackup-php/usr/share/doc/slbackup-php/ChangeLog $(CURDIR)/debian/slbackup-php/usr/share/doc/slbackup-php/changelog
-	dh_installcron
-	dh_installdebconf
-	dh_installman
-	dh_lintian
-	dh_link
-	dh_compress
-	dh_fixperms 
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
diff --git a/debian/slbackup-php.docs b/debian/slbackup-php.docs
new file mode 100644
index 0000000..b0936e8
--- /dev/null
+++ b/debian/slbackup-php.docs
@@ -0,0 +1 @@
+ChangeLog
\ No newline at end of file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/slbackup-php.git