[debian-edu-commits] debian-edu/pkg-team/ 24/32: Use new upstream tarball source.

Mike Gabriel sunweaver at debian.org
Tue Apr 1 16:52:09 UTC 2014


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

sunweaver pushed a commit to branch master
in repository gosa.

commit 7b528281218e58ed192cecaeb42a8b6e687bbf86
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Apr 1 17:46:11 2014 +0200

    Use new upstream tarball source.
    
    * Use upstream tarballs as provided at http://oss.gonicus.de/pub/gosa/
      instead of assembling them from SVN or other source. This makes
      tarballs checksum stable and allows us to plainly keep the
      debian/ folder in Vcs.
    * debian/rules:
      + Add get-orig-source sequence.
---
 debian/README.multi-orig-tarball-package |  7 +++++++
 debian/changelog                         |  6 ++++++
 debian/rules                             | 18 ++++++++++++++++++
 debian/watch                             |  3 ---
 debian/watch.gosa-gosa-core              |  3 +++
 debian/watch.gosa-plugin-apache2         |  3 +++
 debian/watch.gosa-plugin-connectivity    |  3 +++
 debian/watch.gosa-plugin-dhcp            |  3 +++
 debian/watch.gosa-plugin-dns             |  3 +++
 debian/watch.gosa-plugin-fai             |  3 +++
 debian/watch.gosa-plugin-gofax           |  3 +++
 debian/watch.gosa-plugin-gofon           |  3 +++
 debian/watch.gosa-plugin-goto            |  3 +++
 debian/watch.gosa-plugin-groupware       |  3 +++
 debian/watch.gosa-plugin-heimdal         |  3 +++
 debian/watch.gosa-plugin-kolab           |  3 +++
 debian/watch.gosa-plugin-ldapmanager     |  3 +++
 debian/watch.gosa-plugin-log             |  3 +++
 debian/watch.gosa-plugin-mail            |  3 +++
 debian/watch.gosa-plugin-mit             |  3 +++
 debian/watch.gosa-plugin-nagios          |  3 +++
 debian/watch.gosa-plugin-netatalk        |  3 +++
 debian/watch.gosa-plugin-opengroupware   |  3 +++
 debian/watch.gosa-plugin-openxchange     |  3 +++
 debian/watch.gosa-plugin-opsi            |  3 +++
 debian/watch.gosa-plugin-phpgw           |  3 +++
 debian/watch.gosa-plugin-phpscheduleit   |  3 +++
 debian/watch.gosa-plugin-pptp            |  3 +++
 debian/watch.gosa-plugin-pureftpd        |  3 +++
 debian/watch.gosa-plugin-rolemanagement  |  3 +++
 debian/watch.gosa-plugin-rsyslog         |  3 +++
 debian/watch.gosa-plugin-samba           |  3 +++
 debian/watch.gosa-plugin-scalix          |  3 +++
 debian/watch.gosa-plugin-squid           |  3 +++
 debian/watch.gosa-plugin-ssh             |  3 +++
 debian/watch.gosa-plugin-sudo            |  3 +++
 debian/watch.gosa-plugin-systems         |  3 +++
 debian/watch.gosa-plugin-uw              |  3 +++
 debian/watch.gosa-plugin-webdav          |  3 +++
 39 files changed, 136 insertions(+), 3 deletions(-)

diff --git a/debian/README.multi-orig-tarball-package b/debian/README.multi-orig-tarball-package
new file mode 100644
index 0000000..1d44fd6
--- /dev/null
+++ b/debian/README.multi-orig-tarball-package
@@ -0,0 +1,7 @@
+This src:package contains of various tarballs.
+
+This README is a dummy file for creating the base tarball of the name
+
+  gosa_<upstream-version>.orig.tar.gz
+
+ -- Mike Gabriel <sunweaver at debian.org>  Tue, 01 Apr 2014 16:36:31 +0200
diff --git a/debian/changelog b/debian/changelog
index 141f1ff..e7c9ff2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
 gosa (2.7.4+reloaded1-1) UNRELEASED; urgency=low
 
   * New maintenance team: Debian Edu Packaging Team.
+  * Use upstream tarballs as provided at http://oss.gonicus.de/pub/gosa/
+    instead of assembling them from SVN or other source. This makes
+    tarballs checksum stable and allows us to plainly keep the
+    debian/ folder in Vcs.
+  * debian/rules:
+    + Add get-orig-source sequence.
 
  -- Mike Gabriel <sunweaver at debian.org>  Tue, 01 Apr 2014 16:36:31 +0200
 
diff --git a/debian/rules b/debian/rules
index 4e8a1c3..e0f6468 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,12 @@
 #!/usr/bin/make -f
 
+PKD   = $(word 1,$(abspath $(dir $(MAKEFILE_LIST))))
+PKG   = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
+UVER  = $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\-\d+.*)};')
+DTYPE = +reloaded1
+VER  ?= $(subst $(DTYPE),,$(UVER))
+PLUGINS = $(shell ls debian/watch.* | cut -d "." -f2 | sed -e 's/gosa-//')
+
 %:
 	dh $@
 
@@ -22,3 +29,14 @@ override_dh_install:
 	ln -sf /usr/share/fonts/truetype/ttf-liberation/LiberationSans-BoldItalic.ttf debian/gosa/usr/share/gosa/html/themes/default/fonts
 	ln -sf /usr/share/fonts/truetype/ttf-liberation/LiberationMono-BoldItalic.ttf debian/gosa/usr/share/gosa/html/themes/default/fonts
 	ln -sf /usr/share/fonts/truetype/ttf-liberation/LiberationSerif-Bold.ttf debian/gosa/usr/share/gosa/html/themes/default/fonts
+
+get-orig-source: $(patsubst %,$(PKG)-%_$(VER)$(DTYPE).orig.tar.gz,$(PLUGINS))
+	cd $(PKD) && XZ_OPT=-6v tar -caf "../$(PKG)_$(VER)$(DTYPE).orig.tar.gz" --owner=root --group=root --mode=a+rX README.multi-orig-tarball-package
+	cd $(PKD)/.. && mv *.tar.gz ..
+
+$(PKG)-%_$(VER)$(DTYPE).orig.tar.gz:
+	cd $(PKD)/..
+	@echo "# Downloading..."
+	uscan --noconf --force-download --package $(PKG)-$* --watchfile debian/watch.gosa-$* --upstream-version $(UVER) --download-version $(VER) --rename --destdir=.
+	@echo "# Renaming..."
+	mv -v $(PKG)-$*_$(VER).orig.tar.gz $(PKG)_$(VER)$(DTYPE).orig-$(shell echo $* | sed -e 's/plugin-//').tar.gz
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index 63c5ddd..0000000
--- a/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-
-http://oss.gonicus.de/pub/gosa/gosa-(.*)\.tar\.gz
diff --git a/debian/watch.gosa-gosa-core b/debian/watch.gosa-gosa-core
new file mode 100644
index 0000000..d17be94
--- /dev/null
+++ b/debian/watch.gosa-gosa-core
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-core-(.*).tar.gz
diff --git a/debian/watch.gosa-plugin-apache2 b/debian/watch.gosa-plugin-apache2
new file mode 100644
index 0000000..2652212
--- /dev/null
+++ b/debian/watch.gosa-plugin-apache2
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-plugin-apache2-(.*).tar.gz
diff --git a/debian/watch.gosa-plugin-connectivity b/debian/watch.gosa-plugin-connectivity
new file mode 100644
index 0000000..20def11
--- /dev/null
+++ b/debian/watch.gosa-plugin-connectivity
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-plugin-connectivity-(.*).tar.gz
diff --git a/debian/watch.gosa-plugin-dhcp b/debian/watch.gosa-plugin-dhcp
new file mode 100644
index 0000000..d04a04e
--- /dev/null
+++ b/debian/watch.gosa-plugin-dhcp
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-plugin-dhcp-(.*).tar.gz
diff --git a/debian/watch.gosa-plugin-dns b/debian/watch.gosa-plugin-dns
new file mode 100644
index 0000000..268c212
--- /dev/null
+++ b/debian/watch.gosa-plugin-dns
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-plugin-dns-(.*).tar.gz
diff --git a/debian/watch.gosa-plugin-fai b/debian/watch.gosa-plugin-fai
new file mode 100644
index 0000000..7f1905d
--- /dev/null
+++ b/debian/watch.gosa-plugin-fai
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-plugin-fai-(.*).tar.gz
diff --git a/debian/watch.gosa-plugin-gofax b/debian/watch.gosa-plugin-gofax
new file mode 100644
index 0000000..123fa47
--- /dev/null
+++ b/debian/watch.gosa-plugin-gofax
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-plugin-gofax-(.*).tar.gz
diff --git a/debian/watch.gosa-plugin-gofon b/debian/watch.gosa-plugin-gofon
new file mode 100644
index 0000000..fb1e94d
--- /dev/null
+++ b/debian/watch.gosa-plugin-gofon
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-plugin-gofon-(.*).tar.gz
diff --git a/debian/watch.gosa-plugin-goto b/debian/watch.gosa-plugin-goto
new file mode 100644
index 0000000..55cd314
--- /dev/null
+++ b/debian/watch.gosa-plugin-goto
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-plugin-goto-([.0-9]+).tar.gz
diff --git a/debian/watch.gosa-plugin-groupware b/debian/watch.gosa-plugin-groupware
new file mode 100644
index 0000000..24dc6ef
--- /dev/null
+++ b/debian/watch.gosa-plugin-groupware
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-plugin-groupware-(.*).tar.gz
diff --git a/debian/watch.gosa-plugin-heimdal b/debian/watch.gosa-plugin-heimdal
new file mode 100644
index 0000000..36c619b
--- /dev/null
+++ b/debian/watch.gosa-plugin-heimdal
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-plugin-heimdal-(.*).tar.gz
diff --git a/debian/watch.gosa-plugin-kolab b/debian/watch.gosa-plugin-kolab
new file mode 100644
index 0000000..0050aa6
--- /dev/null
+++ b/debian/watch.gosa-plugin-kolab
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-plugin-kolab-(.*).tar.gz
diff --git a/debian/watch.gosa-plugin-ldapmanager b/debian/watch.gosa-plugin-ldapmanager
new file mode 100644
index 0000000..8f94507
--- /dev/null
+++ b/debian/watch.gosa-plugin-ldapmanager
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-plugin-ldapmanager-(.*).tar.gz
diff --git a/debian/watch.gosa-plugin-log b/debian/watch.gosa-plugin-log
new file mode 100644
index 0000000..b2b14b3
--- /dev/null
+++ b/debian/watch.gosa-plugin-log
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-plugin-log-(.*).tar.gz
diff --git a/debian/watch.gosa-plugin-mail b/debian/watch.gosa-plugin-mail
new file mode 100644
index 0000000..5515ce5
--- /dev/null
+++ b/debian/watch.gosa-plugin-mail
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-plugin-mail-(.*).tar.gz
diff --git a/debian/watch.gosa-plugin-mit b/debian/watch.gosa-plugin-mit
new file mode 100644
index 0000000..606b383
--- /dev/null
+++ b/debian/watch.gosa-plugin-mit
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-plugin-mit-krb5-(.*).tar.gz
diff --git a/debian/watch.gosa-plugin-nagios b/debian/watch.gosa-plugin-nagios
new file mode 100644
index 0000000..e72d20f
--- /dev/null
+++ b/debian/watch.gosa-plugin-nagios
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-plugin-nagios-(.*).tar.gz
diff --git a/debian/watch.gosa-plugin-netatalk b/debian/watch.gosa-plugin-netatalk
new file mode 100644
index 0000000..cabd21e
--- /dev/null
+++ b/debian/watch.gosa-plugin-netatalk
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-plugin-netatalk-(.*).tar.gz
diff --git a/debian/watch.gosa-plugin-opengroupware b/debian/watch.gosa-plugin-opengroupware
new file mode 100644
index 0000000..41f1b42
--- /dev/null
+++ b/debian/watch.gosa-plugin-opengroupware
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-plugin-opengroupware-(.*).tar.gz
diff --git a/debian/watch.gosa-plugin-openxchange b/debian/watch.gosa-plugin-openxchange
new file mode 100644
index 0000000..f0cc79e
--- /dev/null
+++ b/debian/watch.gosa-plugin-openxchange
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-plugin-openxchange-(.*).tar.gz
diff --git a/debian/watch.gosa-plugin-opsi b/debian/watch.gosa-plugin-opsi
new file mode 100644
index 0000000..74b4ae0
--- /dev/null
+++ b/debian/watch.gosa-plugin-opsi
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-plugin-opsi-(.*).tar.gz
diff --git a/debian/watch.gosa-plugin-phpgw b/debian/watch.gosa-plugin-phpgw
new file mode 100644
index 0000000..b8621eb
--- /dev/null
+++ b/debian/watch.gosa-plugin-phpgw
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-plugin-phpgw-(.*).tar.gz
diff --git a/debian/watch.gosa-plugin-phpscheduleit b/debian/watch.gosa-plugin-phpscheduleit
new file mode 100644
index 0000000..605c593
--- /dev/null
+++ b/debian/watch.gosa-plugin-phpscheduleit
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-plugin-phpscheduleit-(.*).tar.gz
diff --git a/debian/watch.gosa-plugin-pptp b/debian/watch.gosa-plugin-pptp
new file mode 100644
index 0000000..423d2e1
--- /dev/null
+++ b/debian/watch.gosa-plugin-pptp
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-plugin-pptp-(.*).tar.gz
diff --git a/debian/watch.gosa-plugin-pureftpd b/debian/watch.gosa-plugin-pureftpd
new file mode 100644
index 0000000..7b2d762
--- /dev/null
+++ b/debian/watch.gosa-plugin-pureftpd
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-plugin-pureftpd-(.*).tar.gz
diff --git a/debian/watch.gosa-plugin-rolemanagement b/debian/watch.gosa-plugin-rolemanagement
new file mode 100644
index 0000000..b1b1820
--- /dev/null
+++ b/debian/watch.gosa-plugin-rolemanagement
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-plugin-rolemanagement-(.*).tar.gz
diff --git a/debian/watch.gosa-plugin-rsyslog b/debian/watch.gosa-plugin-rsyslog
new file mode 100644
index 0000000..55edbe1
--- /dev/null
+++ b/debian/watch.gosa-plugin-rsyslog
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-plugin-rsyslog-(.*).tar.gz
diff --git a/debian/watch.gosa-plugin-samba b/debian/watch.gosa-plugin-samba
new file mode 100644
index 0000000..8195456
--- /dev/null
+++ b/debian/watch.gosa-plugin-samba
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-plugin-samba-(.*).tar.gz
diff --git a/debian/watch.gosa-plugin-scalix b/debian/watch.gosa-plugin-scalix
new file mode 100644
index 0000000..021e4b6
--- /dev/null
+++ b/debian/watch.gosa-plugin-scalix
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-plugin-scalix-(.*).tar.gz
diff --git a/debian/watch.gosa-plugin-squid b/debian/watch.gosa-plugin-squid
new file mode 100644
index 0000000..ab36b04
--- /dev/null
+++ b/debian/watch.gosa-plugin-squid
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-plugin-squid-(.*).tar.gz
diff --git a/debian/watch.gosa-plugin-ssh b/debian/watch.gosa-plugin-ssh
new file mode 100644
index 0000000..f2e1aef
--- /dev/null
+++ b/debian/watch.gosa-plugin-ssh
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-plugin-ssh-(.*).tar.gz
diff --git a/debian/watch.gosa-plugin-sudo b/debian/watch.gosa-plugin-sudo
new file mode 100644
index 0000000..e2327e5
--- /dev/null
+++ b/debian/watch.gosa-plugin-sudo
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-plugin-sudo-(.*).tar.gz
diff --git a/debian/watch.gosa-plugin-systems b/debian/watch.gosa-plugin-systems
new file mode 100644
index 0000000..36870b1
--- /dev/null
+++ b/debian/watch.gosa-plugin-systems
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-plugin-systems-(.*).tar.gz
diff --git a/debian/watch.gosa-plugin-uw b/debian/watch.gosa-plugin-uw
new file mode 100644
index 0000000..65d03fd
--- /dev/null
+++ b/debian/watch.gosa-plugin-uw
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-plugin-uw-imap-(.*).tar.gz
diff --git a/debian/watch.gosa-plugin-webdav b/debian/watch.gosa-plugin-webdav
new file mode 100644
index 0000000..2acbfd0
--- /dev/null
+++ b/debian/watch.gosa-plugin-webdav
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+reloaded1// \
+http://oss.gonicus.de/pub/gosa/gosa-plugin-webdav-(.*).tar.gz

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



More information about the debian-edu-commits mailing list