[SCM] Viewmol: a graphical front end for computational chemistry programs. branch, debian-unstable, updated. viewmol-2.4.1-16-20-g06e2f48

[Drew Parsons]

The following commit has been merged in the debian-unstable branch:
commit a060686a34479df1a7fa26c6fa5d19a810f2afba
Merge: 5ce3e1934877350189f26ba24e05866c230e0ef6 81fc271788605b52e85c2d11635a0371fb44605e
Author: Drew Parsons <dparsons at debian.org>
Date:   Sun Sep 26 10:14:26 2010 +1000

    Merge branch 'debian-unstable' of git://git.debian.org/pkg-xorg/xsfbs into debian-unstable
    
    README.source is merged by hand, adding xsfbs instructions to viewmol
    comments.

diff --combined debian/README.source
index 9e5756c,b09a1ab..541acc4
--- a/debian/README.source
+++ b/debian/README.source
@@@ -1,7 -1,73 +1,83 @@@
 +Debian patches which have not yet been applied upstream are handled using quilt
 +via (for convenience) the Debian X Strike Force's build system xsfbs.
 +
 +Patches are placed in debian/patches.
 +
 +See http://git.debian.org/?p=pkg-xorg/xsfbs.git;a=summary and 
 +/usr/share/doc/quilt/README.source for more details.
++
++
+ ------------------------------------------------------
+ Quick Guide To Patching This Package For The Impatient
+ ------------------------------------------------------
+ 
+ 1. Make sure you have quilt installed
+ 2. Unpack the package as usual with "dpkg-source -x"
+ 3. Run the "patch" target in debian/rules
+ 4. Create a new patch with "quilt new" (see quilt(1))
+ 5. Edit all the files you want to include in the patch with "quilt edit" 
+    (see quilt(1)).
+ 6. Write the patch with "quilt refresh" (see quilt(1))
+ 7. Run the "clean" target in debian/rules
+ 
+ Alternatively, instead of using quilt directly, you can drop the patch in to 
+ debian/patches and add the name of the patch to debian/patches/series.
+ 
+ ------------------------------------
+ Guide To The X Strike Force Packages
+ ------------------------------------
+ 
+ The X Strike Force team maintains X packages in git repositories on
+ git.debian.org in the pkg-xorg subdirectory. Most upstream packages
+ are actually maintained in git repositories as well, so they often
+ just need to be pulled into git.debian.org in a "upstream-*" branch.
+ Otherwise, the upstream sources are manually installed in the Debian
+ git repository.
+ 
+ The .orig.tar.gz upstream source file could be generated using this
+ "upstream-*" branch in the Debian git repository but it is actually
+ copied from upstream tarballs directly.
+ 
+ Due to X.org being highly modular, packaging all X.org applications
+ as their own independent packages would have created too many Debian
+ packages. For this reason, some X.org applications have been grouped
+ into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils,
+ x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils.
+ Most packages, including the X.org server itself and all libraries
+ and drivers are, however maintained independently.
+ 
+ The Debian packaging is added by creating the "debian-*" git branch
+ which contains the aforementioned "upstream-*" branch plus the debian/
+ repository files.
+ When a patch has to be applied to the Debian package, two solutions
+ are involved:
+ * If the patch is available in one of the upstream branches, it
+   may be git'cherry-picked into the Debian repository. In this
+   case, it appears directly in the .diff.gz.
+ * Otherwise, the patch is added to debian/patches/ which is managed
+   with quilt as documented in /usr/share/doc/quilt/README.source.
+ 
+ quilt is actually invoked by the Debian X packaging through a larger
+ set of scripts called XSFBS. XSFBS brings some other X specific
+ features such as managing dependencies and conflicts due to the video
+ and input driver ABIs.
+ XSFBS itself is maintained in a separate repository at
+   git://git.debian.org/pkg-xorg/xsfbs.git
+ and it is pulled inside the other Debian X repositories when needed.
+ 
+ The XSFBS patching system requires a build dependency on quilt. Also
+ a dependency on $(STAMP_DIR)/patch has to be added to debian/rules
+ so that the XSFBS patching occurs before the actual build. So the
+ very first target of the build (likely the one running autoreconf)
+ should depend on $(STAMP_DIR)/patch. It should also not depend on
+ anything so that parallel builds are correctly supported (nothing
+ should probably run while patching is being done). And finally, the
+ clean target should depend on the xsfclean target so that patches
+ are unapplied on clean.
+ 
+ When the upstream sources contain some DFSG-nonfree files, they are
+ listed in text files in debian/prune/ in the "debian-*" branch of
+ the Debian repository. XSFBS' scripts then take care of removing
+ these listed files during the build so as to generate a modified
+ DFSG-free .orig.tar.gz tarball.
++

-- 
Viewmol: a graphical front end for computational chemistry programs.