Update of the Debian directory [patch]

--J2SCkAp4GZ/dPZZf
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hello,

Due several Debian Quality Assurance requests,
is a new Conglomerate Debian package released.

It is 0.9.1-2, which is the 0.9.1 we all known
with changes in the Debian packaging.

Could someone with GNOME CVS write priviledges
commit these changes in the Conglomerate CVS tree?

It is a patch and a file. Both go into the debian directory,
it would affect other Conglomerate parts.


Cheers
Geert Stappers

--J2SCkAp4GZ/dPZZf
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="update_debian_dir.patch"

? debian/0.9.1-2
? debian/conglomerate.docs
Index: debian/changelog
===================================================================
RCS file: /cvs/gnome/conglomerate/debian/changelog,v
retrieving revision 1.68
diff -u -r1.68 changelog
--- debian/changelog	15 Jun 2005 19:27:03 -0000	1.68
+++ debian/changelog	19 Jul 2006 09:09:50 -0000
@@ -1,10 +1,29 @@
-conglomerate (0.9.0-4) UNRELEASED; urgency=low
+conglomerate (0.9.1-2) unstable; urgency=low
 
-  * expecting new upstream version                         ( ready to
-    run `debian/patches/release 4.3.2-1` )
+  * Hyphenated user-friendly in ./debian/control, Closes: #341067 
+
+  * conglomerate-common:
+    - removed circular Depends on conglomerate, Closes: #339917
+
+  * Build-depend on libxml-parser-perl instead of gnome-common,
+    Closes: #335362 
+
+  * Include copyright and changelog in the binary package,
+    Closes: #378400
+
+  * Rebuild against a newer dh_gconf. Closes: #369874
+
+  * Follow the last version of Debian Policy
+    (Standards-Version 3.7.2 instead of 3.6.1).
+
+ -- Geert Stappers <[email protected]>  Tue, 18 Jul 2006 22:20:53 +0200
+
+conglomerate (0.9.1-1) unstable; urgency=low
+
+  * new upstream version
     - ships with corrections on German PO files, Closes: #314138
 
- -- Geert Stappers <[email protected]>  Tue, 15 Mar 2005 12:27:50 +0100
+ -- Geert Stappers <[email protected]>  Thu, 21 Jul 2005 14:38:04 +0200
 
 conglomerate (0.9.0-3) unstable; urgency=low
 
Index: debian/conglomerate.linda-override
===================================================================
RCS file: /cvs/gnome/conglomerate/debian/conglomerate.linda-override,v
retrieving revision 1.1
diff -u -r1.1 conglomerate.linda-override
--- debian/conglomerate.linda-override	30 Aug 2004 12:11:05 -0000	1.1
+++ debian/conglomerate.linda-override	19 Jul 2006 09:09:50 -0000
@@ -1,5 +1 @@
 Tag: no-manual-for-binary
-
-Tag: no-copyright
-
-Tag: no-changelog
Index: debian/conglomerate.lintian-override
===================================================================
RCS file: /cvs/gnome/conglomerate/debian/conglomerate.lintian-override,v
retrieving revision 1.2
diff -u -r1.2 conglomerate.lintian-override
--- debian/conglomerate.lintian-override	20 Aug 2004 12:31:12 -0000	1.2
+++ debian/conglomerate.lintian-override	19 Jul 2006 09:09:50 -0000
@@ -1,2 +1 @@
-conglomerate: no-copyright-file
 conglomerate: binary-without-manpage conglomerate
Index: debian/conglomerate.postinst
===================================================================
RCS file: /cvs/gnome/conglomerate/debian/conglomerate.postinst,v
retrieving revision 1.3
diff -u -r1.3 conglomerate.postinst
--- debian/conglomerate.postinst	17 Aug 2004 16:33:36 -0000	1.3
+++ debian/conglomerate.postinst	19 Jul 2006 09:09:50 -0000
@@ -4,11 +4,6 @@
  
 PACKAGE=conglomerate
  
-if [ "$1" = "configure" ]; then
-  cd /usr/share/doc/
-  ln -fs ${PACKAGE}-common ${PACKAGE}
-fi
- 
 #DEBHELPER#
  
 exit 0
Index: debian/control
===================================================================
RCS file: /cvs/gnome/conglomerate/debian/control,v
retrieving revision 1.14
diff -u -r1.14 control
--- debian/control	1 Jan 2005 15:00:56 -0000	1.14
+++ debian/control	19 Jul 2006 09:09:50 -0000
@@ -2,16 +2,16 @@
 Section: editors
 Priority: optional
 Maintainer: Geert Stappers <[email protected]>
-Build-Depends: debhelper (>> 4.1.51), dpatch, gnome-common, libbonobo2-dev, libbonoboui2-dev, libenchant-dev, libgnomeui-dev (>= 2.6.1.1-4), libgnomeprintui2.2-dev, libgtksourceview-dev, libxslt1-dev, scrollkeeper
-Standards-Version: 3.6.1
+Build-Depends: debhelper (>> 4.1.51), dpatch, libxml-parser-perl, libbonobo2-dev, libbonoboui2-dev, libenchant-dev, libgnomeui-dev (>= 2.6.1.1-4), libgnomeprintui2.2-dev, libgtksourceview-dev, libxslt1-dev, scrollkeeper
+Standards-Version: 3.7.2
 
 Package: conglomerate
 Architecture: any
 Depends: conglomerate-common (>= ${Upstream-Version}), ${shlibs:Depends}
 Recommends: xml-core
 Suggests: docbook-xml, docbook-xsl
-Description: userfriendly XML editor
- Conglomerate is a free, as in GPL, userfriendly XML-file editor,
+Description: user-friendly XML editor
+ Conglomerate is a free, as in GPL, user-friendly XML-file editor,
  for DocBook and other document types.
  It aims to hide the complexity and jargon of XML behind a friendly GUI.
  .
@@ -19,10 +19,10 @@
 
 Package: conglomerate-common
 Architecture: all
-Depends: conglomerate, ${misc:Depends}
+Depends: ${misc:Depends}
 Conflicts: conglomerate (<< 0.7.14-4)
-Description: common files for the userfriendly XML editor
- Conglomerate is a free, as in GPL, userfriendly XML-file editor,
+Description: common files for the user-friendly XML editor
+ Conglomerate is a free, as in GPL, user-friendly XML-file editor,
  for DocBook and other document types.
  In this package documentation, PO files, examples
  and other files that are architecture independent.
@@ -32,5 +32,5 @@
 Package: conglomerate-dbg
 Architecture: any
 Depends: conglomerate-common (>= ${Upstream-Version}), ${shlibs:Depends}
-Description: userfriendly XML editor, with debug symbols
+Description: user-friendly XML editor, with debug symbols
  Unstripped version of the executable
Index: debian/rules
===================================================================
RCS file: /cvs/gnome/conglomerate/debian/rules,v
retrieving revision 1.21
diff -u -r1.21 rules
--- debian/rules	1 Nov 2004 12:19:26 -0000	1.21
+++ debian/rules	19 Jul 2006 09:09:50 -0000
@@ -135,6 +135,7 @@
 conglomerate: build-arch install-arch
 	dh_testdir -p $@
 	dh_testroot -p $@
+	dh_installdocs -p $@
 	dh_strip -p $@
 	dh_compress -p $@
 	dh_fixperms -p $@

--J2SCkAp4GZ/dPZZf
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="conglomerate.docs"

debian/changelog
debian/copyright

--J2SCkAp4GZ/dPZZf
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
Conglomerate-devel mailing list
[email protected]
http://lists.copyleft.no/mailman/listinfo/conglomerate-devel

--J2SCkAp4GZ/dPZZf--