[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] OpenOffice.org packaging repository branch, master, updated. openoffice.org_3.4.0_ooo340m1-3-2-gcad150f



The following commit has been merged in the master branch:
commit 8c559bbff974689278a48a6fa25349870cb8c43d
Author: Rene Engelhard <rene@debian.org>
Date:   Thu Sep 29 11:34:04 2011 +0000

    build openoffice.org-gcj transitional package only for kfreebsd-*

diff --git a/changelog b/changelog
index 12307fe..3839760 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+openoffice.org (1:3.4.0~ooo340m1-4) unstable; urgency=low
+
+  * build openoffice.org-gcj transitional package only for kfreebsd-* 
+
+ -- Rene Engelhard <rene@debian.org>  Thu, 29 Sep 2011 11:30:45 +0000
+
 openoffice.org (1:3.4.0~ooo340m1-3) unstable; urgency=medium
 
   * add -presenter-console  and -writer2xhtml to other_source_packages,
diff --git a/control b/control
index ec62a38..df0b19e 100644
--- a/control
+++ b/control
@@ -1396,7 +1396,7 @@ Description: office productivity suite -- Greek help
  It can be safely removed after an upgrade.
 
 Package: openoffice.org-gcj
-Architecture: all
+Architecture: kfreebsd-i386 kfreebsd-amd64
 Priority: extra
 Section: editors
 Depends: libreoffice-gcj (>= 1:3.4.0~)
diff --git a/rules b/rules
index 3514739..1620179 100755
--- a/rules
+++ b/rules
@@ -84,6 +84,17 @@ binary-indep: install
 	dh_builddeb -i
 
 binary-arch: build
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs -s
+	dh_installdocs -s
+	dh_link -s
+	dh_lintian -s
+	dh_compress -s
+	dh_installdeb -s
+	dh_gencontrol -s
+	dh_md5sums -s
+	dh_builddeb -s
 
 binary: binary-indep binary-arch
 
diff --git a/scripts/gentranspkgs.py b/scripts/gentranspkgs.py
index 010df88..6e9a8ea 100644
--- a/scripts/gentranspkgs.py
+++ b/scripts/gentranspkgs.py
@@ -45,7 +45,10 @@ def gen_transitonal_packages():
 	elif p.endswith('l10n-be'):
             p = p.replace('be', 'be-by')
         print "Package: %s" % p
-        print "Architecture: all"
+	if p.endswith('gcj'):
+	    print "Architecture: kfreebsd-i386 kfreebsd-amd64"
+        else:
+            print "Architecture: all"
         for f, v in attrs.items():
             if f in ('Depends', 'Description'):
                 continue

-- 
OpenOffice.org packaging repository


Reply to: